diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 1404cf1..ff700f6 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1298,9 +1298,14 @@
 	<!-- Navbar name -->
     <string-array name="navbar_name_entries" translatable="false">
         <item>@string/theme_navbar_picker_default</item>
+        <item>@string/theme_navbar_picker_android</item>
         <item>@string/theme_navbar_picker_asus</item>
+        <item>@string/theme_navbar_picker_moto</item>
+        <item>@string/theme_navbar_picker_nexus</item>
+        <item>@string/theme_navbar_picker_old</item>
         <item>@string/theme_navbar_picker_oneplus</item>
         <item>@string/theme_navbar_picker_oneui</item>
+        <item>@string/theme_navbar_picker_sammy</item>
         <item>@string/theme_navbar_picker_tecno</item>
     </string-array>
 
@@ -1311,5 +1316,10 @@
         <item>3</item>
         <item>4</item>
         <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
     </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 7951bb7..64a0e92 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1263,4 +1263,9 @@
     <string name="theme_navbar_picker_oneui">One UI</string>
     <string name="theme_navbar_picker_tecno">Tecno Camon</string>
     <string name="theme_navbar_picker_asus">ASUS</string>
+    <string name="theme_navbar_picker_android">Android</string>
+    <string name="theme_navbar_picker_moto">Moto</string>
+    <string name="theme_navbar_picker_nexus">Nexus</string>
+    <string name="theme_navbar_picker_old">Old</string>
+    <string name="theme_navbar_picker_sammy">Samsung</string>
 </resources>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 6e299e6..7b45cb1 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -50,6 +50,7 @@
         <ListPreference
             android:key="theme_navbar_style"
             android:title="@string/theme_navbar_picker_title"
+            android:icon="@drawable/ic_arrow"
             android:dialogTitle="@string/theme_navbar_picker_summary"
             android:summary="%s"
             android:entries="@array/navbar_name_entries"