diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png
index 700420311..cd690ff5a 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png
index dc9d85241..724680712 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png
index a89680f1e..d275c9056 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png
index c73d23c8c..d6d2193d7 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png
index bccbbbe39..60a023279 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png
index c1375067a..456945662 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png
index 512942d3b..1e80da8d2 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png
index e979d8301..c0847c94a 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png differ
diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png
index 3fd4fdc06..97974b5f5 100644
Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png differ
diff --git a/src/App.tsx b/src/App.tsx
index 21540197e..d6514dd30 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -267,7 +267,7 @@ export function App() {
       <StatusBar
         globalItems={[
           networkHealthStatus,
-          networkMachineStatus,
+          ...(isDesktop() ? [networkMachineStatus] : []),
           ...defaultGlobalStatusBarItems({ location, filePath }),
         ]}
         localItems={[
diff --git a/src/components/NetworkMachineIndicator.tsx b/src/components/NetworkMachineIndicator.tsx
index 6f7b67844..112851580 100644
--- a/src/components/NetworkMachineIndicator.tsx
+++ b/src/components/NetworkMachineIndicator.tsx
@@ -1,65 +1,29 @@
-import { Popover } from '@headlessui/react'
 import { useContext } from 'react'
-import { CustomIcon } from '@src/components/CustomIcon'
 import { MachineManagerContext } from '@src/components/MachineManagerProvider'
-import Tooltip from '@src/components/Tooltip'
-import { isDesktop } from '@src/lib/isDesktop'
 import type { components } from '@src/lib/machine-api'
 import type { StatusBarItemType } from '@src/components/StatusBar/statusBarTypes'
 
-export const NetworkMachineIndicator = ({
-  className,
-}: {
-  className?: string
-}) => {
+export const useNetworkMachineStatus = (): StatusBarItemType => {
   const {
     noMachinesReason,
     machines,
     machines: { length: machineCount },
   } = useContext(MachineManagerContext)
   const reason = noMachinesReason()
-
-  return isDesktop() ? (
-    <Popover className="relative">
-      <Popover.Button
-        className={`flex items-center p-0 border-none bg-transparent dark:bg-transparent relative ${className || ''}`}
-        data-testid="network-machine-toggle"
-      >
-        <NetworkMachinesIcon machineCount={machineCount} />
-        <Tooltip position="top-left" wrapperClassName="ui-open:hidden">
-          Network machines ({machineCount}) {reason && `: ${reason}`}
-        </Tooltip>
-      </Popover.Button>
-      <Popover.Panel
-        className="absolute left-0 bottom-full mb-1 w-64 flex flex-col gap-1 align-stretch bg-chalkboard-10 dark:bg-chalkboard-90 rounded shadow-lg border border-solid border-chalkboard-20/50 dark:border-chalkboard-80/50 text-sm"
-        data-testid="network-popover"
-      >
-        <NetworkMachinesPopoverContent machines={machines} />
-      </Popover.Panel>
-    </Popover>
-  ) : null
-}
-
-export const useNetworkMachineStatus = (): StatusBarItemType => {
   return {
     id: 'network-machines',
-    component: NetworkMachineIndicator,
+    'data-testid': `network-machine-toggle`,
+    label: `${machineCount}`,
+    hideLabel: machineCount === 0,
+    toolTip: {
+      children: `Network machines (${machineCount}) ${reason ? `: ${reason}` : ''}`,
+    },
+    element: 'popover',
+    icon: 'printer3d',
+    popoverContent: <NetworkMachinesPopoverContent machines={machines} />,
   }
 }
 
-function NetworkMachinesIcon({ machineCount }: { machineCount: number }) {
-  return (
-    <>
-      <CustomIcon name="printer3d" className="w-5 h-5" />
-      {machineCount > 0 && (
-        <p aria-hidden className="flex items-center justify-center text-xs">
-          {machineCount}
-        </p>
-      )}
-    </>
-  )
-}
-
 function NetworkMachinesPopoverContent({
   machines,
 }: { machines: components['schemas']['MachineInfoResponse'][] }) {
diff --git a/src/machines/commandBarMachine.ts b/src/machines/commandBarMachine.ts
index 48472d76d..f2e9ecc00 100644
--- a/src/machines/commandBarMachine.ts
+++ b/src/machines/commandBarMachine.ts
@@ -397,7 +397,6 @@ export const commandBarMachine = setup({
                     typeof o.value === 'object' &&
                     typeof argValue === 'object'
                   ) {
-                    
                     return JSON.stringify(o.value) === JSON.stringify(argValue)
                   } else {
                     return o.value === argValue
diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx
index 358fad270..234540de6 100644
--- a/src/routes/Home.tsx
+++ b/src/routes/Home.tsx
@@ -403,7 +403,7 @@ const Home = () => {
       </div>
       <StatusBar
         globalItems={[
-          networkMachineStatus,
+          ...(isDesktop() ? [networkMachineStatus] : []),
           ...defaultGlobalStatusBarItems({ location, filePath: undefined }),
         ]}
         localItems={defaultLocalStatusBarItems}