diff --git a/app/src/main/res/drawable/fab_focus_indicator.xml b/app/src/main/res/drawable/fab_focus_indicator.xml
new file mode 100644
index 0000000..c74cf78
--- /dev/null
+++ b/app/src/main/res/drawable/fab_focus_indicator.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="3dp" android:color="@android:color/white" />
+            <solid android:color="@android:color/transparent" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/dialog_quick_actions.xml b/app/src/main/res/layout/dialog_quick_actions.xml
index 138f340..11109b0 100644
--- a/app/src/main/res/layout/dialog_quick_actions.xml
+++ b/app/src/main/res/layout/dialog_quick_actions.xml
@@ -35,6 +35,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="Pause/Play"
             app:srcCompat="@drawable/play_pause_24px"
+            android:foreground="@drawable/fab_focus_indicator"
             android:layout_marginEnd="12dp" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -44,6 +45,8 @@
             android:layout_height="wrap_content"
             android:contentDescription="Power"
             app:srcCompat="@drawable/ic_power"
+            app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+            android:foreground="@drawable/fab_focus_indicator"
             android:layout_marginEnd="12dp" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -52,7 +55,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="Reboot"
-            app:srcCompat="@drawable/ic_reboot" />
+            app:srcCompat="@drawable/ic_reboot"
+            app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+            android:foreground="@drawable/fab_focus_indicator" />
     </LinearLayout>
 
     <!-- Row 2: Renderer toggle buttons -->
diff --git a/app/src/main/res/layout/drawer_header_settings.xml b/app/src/main/res/layout/drawer_header_settings.xml
index 5b2f76a..d22417a 100644
--- a/app/src/main/res/layout/drawer_header_settings.xml
+++ b/app/src/main/res/layout/drawer_header_settings.xml
@@ -40,6 +40,7 @@
                 android:contentDescription="Reboot"
                 app:srcCompat="@drawable/ic_reboot"
                 app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+                android:foreground="@drawable/fab_focus_indicator"
                 android:layout_marginEnd="12dp" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -49,7 +50,8 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="Power"
                 app:srcCompat="@drawable/ic_power"
-                app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary" />
+                app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+                android:foreground="@drawable/fab_focus_indicator" />
         </LinearLayout>
 
         <TextView