diff --git a/lib/app/views/main_page.dart b/lib/app/views/main_page.dart
index 71073773..4106e610 100755
--- a/lib/app/views/main_page.dart
+++ b/lib/app/views/main_page.dart
@@ -56,22 +56,26 @@ class MainPage extends ConsumerWidget {
           },
         ),
         actions: [
-          Padding(
-            padding: const EdgeInsets.only(
-              right: 4.0,
-            ),
-            child: InkWell(
+          InkWell(
+            child: Padding(
+              padding: const EdgeInsets.all(4.0),
               child: currentDevice == null
-                  ? const Icon(Icons.info, size: 44)
+                  ? SizedBox.square(
+                      dimension: 44,
+                      child: Icon(
+                        Icons.usb_off,
+                        color: Theme.of(context).colorScheme.background,
+                      ),
+                    )
                   : DeviceAvatar(currentDevice, selected: true),
-              onTap: () {
-                showDialog(
-                  context: context,
-                  builder: (context) => const MainActionsDialog(),
-                );
-              },
             ),
-          )
+            onTap: () {
+              showDialog(
+                context: context,
+                builder: (context) => const MainActionsDialog(),
+              );
+            },
+          ),
         ],
       ),
       drawer: const MainPageDrawer(),
diff --git a/lib/oath/views/oath_screen.dart b/lib/oath/views/oath_screen.dart
index 60c84e26..bb2edba9 100755
--- a/lib/oath/views/oath_screen.dart
+++ b/lib/oath/views/oath_screen.dart
@@ -14,11 +14,17 @@ class OathScreen extends ConsumerWidget {
     final state = ref.watch(oathStateProvider(device.path));
 
     if (state == null) {
-      return const CircularProgressIndicator();
+      return Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: const [
+          Center(child: CircularProgressIndicator()),
+        ],
+      );
     }
 
     if (state.locked) {
-      return Center(
+      return Padding(
+        padding: const EdgeInsets.all(8.0),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
@@ -37,8 +43,9 @@ class OathScreen extends ConsumerWidget {
       final accounts = ref.watch(credentialListProvider(device.path));
       if (accounts == null) {
         return Column(
+          mainAxisAlignment: MainAxisAlignment.center,
           children: const [
-            Text('Reading...'),
+            Center(child: CircularProgressIndicator()),
           ],
         );
       }