diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
index 5b3f43bcf9..1f7ccd16e8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
@@ -120,7 +120,7 @@ open class ExtensionController :
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.extension_main, menu)
+        inflater.inflate(R.menu.browse_extensions, menu)
 
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.actionView as SearchView
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
index d70a370fc9..08683c5977 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
@@ -52,7 +52,7 @@ class MigrationSourcesController :
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.source_migration, menu)
+        inflater.inflate(R.menu.browse_migrate, menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 58043ef7cf..d9c3aad7af 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -254,7 +254,7 @@ class SourceController :
         createOptionsMenu(
             menu,
             inflater,
-            R.menu.source_main,
+            R.menu.browse_sources,
             R.id.action_search,
             R.string.action_global_search_hint,
             false // GlobalSearch handles the searching here
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
index a50f9f4b61..5cdb3b66fe 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@@ -96,7 +96,7 @@ class MoreController :
             }
             preference {
                 titleRes = R.string.label_backup
-                iconRes = R.drawable.ic_backup_24dp
+                iconRes = R.drawable.ic_settings_backup_restore_24dp
                 iconTint = tintColor
                 onClick {
                     router.pushController(SettingsBackupController().withFadeTransaction())
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
index feb9bdf0fa..dbf69292b5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
@@ -59,7 +59,7 @@ class SettingsMainController : SettingsController() {
             onClick { navigateTo(SettingsBrowseController()) }
         }
         preference {
-            iconRes = R.drawable.ic_backup_24dp
+            iconRes = R.drawable.ic_settings_backup_restore_24dp
             iconTint = tintColor
             titleRes = R.string.label_backup
             onClick { navigateTo(SettingsBackupController()) }
diff --git a/app/src/main/res/drawable/ic_backup_24dp.xml b/app/src/main/res/drawable/ic_backup_24dp.xml
deleted file mode 100644
index 7b401a2c36..0000000000
--- a/app/src/main/res/drawable/ic_backup_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@android:color/black"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3zM8,13h2.55v3h2.9v-3H16l-4,-4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml
new file mode 100644
index 0000000000..46300cd9be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml
@@ -0,0 +1,9 @@
+<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="@android:color/black"
+      android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
index ab91bc4c40..6f52bf4a8b 100644
--- a/app/src/main/res/drawable/ic_share_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_24dp.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_translate_24dp.xml b/app/src/main/res/drawable/ic_translate_24dp.xml
new file mode 100644
index 0000000000..e7c9bf411c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_translate_24dp.xml
@@ -0,0 +1,9 @@
+<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="@android:color/black"
+      android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+</vector>
diff --git a/app/src/main/res/menu/extension_main.xml b/app/src/main/res/menu/browse_extensions.xml
similarity index 92%
rename from app/src/main/res/menu/extension_main.xml
rename to app/src/main/res/menu/browse_extensions.xml
index 578441c5c6..1a0d8e698e 100644
--- a/app/src/main/res/menu/extension_main.xml
+++ b/app/src/main/res/menu/browse_extensions.xml
@@ -11,7 +11,7 @@
 
     <item
         android:id="@+id/action_settings"
-        android:icon="@drawable/ic_filter_list_24dp"
+        android:icon="@drawable/ic_translate_24dp"
         android:title="@string/action_filter"
         app:iconTint="?attr/colorOnPrimary"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/source_migration.xml b/app/src/main/res/menu/browse_migrate.xml
similarity index 100%
rename from app/src/main/res/menu/source_migration.xml
rename to app/src/main/res/menu/browse_migrate.xml
diff --git a/app/src/main/res/menu/source_main.xml b/app/src/main/res/menu/browse_sources.xml
similarity index 92%
rename from app/src/main/res/menu/source_main.xml
rename to app/src/main/res/menu/browse_sources.xml
index 578441c5c6..1a0d8e698e 100644
--- a/app/src/main/res/menu/source_main.xml
+++ b/app/src/main/res/menu/browse_sources.xml
@@ -11,7 +11,7 @@
 
     <item
         android:id="@+id/action_settings"
-        android:icon="@drawable/ic_filter_list_24dp"
+        android:icon="@drawable/ic_translate_24dp"
         android:title="@string/action_filter"
         app:iconTint="?attr/colorOnPrimary"
         app:showAsAction="ifRoom" />