diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
index 9294ac736f5ec052342cde7cf7d8c772f3f87deb..75aeefed38f264f1f76ed4a464b331c51cd92b29 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
@@ -177,7 +177,7 @@ interface MessageStore {
     fun <T> getDisplayFolders(displayMode: FolderMode, outboxFolderId: Long?, mapper: FolderMapper<T>): List<T>
 
     /**
-     * Check if all given folders are included in the Unified Inbox.
+     * Check if all given folders are included in the All Inboxes.
      */
     fun areAllIncludedInUnifiedInbox(folderIds: Collection<Long>): Boolean
 
diff --git a/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java b/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
index 52f23ef4a9ae8851437b1343c8e283435565359a..59e400cbba1535e267c41abdb208c8c8dad53e10 100644
--- a/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
+++ b/app/core/src/main/java/com/fsck/k9/search/LocalSearch.java
@@ -83,7 +83,7 @@ public class LocalSearch implements SearchSpecification {
     // Public manipulation methods
     ///////////////////////////////////////////////////////////////
     /**
-     * Set the ID of the search. This is used to identify a unified inbox
+     * Set the ID of the search. This is used to identify a All Inboxes
      * search
      *
      * @param id ID to set
diff --git a/app/core/src/main/res/values/arrays_account_settings_values.xml b/app/core/src/main/res/values/arrays_account_settings_values.xml
index 1946f623a03e1fff005bc7aa5db6aac2c45658d7..b43b3c62256b5bbf4ace1e9dd0c33e7deb925087 100644
--- a/app/core/src/main/res/values/arrays_account_settings_values.xml
+++ b/app/core/src/main/res/values/arrays_account_settings_values.xml
@@ -3,25 +3,7 @@
 
     <!-- Must be kept in sync with arrays_drawer.xml/drawer_account_accent_color_dark_theme -->
     <integer-array name="account_colors">
-        <item>0xFFFFB300</item> <!-- Amber 600 -->
-        <item>0xFFFB8C00</item> <!-- Orange 600 -->
-        <item>0xFFF4511E</item> <!-- Deep orange 600 -->
-        <item>0xFFE53935</item> <!-- Red 600 -->
-
-        <item>0xFFC0CA33</item> <!-- Lime 600 -->
-        <item>0xFF7CB342</item> <!-- Light green 600 -->
-        <item>0xFF388E3C</item> <!-- Green 700 -->
-        <item>0xFF00897B</item> <!-- Teal 600 -->
-
-        <item>0xFF00ACC1</item> <!-- Cyan 600 -->
-        <item>0xFF039BE5</item> <!-- Light blue 600 -->
-        <item>0xFF1976D2</item> <!-- Blue 700 -->
-        <item>0xFF3949AB</item> <!-- Indigo 600 -->
-
-        <item>0xFFE91E63</item> <!-- Pink 500 -->
-        <item>0xFF8E24AA</item> <!-- Purple 600 -->
-        <item>0xFF5E35B1</item> <!-- Deep purple 600 -->
-        <item>0xFF455A64</item> <!-- Blue gray 700 -->
+        <item>0xFF0086FF</item>
     </integer-array>
 
     <string-array name="check_frequency_values" translatable="false">
diff --git a/app/core/src/main/res/values/arrays_drawer.xml b/app/core/src/main/res/values/arrays_drawer.xml
index c83c36f89ab1d8c2ed210079621e357b81a78ce5..d03c56fe89846aa0875ba2252f6acf49b09d9da0 100644
--- a/app/core/src/main/res/values/arrays_drawer.xml
+++ b/app/core/src/main/res/values/arrays_drawer.xml
@@ -3,25 +3,7 @@
 
     <!-- Must be kept in sync with arrays_account_settings_values.xml/account_colors -->
     <integer-array name="drawer_account_accent_color_dark_theme">
-        <item>0xFFFFB300</item> <!-- Amber 600 -->
-        <item>0xFFFF9800</item> <!-- Orange 500 -->
-        <item>0xFFFF7043</item> <!-- Deep orange 400 -->
-        <item>0xFFEF5350</item> <!-- Red 400 -->
-
-        <item>0xFFC0CA33</item> <!-- Lime 600 -->
-        <item>0xFF7CB342</item> <!-- Light green 600 -->
-        <item>0xFF4CAF50</item> <!-- Green 500 -->
-        <item>0xFF4DB6AC</item> <!-- Teal 300 -->
-
-        <item>0xFF00ACC1</item> <!-- Cyan 600 -->
-        <item>0xFF03A9F4</item> <!-- Light blue 500 -->
-        <item>0xFF42A5F5</item> <!-- Blue 400 -->
-        <item>0xFF9FA8DA</item> <!-- Indigo 200 -->
-
-        <item>0xFFF48FB1</item> <!-- Pink 200 -->
-        <item>0xFFCE93D8</item> <!-- Purple 200 -->
-        <item>0xFFB39DDB</item> <!-- Deep purple 200 -->
-        <item>0xFF90A4AE</item> <!-- Blue gray 300 -->
+        <item>0xFF5DB2FF</item>
     </integer-array>
 
 </resources>
diff --git a/app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt b/app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
index d13be3af8afb9a10c3613b3ba3b97f52f7f7c8a5..b3c9c595f231a7c5ae60ff78a80573684905dc11 100644
--- a/app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
+++ b/app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt
@@ -26,7 +26,7 @@ class TestCoreResourceProvider : CoreResourceProvider {
     override fun replyHeader(sender: String) = "$sender wrote:"
     override fun replyHeader(sender: String, sentDate: String) = "On $sentDate, $sender wrote:"
 
-    override fun searchUnifiedInboxTitle() = "Unified Inbox"
+    override fun searchUnifiedInboxTitle() = "All Inboxes"
     override fun searchUnifiedInboxDetail() = "All messages in unified folders"
 
     override fun outboxFolderName() = "Outbox"
diff --git a/app/k9mail/src/main/res/layout/message_list_widget_layout.xml b/app/k9mail/src/main/res/layout/message_list_widget_layout.xml
index af5b9a546e0a10e266bbb97045e31fe1f3d95ecf..49033130f467cd73f1ad23fb0e0b6ef8f86194d8 100644
--- a/app/k9mail/src/main/res/layout/message_list_widget_layout.xml
+++ b/app/k9mail/src/main/res/layout/message_list_widget_layout.xml
@@ -23,7 +23,7 @@
             android:paddingTop="12dp"
             android:textSize="20sp"
             android:textColor="@color/message_list_widget_header_text"
-            tools:text="Unified Inbox" />
+            tools:text="All Inboxes" />
 
         <ImageButton
             android:id="@+id/new_message"
diff --git a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
index a724a86cbc8ef07f0889f7da9c9276d4f25edea8..d191653d271717c271199c7f37ad18f5829b1409 100644
--- a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
+++ b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
@@ -42,7 +42,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() {
         val widgetData = provider.loadUnreadWidgetData(configuration)
 
         with(widgetData!!) {
-            assertThat(title).isEqualTo("Unified Inbox")
+            assertThat(title).isEqualTo("All Inboxes")
             assertThat(unreadCount).isEqualTo(SEARCH_ACCOUNT_UNREAD_COUNT)
         }
     }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
index 5a16c6b8ebbdc30b120232ca54d1361f9f398051..5daa27caf5f0611b5ff21bf71c5451279448bde4 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
@@ -10,7 +10,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     private val checkFolderOperations = CheckFolderOperations(lockableDatabase)
 
     @Test
-    fun `single folder not included in Unified Inbox`() {
+    fun `single folder not included in All Inboxes`() {
         val folderIds = listOf(sqliteDatabase.createFolder(integrate = false))
 
         val result = checkFolderOperations.areAllIncludedInUnifiedInbox(folderIds)
@@ -19,7 +19,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     }
 
     @Test
-    fun `single folder included in Unified Inbox`() {
+    fun `single folder included in All Inboxes`() {
         val folderIds = listOf(sqliteDatabase.createFolder(integrate = true))
 
         val result = checkFolderOperations.areAllIncludedInUnifiedInbox(folderIds)
@@ -28,7 +28,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     }
 
     @Test
-    fun `not all folders included in Unified Inbox`() {
+    fun `not all folders included in All Inboxes`() {
         val folderIds = listOf(
             sqliteDatabase.createFolder(integrate = true),
             sqliteDatabase.createFolder(integrate = false)
@@ -40,7 +40,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     }
 
     @Test
-    fun `1000 folders included in Unified Inbox`() {
+    fun `1000 folders included in All Inboxes`() {
         val folderIds = List(1000) {
             sqliteDatabase.createFolder(integrate = true)
         }
@@ -51,7 +51,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     }
 
     @Test
-    fun `999 of 1000 folders included in Unified Inbox`() {
+    fun `999 of 1000 folders included in All Inboxes`() {
         val folderIds = List(999) {
             sqliteDatabase.createFolder(integrate = true)
         } + sqliteDatabase.createFolder(integrate = false)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
index e3f49d16a919d845d5ffe629692dad9846768ae2..f1ec3cb0ec439e08ac78202dd06e082234e7dd5a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
@@ -52,19 +52,8 @@ class AccountCreator(private val preferences: Preferences, private val resources
     }
 
     fun pickColor(): Int {
-        val accounts = preferences.accounts
-        val usedAccountColors = accounts.map { it.chipColor }
         val accountColors = resources.getIntArray(R.array.account_colors).toList()
-
-        val availableColors = accountColors - usedAccountColors
-        if (availableColors.isEmpty()) {
-            return accountColors.random()
-        }
-
-        return availableColors.shuffled().minByOrNull { color ->
-            val index = DEFAULT_COLORS.indexOf(color)
-            if (index != -1) index else DEFAULT_COLORS.size
-        } ?: error("availableColors must not be empty")
+        return accountColors[0];
     }
 
     companion object {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index f0223fbaffd1a3720dbe2e939504fe6015ea461b..06908f3dd0e7c29c5a13522d7fb212aa5d873342 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -389,14 +389,14 @@ open class MessageList :
     private fun decodeExtras(intent: Intent): Boolean {
         val launchData = decodeExtrasToLaunchData(intent)
 
-        // If Unified Inbox was disabled show default account instead
+        // If All Inboxes was disabled show default account instead
         val search = if (launchData.search.isUnifiedInbox && !K9.isShowUnifiedInbox) {
             createDefaultLocalSearch()
         } else {
             launchData.search
         }
 
-        // If no account has been specified, keep the currently active account when opening the Unified Inbox
+        // If no account has been specified, keep the currently active account when opening the All Inboxes
         val account = launchData.account
             ?: account?.takeIf { launchData.search.isUnifiedInbox }
             ?: search.firstAccount()
@@ -1639,7 +1639,7 @@ open class MessageList :
         drawer.selectAccount(account!!.uuid)
         when {
             singleFolderMode -> drawer.selectFolder(search!!.folderIds[0])
-            // Don't select any item in the drawer because the Unified Inbox is displayed, but not listed in the drawer
+            // Don't select any item in the drawer because the All Inboxes is displayed, but not listed in the drawer
             search!!.id == SearchAccount.UNIFIED_INBOX && !K9.isShowUnifiedInbox -> drawer.deselect()
             search!!.id == SearchAccount.UNIFIED_INBOX -> drawer.selectUnifiedInbox()
             else -> drawer.deselect()
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index 35982a999c9d6984267f6fe177115508f63a194e..a2976bb1c5ee32eedf8c6e65d9966e7ce6385049 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -173,6 +173,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
 
     private fun configureAccountHeader() {
         headerView.headerBackground = ImageHolder(R.drawable.header_background)
+        headerView.onlyMainProfileImageVisible = true
 
         headerView.onAccountHeaderListener = { _, profile, _ ->
             val account = (profile as ProfileDrawerItem).tag as Account
@@ -321,7 +322,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
             foldersViewModel.loadFolders(account)
         }
 
-        // Account can be null to refresh all (unified inbox or account list).
+        // Account can be null to refresh all (All Inboxes or account list).
         swipeRefreshLayout.setOnRefreshListener {
             val accountToRefresh = if (headerView.selectionListShown) null else account
             messagingController.checkMail(
@@ -486,7 +487,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         }
         return DrawerColors(
             accentColor = baseColor,
-            selectedColor = baseColor.and(0xffffff).or(0x22000000)
+            selectedColor =  ResourcesCompat.getColor(resources, R.color.color_drawer_selected_background, null)
         )
     }
 
diff --git a/app/ui/legacy/src/main/res/drawable/header_background.xml b/app/ui/legacy/src/main/res/drawable/header_background.xml
index 401e975603965ce80b851f245be45bab39719cf4..a85d95e6a7fcd79048f74d97c1933055a31817d2 100644
--- a/app/ui/legacy/src/main/res/drawable/header_background.xml
+++ b/app/ui/legacy/src/main/res/drawable/header_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/color_default_primary_dark" />
+    <solid android:color="@color/color_default_foreground" />
 
 </shape>
diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/app/ui/legacy/src/main/res/raw/changelog_master.xml
index 0dc11a4e17f786080407bda3ee564e165275f474..7ccc0dc42069a076354ad8e8927021f4df3fab23 100644
--- a/app/ui/legacy/src/main/res/raw/changelog_master.xml
+++ b/app/ui/legacy/src/main/res/raw/changelog_master.xml
@@ -42,7 +42,7 @@
     </release>
     <release version="5.909" versioncode="29009" date="2022-01-12">
         <change>Only remove notifications for messages currently being displayed</change>
-        <change>Open message from notification in Unified Inbox if possible</change>
+        <change>Open message from notification in All Inboxes if possible</change>
         <change>Fixed stale message count for the Outbox folder</change>
         <change>Fixed search field not working properly when using a hardware keyboard</change>
         <change>Updated translations</change>
@@ -100,7 +100,7 @@
     </release>
     <release version="5.901" versioncode="29001" date="2021-09-17">
         <change>Added support for entering Reply-To addresses when composing a message</change>
-        <change>Display the unread message count for the Unified Inbox in the drawer</change>
+        <change>Display the unread message count for the All Inboxes in the drawer</change>
         <change>Fixed crash when using the split-screen view</change>
         <change>Hide notification category settings on Android versions that don't support them</change>
         <change>Update the sync notification for an account instead of adding and removing it for each folder</change>
@@ -142,7 +142,7 @@
     </release>
     <release version="5.802" versioncode="28002" date="2021-08-04">
         <change>Fixed a bug that was triggered when Push was enabled, but the server didn't support Push. If you've noticed high battery drain, this was probably it</change>
-        <change>Added support for archive and spam actions in the Unified Inbox</change>
+        <change>Added support for archive and spam actions in the All Inboxes</change>
         <change>Fixed notification sounds/vibration. Sometimes notifications were audible when they shouldn't have been, sometimes the other way around</change>
         <change>Display the star of starred messages in yellow</change>
         <change>Don't show archive/spam action when no such folder is configured</change>
@@ -240,7 +240,7 @@
         <change>Updated translations</change>
     </release>
     <release version="5.731" versioncode="27031" date="2021-02-23">
-        <change>Fixed display bug when opening Unified Inbox from a launcher shortcut</change>
+        <change>Fixed display bug when opening All Inboxes from a launcher shortcut</change>
         <change>Fixed functionality to download and save linked images on Android 10+</change>
         <change>Moved 'show headers' functionality to a separate screen</change>
         <change>Added save button to 'edit identity' screen</change>
@@ -251,7 +251,7 @@
         <change>Fixed crash when trying to compose a message</change>
         <change>Fixed bug that could have lead to an empty email being sent</change>
         <change>Fixed bug where refresh indicator in drawer disappeared too early</change>
-        <change>Back button now opens Unified Inbox before exiting the app</change>
+        <change>Back button now opens All Inboxes before exiting the app</change>
         <change>Added translations: Belarusian, British English</change>
     </release>
     <release version="5.729" versioncode="27029" date="2021-02-12">
@@ -259,7 +259,7 @@
     </release>
     <release version="5.728" versioncode="27028" date="2021-02-10">
         <change>Added support for using a client certificate and a password at the same time</change>
-        <change>Unified Inbox is now displayed on top of the folder list in the drawer</change>
+        <change>All Inboxes is now displayed on top of the folder list in the drawer</change>
         <change>Improved the sort order of email addresses in the auto-complete popup</change>
         <change>Fixed a bug when parsing recipient email addresses in the "compose" screen</change>
         <change>Fixed bug where the folder list wasn't fetched from the server</change>
@@ -412,7 +412,7 @@
         <change>Fixed theme issues in some settings screens</change>
     </release>
     <release version="5.706" versioncode="27006" date="2020-03-03">
-        <change>Unified Inbox is now opened by default (if enabled)</change>
+        <change>All Inboxes is now opened by default (if enabled)</change>
         <change>Back button now opens default folder before exiting the app</change>
         <change>Fixed bug where the input area for the message body wasn't growing properly</change>
         <change>Keep read position when switching apps</change>
@@ -457,8 +457,8 @@
     </release>
     <release version="5.701" versioncode="27001" date="2019-12-02">
         <change>Use account color as accent color in drawer</change>
-        <change>Removed setting 'Start in Unified Inbox'</change>
-        <change>Fixed bug that displayed folders when the Unified Inbox was selected</change>
+        <change>Removed setting 'Start in All Inboxes'</change>
+        <change>Fixed bug that displayed folders when the All Inboxes was selected</change>
         <change>Fixed bug where work was accidentally done in the main thread</change>
         <change>Updated translations</change>
     </release>
@@ -882,7 +882,7 @@
         <change>Updated Greek translation</change>
     </release>
     <release version="4.331" versioncode="17032" date="2013-05-07">
-        <change>Checking mail from the Unified Inbox is now supported</change>
+        <change>Checking mail from the All Inboxes is now supported</change>
         <change>Added "mark all as read" to the menu of the message list</change>
         <change>Added sort by sender</change>
         <change>Simplified status icons in the message list</change>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index eabb8875e33c9e3c73fcbc4c7e5b54eef09b7945..6754e698deca9a4a3f27c0b25e50e657b25fb5a4 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -659,7 +659,7 @@
   <string name="integrated_inbox_title">Inbox terpadu</string>
   <string name="integrated_inbox_detail">Semua pesan dalam folder terpadu</string>
   <string name="folder_settings_include_in_integrated_inbox_label">Satukan</string>
-  <string name="folder_settings_include_in_integrated_inbox_summary">Semua pesan ditampilkan di Unified Inbox</string>
+  <string name="folder_settings_include_in_integrated_inbox_summary">Semua pesan ditampilkan di All Inboxes</string>
   <string name="account_settings_searchable_label">Folder untuk dicari</string>
   <string name="account_settings_searchable_all">Semua</string>
   <string name="account_settings_searchable_displayable">Bisa ditampilkan</string>
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index e06953f0e810764d0897101e3124c26264073f5b..41d2f04c532d364fe9b46c2b761c6f7048952ff8 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -27,4 +27,6 @@
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
     <color name="color_default_divider">@lineageos.platform:color/color_default_divider</color>
     <color name="color_default_gray2">@lineageos.platform:color/color_default_gray2</color>
+
+    <color name="color_drawer_selected_background">#145DB2FF</color>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index b66365e8c2b4547cee550e1e744d355bc5e631d6..71ba646f069835e561ae63b1bd753c40d96ccf87 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -786,14 +786,14 @@
     <string name="volume_navigation_message">In message views</string>
     <string name="volume_navigation_list">In list views</string>
 
-    <string name="show_unified_inbox_title">Show Unified Inbox</string>
+    <string name="show_unified_inbox_title">Show All Inboxes</string>
     <string name="show_starred_count_title">Show starred count</string>
 
-    <string name="integrated_inbox_title">Unified Inbox</string>
+    <string name="integrated_inbox_title">All Inboxes</string>
     <string name="integrated_inbox_detail">All messages in unified folders</string>
 
     <string name="folder_settings_include_in_integrated_inbox_label">Unify</string>
-    <string name="folder_settings_include_in_integrated_inbox_summary">All messages are shown in Unified Inbox</string>
+    <string name="folder_settings_include_in_integrated_inbox_summary">All messages are shown in All Inboxes</string>
 
     <string name="account_settings_searchable_label">Folders to search</string>
     <string name="account_settings_searchable_all">All</string>
@@ -929,7 +929,7 @@
     <string name="unread_widget_select_account">Show unread count for…</string>
     <string name="unread_widget_account_title">Account</string>
     <string name="unread_widget_account_summary">The account for which the unread count should be displayed</string>
-    <string name="unread_widget_unified_inbox_account_summary">Unified Inbox</string>
+    <string name="unread_widget_unified_inbox_account_summary">All Inboxes</string>
     <string name="unread_widget_folder_enabled_title">Folder count</string>
     <string name="unread_widget_folder_enabled_summary">Display the unread count of only a single folder</string>
     <string name="unread_widget_folder_title">Folder</string>
diff --git a/app/ui/legacy/src/main/res/xml/account_settings.xml b/app/ui/legacy/src/main/res/xml/account_settings.xml
index a0270b39ecdbcaf1f2c67b62edc7db5f35f941f1..79c14ba10178488f944f16635e598b536223e457 100644
--- a/app/ui/legacy/src/main/res/xml/account_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/account_settings.xml
@@ -20,7 +20,8 @@
             android:key="chip_color"
             android:summary="@string/account_settings_color_summary"
             android:title="@string/account_settings_color_label"
-            app:pref_colors="@array/account_colors" />
+            app:pref_colors="@array/account_colors"
+            app:isPreferenceVisible="false" />
 
     </PreferenceScreen>
 
diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar
index db9993a55feec3762092011c64b42be59fa8e035..aabc9df7dba4a49b4ab2716fd0dcaf617a636b0c 100644
Binary files a/e-ui-sdk.jar and b/e-ui-sdk.jar differ
diff --git a/fastlane/metadata/android/en-US/changelogs/29009.txt b/fastlane/metadata/android/en-US/changelogs/29009.txt
index dd7d27ebaacad00a7d6a50afcb155ca6907fad04..5c2c25aa3340dd186fa1e3d41d2c210754ed23b9 100644
--- a/fastlane/metadata/android/en-US/changelogs/29009.txt
+++ b/fastlane/metadata/android/en-US/changelogs/29009.txt
@@ -1,5 +1,5 @@
 - Only remove notifications for messages currently being displayed
-- Open message from notification in Unified Inbox if possible
+- Open message from notification in All Inboxes if possible
 - Fixed stale message count for the Outbox folder
 - Fixed search field not working properly when using a hardware keyboard
 - Updated translations
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 6853457f905291318c268347481d1b198e639a85..732e4f72723d080f64ed725d4848a7107a71cfd2 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -3,7 +3,7 @@ K-9 Mail is an open source email client that works with basically every email pr
 <b>Features</b>
 
 * supports multiple accounts
-* Unified Inbox
+* All Inboxes
 * privacy-friendly (no tracking whatsoever, only connects to your email provider)
 * automatic background synchronization or push notifications
 * local and server-side search