diff --git a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
index a95da2c..47cec7d 100644
--- a/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
+++ b/app/src/main/java/com/izzy2lost/psx2/MainActivity.java
@@ -790,7 +790,7 @@ public class MainActivity extends AppCompatActivity implements GamesCoverDialogF
         // Keep toggle button visible but change its icon
         if (btnToggleControls != null) {
             // Change icon based on visibility state
-            int iconRes = allUIHidden ? R.drawable.visibility_24px : R.drawable.visibility_off_24px;
+            int iconRes = allUIHidden ? R.drawable.visibility_off_24px : R.drawable.visibility_24px;
             btnToggleControls.setIcon(ContextCompat.getDrawable(this, iconRes));
         }
         if (btnFile != null) btnFile.setVisibility(vis);
diff --git a/app/src/main/res/drawable/bg_solid_black.xml b/app/src/main/res/drawable/bg_solid_black.xml
new file mode 100644
index 0000000..9decee7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_black.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#80FFFFFF">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#FF000000"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_power.xml b/app/src/main/res/drawable/ic_power.xml
index 9d882b6..f6143e8 100644
--- a/app/src/main/res/drawable/ic_power.xml
+++ b/app/src/main/res/drawable/ic_power.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,3h-2v10h2L13,3zM17.83,5.17l-1.42,1.42C17.99,7.59 19,9.68 19,12c0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-2.32 1.01,-4.41 2.59,-5.88L6.17,5.17C4.23,6.92 3,9.31 3,12c0,4.97 4.03,9 9,9s9,-4.03 9,-9c0,-2.69 -1.23,-5.08 -3.17,-6.83z" />
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,396 111.5,323.5Q143,251 197,197L253,253Q209,297 184.5,355Q160,413 160,480Q160,614 253,707Q346,800 480,800Q614,800 707,707Q800,614 800,480Q800,413 775.5,355Q751,297 707,253L763,197Q817,251 848.5,323.5Q880,396 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM440,520L440,80L520,80L520,520L440,520Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reboot.xml b/app/src/main/res/drawable/ic_reboot.xml
index 247aa21..3a1a828 100644
--- a/app/src/main/res/drawable/ic_reboot.xml
+++ b/app/src/main/res/drawable/ic_reboot.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,3v2.06c3.39,0.49 6,3.39 6,6.94 0,3.87 -3.13,7 -7,7 -2.93,0 -5.45,-1.79 -6.52,-4.33l1.86,-0.77C8.14,15.75 10.39,17 12.99,17c2.76,0 5,-2.24 5,-5 0,-2.5 -1.85,-4.57 -4.25,-4.94V9l-4,-4 4,-4v2.94z"/>
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,838Q319,823 239.5,732.5Q160,642 160,520Q160,454 186,393.5Q212,333 260,288L317,345Q279,379 259.5,424Q240,469 240,520Q240,608 296,675.5Q352,743 440,758L440,838ZM520,838L520,758Q607,742 663.5,675Q720,608 720,520Q720,420 650,350Q580,280 480,280L477,280L521,324L465,380L325,240L465,100L521,156L477,200L480,200Q614,200 707,293Q800,386 800,520Q800,641 720.5,731.5Q641,822 520,838Z"/>
 </vector>
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 2d7784a..7fe3454 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -47,7 +47,7 @@
         android:insetBottom="0dp"
         android:gravity="center"
         android:text=""
-        app:icon="@drawable/visibility_off_24px"
+        app:icon="@drawable/visibility_24px"
         app:iconTint="@color/md_theme_tertiary"
         app:iconGravity="textStart"
         app:iconSize="24dp"
@@ -93,6 +93,7 @@
             style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
             android:text="GAMES"
             
             app:rippleColor="#80cdcdcd" />
@@ -102,6 +103,8 @@
             style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
             android:text="bios"
             
             app:rippleColor="#80cdcdcd" />
@@ -111,6 +114,7 @@
             style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
             android:text="saves"
             
             app:rippleColor="#80cdcdcd" />
@@ -136,6 +140,7 @@
             style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
             android:text="select"
             android:textColor="@color/md_theme_onSurface"
             app:rippleColor="#80cdcdcd" />
@@ -145,6 +150,7 @@
             style="@style/PSX2.ElevatedTransparentButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:text="start"
             android:textColor="@color/md_theme_onSurface"
             app:rippleColor="#80cdcdcd" />
@@ -194,7 +200,6 @@
                 android:layout_height="38dp"
                 android:layout_marginEnd="8dp"
                 android:text="L3"
-            
                 app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
@@ -204,7 +209,6 @@
                 android:layout_height="38dp"
                 android:layout_marginStart="8dp"
                 android:text="R3"
-            
                 app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
index f56a611..36d0689 100644
--- a/app/src/main/res/layout-port/activity_main.xml
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -88,7 +88,7 @@
         android:insetBottom="0dp"
         android:gravity="center"
         android:text=""
-        app:icon="@drawable/visibility_off_24px"
+        app:icon="@drawable/visibility_24px"
         app:iconTint="@color/md_theme_tertiary"
         app:iconGravity="textStart"
         app:iconSize="24dp"
@@ -220,7 +220,6 @@
                 android:layout_height="38dp"
                 android:layout_marginEnd="8dp"
                 android:text="L3"
-                
                 app:rippleColor="#80cdcdcd" />
 
             <com.google.android.material.button.MaterialButton
@@ -230,7 +229,6 @@
                 android:layout_height="38dp"
                 android:layout_marginStart="8dp"
                 android:text="R3"
-                
                 app:rippleColor="#80cdcdcd" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_settings.xml b/app/src/main/res/layout/dialog_settings.xml
index 93a2d16..4e89949 100644
--- a/app/src/main/res/layout/dialog_settings.xml
+++ b/app/src/main/res/layout/dialog_settings.xml
@@ -26,17 +26,18 @@
                 android:id="@+id/btn_reboot"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="@drawable/bg_solid_black"
                 android:contentDescription="Reboot"
                 android:padding="8dp"
                 android:src="@drawable/ic_reboot"
-                android:tint="@android:color/holo_red_light" />
+                android:tint="@android:color/holo_red_light"
+                android:layout_marginEnd="8dp" />
 
             <ImageButton
                 android:id="@+id/btn_power"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
+                android:background="@drawable/bg_solid_black"
                 android:contentDescription="Power"
                 android:padding="8dp"
                 android:src="@drawable/ic_power"