diff --git a/resources/js/admin/DevTenantSwitcher.tsx b/resources/js/admin/DevTenantSwitcher.tsx
index b8577061..584e98db 100644
--- a/resources/js/admin/DevTenantSwitcher.tsx
+++ b/resources/js/admin/DevTenantSwitcher.tsx
@@ -79,10 +79,14 @@ export function DevTenantSwitcher({ bottomOffset = 16, variant = 'floating' }: D
           size="$2"
           theme="yellow"
           onPress={() => setCollapsed(false)}
-          borderRadius={999}
+          circular
+          minWidth={0}
+          width={34}
+          height={34}
+          padding={0}
           icon={<PanelRightOpen size={16} />}
+          aria-label="Demo tenants anzeigen"
         >
-          Demo tenants
         </Button>
       );
     }
@@ -144,14 +148,18 @@ export function DevTenantSwitcher({ bottomOffset = 16, variant = 'floating' }: D
         size="$3"
         theme="yellow"
         icon={<PanelRightOpen size={16} />}
-        borderRadius={999}
+        circular
+        minWidth={0}
+        width={40}
+        height={40}
+        padding={0}
         position="fixed"
         right="$4"
         zIndex={1000}
         onPress={() => setCollapsed(false)}
+        aria-label="Demo tenants anzeigen"
         style={{ bottom: bottomOffset + 70 }}
       >
-        Demo tenants
       </Button>
     );
   }
diff --git a/resources/js/admin/mobile/components/MobileShell.tsx b/resources/js/admin/mobile/components/MobileShell.tsx
index 3dd36478..756bbf5b 100644
--- a/resources/js/admin/mobile/components/MobileShell.tsx
+++ b/resources/js/admin/mobile/components/MobileShell.tsx
@@ -329,11 +329,10 @@ export function MobileShell({ title, subtitle, children, activeTab, onBack, head
       <YStack
         flex={1}
         padding="$4"
-        paddingBottom="$10"
         gap="$3"
         width="100%"
         maxWidth={800}
-        style={{ paddingBottom: 'calc(env(safe-area-inset-bottom, 0px) + 96px)' }}
+        style={{ paddingBottom: 'calc(env(safe-area-inset-bottom, 0px) + 128px)' }}
       >
         {!online ? (
           <XStack alignItems="center" justifyContent="center" borderRadius={12} backgroundColor={theme.warningBg} paddingVertical="$2" paddingHorizontal="$3">