diff --git a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.spec.tsx b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.spec.tsx
index ab7dd21458a..4ef2065c01c 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.spec.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.spec.tsx
@@ -53,6 +53,13 @@ describe('ClusterHeaderLogs', () => {
     expect(refScrollSection?.current?.scroll).toHaveBeenCalledWith(0, refScrollSection?.current?.scrollHeight)
   })
 
+  it('should render scroll controls without a gap', () => {
+    renderWithProviders(<ClusterHeaderLogs {...props} />)
+
+    expect(screen.getByTestId('scroll-up-button').parentElement).toHaveClass('gap-0')
+    expect(screen.getByTestId('scroll-down-button')).not.toHaveClass('mr-2')
+  })
+
   it('should trigger download on click', async () => {
     const { userEvent } = renderWithProviders(<ClusterHeaderLogs {...props} />)
     const buttons = screen.getAllByRole('button')
diff --git a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.tsx b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.tsx
index eea4795c52a..53414b5f4a2 100644
--- a/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.tsx
+++ b/libs/domains/clusters/feature/src/lib/cluster-logs/cluster-header-logs/cluster-header-logs.tsx
@@ -95,30 +95,32 @@ export function ClusterHeaderLogs({ cluster, clusterStatus, refScrollSection, da
             Launch diagnostic for this error
           </Button>
         )}
-        <Button
-          data-testid="scroll-up-button"
-          className="rounded-br-none rounded-tr-none border-r-0"
-          type="button"
-          variant="outline"
-          color="neutral"
-          size="sm"
-          iconOnly
-          onClick={() => forcedScroll()}
-        >
-          <Icon iconName="arrow-up-to-line" />
-        </Button>
-        <Button
-          data-testid="scroll-down-button"
-          className="mr-2 rounded-bl-none rounded-tl-none"
-          variant="outline"
-          type="button"
-          color="neutral"
-          size="sm"
-          iconOnly
-          onClick={() => forcedScroll(true)}
-        >
-          <Icon iconName="arrow-down-to-line" />
-        </Button>
+        <div className="flex items-center gap-0">
+          <Button
+            data-testid="scroll-up-button"
+            className="rounded-br-none rounded-tr-none border-r-0"
+            type="button"
+            variant="outline"
+            color="neutral"
+            size="sm"
+            iconOnly
+            onClick={() => forcedScroll()}
+          >
+            <Icon iconName="arrow-up-to-line" />
+          </Button>
+          <Button
+            data-testid="scroll-down-button"
+            className="rounded-bl-none rounded-tl-none"
+            variant="outline"
+            type="button"
+            color="neutral"
+            size="sm"
+            iconOnly
+            onClick={() => forcedScroll(true)}
+          >
+            <Icon iconName="arrow-down-to-line" />
+          </Button>
+        </div>
         <Button
           type="button"
           variant="outline"