diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8fd07691aab..5149b9c25f2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3097,7 +3097,7 @@
 
         <activity android:name=".panel.SettingsPanelActivity"
             android:label="@string/settings_panel_title"
-            android:theme="@style/Theme.BottomDialog"
+            android:theme="@style/Theme.Panel"
             android:documentLaunchMode="always"
             android:excludeFromRecents="true"
             android:exported="true">
diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index c697afc56f8..abe8f416ba1 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -34,7 +34,7 @@
             android:gravity="center"
             android:paddingBottom="24dp"
             android:paddingTop="18dp"
-            android:textColor="?android:attr/colorPrimary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="20sp"/>
 
         <include layout="@layout/horizontal_divider"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d29d78bb80b..8268ce18fad 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -203,7 +203,7 @@
     </style>
 
     <!-- Note that Dialog themes do not set list dividers -->
-    <style name="Theme.BottomDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
+    <style name="Theme.Panel" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
         <item name="android:windowBackground">@null</item>
         <item name="android:dividerHorizontal">@*android:drawable/list_divider_material</item>
         <item name="android:windowNoTitle">true</item>