diff --git a/app/common/src/main/res/menu/unread_widget_option.xml b/app/common/src/main/res/menu/unread_widget_option.xml
index 1033e42af..9e827f65d 100644
--- a/app/common/src/main/res/menu/unread_widget_option.xml
+++ b/app/common/src/main/res/menu/unread_widget_option.xml
@@ -5,6 +5,6 @@
         android:id="@+id/done"
         android:title="@string/unread_widget_action_done"
         app:showAsAction="always"
-        android:icon="?attr/iconActionSave"
+        android:icon="@drawable/ic_floppy"
         />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
index f01616905..ea8f7d852 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -18,7 +18,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
-import androidx.core.content.withStyledAttributes
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResultListener
@@ -240,16 +240,14 @@ class MessageViewFragment :
                 menu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_read_action)
             }
 
-            val drawableAttr = if (isMessageRead) {
-                intArrayOf(R.attr.iconActionMarkAsUnread)
+            val drawableId = if (isMessageRead) {
+                R.drawable.ic_mark_new
             } else {
-                intArrayOf(R.attr.iconActionMarkAsRead)
+                R.drawable.ic_opened_envelope
             }
 
-            val toolbarContext = requireActivity().findViewById<View>(R.id.toolbar).context
-            toolbarContext.withStyledAttributes(attrs = drawableAttr) {
-                menu.findItem(R.id.toggle_unread).icon = getDrawable(0)
-            }
+            val drawable = ContextCompat.getDrawable(requireContext(), drawableId)
+            menu.findItem(R.id.toggle_unread).icon = drawable
         }
 
         if (isMoveCapable) {
@@ -588,9 +586,11 @@ class MessageViewFragment :
             MessageDetailsFragment.ACTION_SEARCH_KEYS -> {
                 messageCryptoPresenter.onClickSearchKey()
             }
+
             MessageDetailsFragment.ACTION_SHOW_WARNING -> {
                 messageCryptoPresenter.onClickShowCryptoWarningDetails()
             }
+
             else -> {
                 error("Unsupported action: $action")
             }
@@ -691,6 +691,7 @@ class MessageViewFragment :
                     cancelText,
                 )
             }
+
             R.id.dialog_confirm_spam -> {
                 val title = getString(R.string.dialog_confirm_spam_title)
                 val message = resources.getQuantityString(R.plurals.dialog_confirm_spam_message, 1)
@@ -704,6 +705,7 @@ class MessageViewFragment :
                     cancelText,
                 )
             }
+
             R.id.dialog_attachment_progress -> {
                 val currentAttachmentViewInfo = checkNotNull(this.currentAttachmentViewInfo)
 
@@ -711,6 +713,7 @@ class MessageViewFragment :
                 val size = currentAttachmentViewInfo.size
                 AttachmentDownloadDialogFragment.newInstance(size, message)
             }
+
             else -> {
                 throw RuntimeException("Called showDialog(int) with unknown dialog id.")
             }
@@ -787,9 +790,11 @@ class MessageViewFragment :
                     putExtra(MessageCompose.EXTRA_ACCOUNT, messageReference.accountUuid)
                 }
             }
+
             is HttpsUnsubscribeUri -> {
                 Intent(Intent.ACTION_VIEW, unsubscribeUri.uri)
             }
+
             else -> error("Unknown UnsubscribeUri - $unsubscribeUri")
         }
 
diff --git a/app/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_dark.png b/app/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_dark.png
deleted file mode 100644
index 1950ff406..000000000
Binary files a/app/ui/legacy/src/main/res/drawable-hdpi/ic_action_request_read_receipt_dark.png and /dev/null differ
diff --git a/app/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_dark.png b/app/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_dark.png
deleted file mode 100644
index 6d9102c7d..000000000
Binary files a/app/ui/legacy/src/main/res/drawable-mdpi/ic_action_request_read_receipt_dark.png and /dev/null differ
diff --git a/app/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png b/app/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png
deleted file mode 100644
index f39686cb3..000000000
Binary files a/app/ui/legacy/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png and /dev/null differ
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml b/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
index adae3522e..54c61c229 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
@@ -99,7 +99,7 @@
             android:layout_marginBottom="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/remove_attachment_action"
-            app:srcCompat="?attr/iconActionCancel"
+            app:srcCompat="@drawable/ic_clear"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/progressBar"
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
index ddffa5133..1c20668b2 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
@@ -181,7 +181,7 @@
                 android:layout_height="match_parent"
                 android:padding="6dp"
                 android:scaleType="centerCrop"
-                app:srcCompat="?attr/iconActionExpand" />
+                app:srcCompat="@drawable/ic_chevron_down" />
 
             <Space
                 android:layout_width="wrap_content"
@@ -299,7 +299,7 @@
                 android:layout_height="match_parent"
                 android:padding="6dp"
                 android:scaleType="centerCrop"
-                app:srcCompat="?attr/iconActionExpand"
+                app:srcCompat="@drawable/ic_chevron_down"
                 android:id="@+id/recipient_expander"
                 />
 
diff --git a/app/ui/legacy/src/main/res/layout/message_list_fragment.xml b/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
index 45ee0ebcb..0b9268298 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
@@ -33,7 +33,7 @@
         android:layout_margin="@dimen/floatingActionButtonMargin"
         android:contentDescription="@string/compose_action"
         app:layout_behavior="com.fsck.k9.ui.fab.HideFabOnScrollBehavior"
-        app:srcCompat="?attr/iconActionCompose"
+        app:srcCompat="@drawable/ic_pencil"
         />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_view_attachment.xml b/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
index 52d09b52a..f959e0ac4 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
@@ -90,7 +90,7 @@
                 android:layout_marginBottom="8dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/remove_attachment_action"
-                app:srcCompat="?attr/iconActionSaveAttachment"
+                app:srcCompat="@drawable/ic_download"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/attachment_preview" />
diff --git a/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml b/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
index cca575f8d..7cc150f3b 100644
--- a/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
+++ b/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
@@ -65,7 +65,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            app:srcCompat="?attr/iconActionNextStatus"
+            app:srcCompat="@drawable/ic_chevron_right"
             />
 
         <ImageView
diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
index 4d556b887..836cae7b0 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
@@ -65,7 +65,7 @@
             android:padding="8dp"
             android:id="@+id/alternate_remove"
             android:background="?android:selectableItemBackground"
-            app:srcCompat="?attr/iconActionCancel"
+            app:srcCompat="@drawable/ic_clear"
             />
 
     </LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
index c3c77f8d6..faf18f624 100644
--- a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
@@ -24,7 +24,7 @@
             android:layout_height="40dp"
             android:contentDescription="@string/account_settings_action"
             android:padding="8dp"
-            app:srcCompat="?attr/iconActionSettings" />
+            app:srcCompat="@drawable/ic_cog" />
 
         <TextView
             android:id="@+id/text"
diff --git a/app/ui/legacy/src/main/res/menu/choose_folder_option.xml b/app/ui/legacy/src/main/res/menu/choose_folder_option.xml
index 2a5c3325f..5fb65b5f4 100644
--- a/app/ui/legacy/src/main/res/menu/choose_folder_option.xml
+++ b/app/ui/legacy/src/main/res/menu/choose_folder_option.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/filter_folders"
-        android:icon="?attr/iconActionSearchFolder"
+        android:icon="@drawable/ic_folder_magnify"
         android:title="@string/filter_folders_action"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom" />
@@ -22,7 +22,7 @@
         android:title="@string/folder_list_display_mode_not_second_class" />
     <item
         android:id="@+id/list_folders"
-        android:icon="?attr/iconActionRefresh"
+        android:icon="@drawable/ic_refresh"
         android:title="@string/refresh_folders_action" />
 
 </menu>
diff --git a/app/ui/legacy/src/main/res/menu/folder_list_option.xml b/app/ui/legacy/src/main/res/menu/folder_list_option.xml
index 2f861c3b8..75f30c10a 100644
--- a/app/ui/legacy/src/main/res/menu/folder_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/folder_list_option.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/filter_folders"
-        android:icon="?attr/iconActionSearchFolder"
+        android:icon="@drawable/ic_folder_magnify"
         android:title="@string/filter_folders_action"
         app:showAsAction="collapseActionView|ifRoom"
         app:actionViewClass="androidx.appcompat.widget.SearchView"/>
     <item
-        android:icon="?attr/iconFolder"
+        android:icon="@drawable/ic_inbox"
         android:title="@string/folder_list_display_mode_label">
         <menu>
             <item
@@ -27,6 +27,6 @@
     </item>
     <item
         android:id="@+id/list_folders"
-        android:icon="?attr/iconActionRefresh"
+        android:icon="@drawable/ic_refresh"
         android:title="@string/refresh_folders_action"/>
 </menu>
diff --git a/app/ui/legacy/src/main/res/menu/general_settings_option.xml b/app/ui/legacy/src/main/res/menu/general_settings_option.xml
index e32677ed8..298cc51af 100644
--- a/app/ui/legacy/src/main/res/menu/general_settings_option.xml
+++ b/app/ui/legacy/src/main/res/menu/general_settings_option.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/search"
         android:title="@string/search_action"
-        android:icon="?attr/iconActionSearch"
+        android:icon="@drawable/ic_magnify"
         app:showAsAction="collapseActionView|ifRoom"
         app:actionViewClass="com.bytehamster.lib.preferencesearch.SearchPreferenceActionView" />
 
diff --git a/app/ui/legacy/src/main/res/menu/manage_identities_option.xml b/app/ui/legacy/src/main/res/menu/manage_identities_option.xml
index 676b48be6..a6328e877 100644
--- a/app/ui/legacy/src/main/res/menu/manage_identities_option.xml
+++ b/app/ui/legacy/src/main/res/menu/manage_identities_option.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/new_identity"
         android:title="@string/new_identity_action"
-        android:icon="?attr/iconActionAdd"
+        android:icon="@drawable/ic_plus"
     />
 </menu>
diff --git a/app/ui/legacy/src/main/res/menu/message_compose_option.xml b/app/ui/legacy/src/main/res/menu/message_compose_option.xml
index 38d13b446..85a4966dd 100644
--- a/app/ui/legacy/src/main/res/menu/message_compose_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_compose_option.xml
@@ -4,13 +4,13 @@
     <item
         android:id="@+id/add_attachment"
         android:title="@string/add_attachment_action"
-        android:icon="?attr/iconActionAddAttachment"
+        android:icon="@drawable/ic_attachment"
         app:showAsAction="always"
     />
     <item
         android:id="@+id/send"
         android:title="@string/send_action"
-        android:icon="?attr/iconActionSend"
+        android:icon="@drawable/ic_send"
         app:showAsAction="always"
     />
     <item
@@ -20,17 +20,17 @@
     <item
         android:id="@+id/save"
         android:title="@string/save_draft_action"
-        android:icon="?attr/iconActionSave"
+        android:icon="@drawable/ic_floppy"
         />
     <item
         android:id="@+id/discard"
         android:title="@string/discard_action"
-        android:icon="?attr/iconActionCancel"
+        android:icon="@drawable/ic_clear"
     />
     <item
         android:id="@+id/read_receipt"
         android:title="@string/read_receipt"
-        android:icon="?attr/iconActionRequestReadReceipt"
+        android:icon="@drawable/ic_action_request_read_receipt_light"
     />
     <item
         android:id="@+id/openpgp_encrypt_enable"
diff --git a/app/ui/legacy/src/main/res/menu/message_list_context.xml b/app/ui/legacy/src/main/res/menu/message_list_context.xml
index 4619218dc..38f267ff0 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_context.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_context.xml
@@ -5,31 +5,31 @@
         android:id="@+id/delete"
         android:title="@string/delete_action"
         app:showAsAction="always"
-        android:icon="?attr/iconActionDelete"
+        android:icon="@drawable/ic_trash_can"
     />
     <item
         android:id="@+id/mark_as_read"
         android:title="@string/mark_as_read_action"
         app:showAsAction="always"
-        android:icon="?attr/iconActionMarkAsRead"
+        android:icon="@drawable/ic_opened_envelope"
     />
     <item
         android:id="@+id/mark_as_unread"
         android:title="@string/mark_as_unread_action"
         app:showAsAction="always"
-        android:icon="?attr/iconActionMarkAsUnread"
+        android:icon="@drawable/ic_mark_new"
     />
     <item
         android:id="@+id/archive"
         android:title="@string/archive_action"
         app:showAsAction="always"
-        android:icon="?attr/iconActionArchive"
+        android:icon="@drawable/ic_archive"
     />
     <item
         android:id="@+id/move"
         android:title="@string/move_action"
         app:showAsAction="ifRoom"
-        android:icon="?attr/iconActionMove"
+        android:icon="@drawable/ic_move_to_folder"
     />
     <item
         android:id="@+id/move_to_drafts"
@@ -40,29 +40,29 @@
     <item
         android:id="@+id/copy"
         android:title="@string/copy_action"
-        android:icon="?attr/iconActionCopy"
+        android:icon="@drawable/ic_content_copy"
     />
     <item
         android:id="@+id/flag"
         android:title="@string/flag_action"
         app:showAsAction="ifRoom"
-        android:icon="?attr/iconActionFlag"
+        android:icon="@drawable/ic_star"
     />
     <item
         android:id="@+id/unflag"
         android:title="@string/unflag_action"
         app:showAsAction="ifRoom"
-        android:icon="?attr/iconActionUnflag"
+        android:icon="@drawable/ic_star_outline"
     />
     <item
         android:id="@+id/spam"
         android:title="@string/spam_action"
         app:showAsAction="ifRoom"
-        android:icon="?attr/iconActionSpam"
+        android:icon="@drawable/ic_alert_octagon"
     />
     <item
         android:id="@+id/select_all"
-        android:icon="?attr/iconActionSelectAll"
+        android:icon="@drawable/ic_select_all"
         app:showAsAction="never"
         android:title="@string/batch_select_all"
     />
diff --git a/app/ui/legacy/src/main/res/menu/message_list_option.xml b/app/ui/legacy/src/main/res/menu/message_list_option.xml
index 7d57918c3..78ae2a971 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_option.xml
@@ -11,7 +11,7 @@
     <!-- MessageList -->
     <item
         android:id="@+id/search"
-        android:icon="?attr/iconActionSearch"
+        android:icon="@drawable/ic_magnify"
         android:title="@string/search_action"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always" />
@@ -19,7 +19,7 @@
     <!-- MessageList -->
     <item
         android:id="@+id/search_remote"
-        android:icon="?attr/iconActionRemoteSearch"
+        android:icon="@drawable/ic_magnify_cloud"
         android:title="@string/action_remote_search"
         android:visible="false"
         app:showAsAction="always" />
@@ -27,7 +27,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/archive"
-        android:icon="?attr/iconActionArchive"
+        android:icon="@drawable/ic_archive"
         android:title="@string/archive_action"
         android:visible="false"
         app:showAsAction="always" />
@@ -35,7 +35,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/delete"
-        android:icon="?attr/iconActionDelete"
+        android:icon="@drawable/ic_trash_can"
         android:title="@string/delete_action"
         android:visible="false"
         app:showAsAction="always" />
@@ -43,7 +43,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/toggle_unread"
-        android:icon="?attr/iconActionMarkAsUnread"
+        android:icon="@drawable/ic_mark_new"
         android:title="@string/mark_as_unread_action"
         android:visible="false"
         app:showAsAction="always" />
@@ -51,7 +51,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/spam"
-        android:icon="?attr/iconActionSpam"
+        android:icon="@drawable/ic_alert_octagon"
         android:title="@string/spam_action"
         android:visible="false"
         app:showAsAction="ifRoom" />
@@ -59,7 +59,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/move"
-        android:icon="?attr/iconActionMove"
+        android:icon="@drawable/ic_move_to_folder"
         android:title="@string/move_action"
         android:visible="false"
         app:showAsAction="ifRoom" />
@@ -67,7 +67,7 @@
     <!-- MessageView -->
     <item
         android:id="@+id/copy"
-        android:icon="?attr/iconActionCopy"
+        android:icon="@drawable/ic_content_copy"
         android:title="@string/copy_action"
         android:visible="false"
         app:showAsAction="ifRoom" />
@@ -121,14 +121,14 @@
     <!-- always -->
     <item
         android:id="@+id/compose"
-        android:icon="?attr/iconActionCompose"
+        android:icon="@drawable/ic_pencil"
         android:title="@string/compose_action"
         app:showAsAction="ifRoom" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/set_sort"
-        android:icon="?attr/iconActionSort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom">
         <menu>
@@ -159,7 +159,7 @@
     <!-- MessageList -->
     <item
         android:id="@+id/select_all"
-        android:icon="?attr/iconActionSelectAll"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/batch_select_all"
         app:showAsAction="never" />
 
@@ -172,7 +172,7 @@
     <!-- MessageList -->
     <item
         android:id="@+id/send_messages"
-        android:icon="?attr/iconActionUpload"
+        android:icon="@drawable/ic_file_upload"
         android:title="@string/send_messages_action"
         app:showAsAction="never" />
 
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index 64d15fbb5..4e75c4bea 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -2,55 +2,6 @@
 <resources>
 
     <declare-styleable name="K9Styles">
-        <attr name="iconFolder" format="reference" />
-        <attr name="iconFolderInbox" format="reference" />
-        <attr name="iconFolderOutbox" format="reference" />
-        <attr name="iconFolderArchive" format="reference" />
-        <attr name="iconFolderDrafts" format="reference" />
-        <attr name="iconFolderSent" format="reference" />
-        <attr name="iconFolderSpam" format="reference" />
-        <attr name="iconFolderTrash" format="reference" />
-        <attr name="iconActionAddAttachment" format="reference" />
-        <attr name="iconActionArchive" format="reference" />
-        <attr name="iconActionCompose" format="reference" />
-        <attr name="iconActionDelete" format="reference" />
-        <attr name="iconActionMove" format="reference" />
-        <attr name="iconActionCopy" format="reference" />
-        <attr name="iconActionNextStatus" format="reference" />
-        <attr name="iconActionRefresh" format="reference" />
-        <attr name="iconActionSearch" format="reference" />
-        <attr name="iconActionSearchFolder" format="reference" />
-        <attr name="iconActionSend" format="reference" />
-        <attr name="iconActionSettings" format="reference" />
-        <attr name="iconActionSort" format="reference" />
-        <attr name="iconActionSpam" format="reference" />
-        <attr name="iconActionFlag" format="reference" />
-        <attr name="iconActionUnflag" format="reference" />
-        <attr name="iconActionMarkAsRead" format="reference" />
-        <attr name="iconActionMarkAsUnread" format="reference" />
-        <attr name="iconActionRemoteSearch" format="reference" />
-        <attr name="iconActionAdd" format="reference" />
-        <attr name="iconActionImportExport" format="reference" />
-        <attr name="iconActionUpload" format="reference" />
-        <attr name="iconActionSelectAll" format="reference" />
-        <attr name="iconActionSave" format="reference" />
-        <attr name="iconActionSaveAttachment" format="reference" />
-        <attr name="iconActionCancel" format="reference" />
-        <attr name="iconActionRequestReadReceipt" format="reference" />
-        <attr name="iconActionExpand" format="reference" />
-        <attr name="iconActionCollapse" format="reference" />
-        <attr name="iconPreferencesDisplay" format="reference" />
-        <attr name="iconPreferencesInteraction" format="reference" />
-        <attr name="iconPreferencesNotifications" format="reference" />
-        <attr name="iconPreferencesNetwork" format="reference" />
-        <attr name="iconPreferencesPrivacy" format="reference" />
-        <attr name="iconPreferencesDebug" format="reference" />
-        <attr name="iconPreferencesFolders" format="reference" />
-        <attr name="iconPreferencesCrypto" format="reference" />
-        <attr name="iconPreferencesFetchMail" format="reference" />
-        <attr name="iconPreferencesSearch" format="reference" />
-        <attr name="iconPreferencesReadMail" format="reference" />
-        <attr name="iconPreferencesCompose" format="reference" />
         <attr name="iconSettingsAbout" format="reference" />
         <attr name="iconSettingsGeneral" format="reference" />
         <attr name="iconSettingsAccount" format="reference" />
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index 3cefe7ee6..ef6621d57 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -66,55 +66,6 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
-        <item name="iconFolder">@drawable/ic_folder</item>
-        <item name="iconFolderInbox">@drawable/ic_inbox</item>
-        <item name="iconFolderOutbox">@drawable/ic_outbox</item>
-        <item name="iconFolderArchive">@drawable/ic_archive</item>
-        <item name="iconFolderDrafts">@drawable/ic_drafts_folder</item>
-        <item name="iconFolderSent">@drawable/ic_send</item>
-        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>
-        <item name="iconFolderTrash">@drawable/ic_trash_can</item>
-        <item name="iconActionAddAttachment">@drawable/ic_attachment</item>
-        <item name="iconActionArchive">@drawable/ic_archive</item>
-        <item name="iconActionCompose">@drawable/ic_pencil</item>
-        <item name="iconActionDelete">@drawable/ic_trash_can</item>
-        <item name="iconActionMove">@drawable/ic_move_to_folder</item>
-        <item name="iconActionCopy">@drawable/ic_content_copy</item>
-        <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionRefresh">@drawable/ic_refresh</item>
-        <item name="iconActionSearch">@drawable/ic_magnify</item>
-        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
-        <item name="iconActionSend">@drawable/ic_send</item>
-        <item name="iconActionSettings">@drawable/ic_cog</item>
-        <item name="iconActionSort">@drawable/ic_sort</item>
-        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
-        <item name="iconActionFlag">@drawable/ic_star</item>
-        <item name="iconActionUnflag">@drawable/ic_star_outline</item>
-        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>
-        <item name="iconActionMarkAsUnread">@drawable/ic_mark_new</item>
-        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>
-        <item name="iconActionAdd">@drawable/ic_plus</item>
-        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
-        <item name="iconActionUpload">@drawable/ic_file_upload</item>
-        <item name="iconActionSelectAll">@drawable/ic_select_all</item>
-        <item name="iconActionSave">@drawable/ic_floppy</item>
-        <item name="iconActionSaveAttachment">@drawable/ic_download</item>
-        <item name="iconActionCancel">@drawable/ic_clear</item>
-        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>
-        <item name="iconActionExpand">@drawable/ic_chevron_down</item>
-        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>
-        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>
-        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>
-        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>
-        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>
-        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>
-        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
-        <item name="iconPreferencesFolders">@drawable/ic_folder</item>
-        <item name="iconPreferencesSearch">@drawable/ic_magnify</item>
-        <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>
-        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>
-        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>
-        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>
         <item name="iconSettingsAbout">@drawable/ic_info</item>
         <item name="iconSettingsGeneral">@drawable/ic_cog</item>
         <item name="iconSettingsAccount">@drawable/ic_account</item>
@@ -151,19 +102,19 @@
         <item name="messageListSwipeDisabledBackgroundColor">@color/material_gray_200</item>
         <item name="messageListSwipeSelectIcon">@drawable/ic_check_circle</item>
         <item name="messageListSwipeSelectBackgroundColor">@color/material_blue_600</item>
-        <item name="messageListSwipeMarkAsReadIcon">?attr/iconActionMarkAsRead</item>
-        <item name="messageListSwipeMarkAsUnreadIcon">?attr/iconActionMarkAsUnread</item>
+        <item name="messageListSwipeMarkAsReadIcon">@drawable/ic_opened_envelope</item>
+        <item name="messageListSwipeMarkAsUnreadIcon">@drawable/ic_mark_new</item>
         <item name="messageListSwipeToggleReadBackgroundColor">@color/material_blue_600</item>
-        <item name="messageListSwipeAddStarIcon">?attr/iconActionFlag</item>
-        <item name="messageListSwipeRemoveStarIcon">?attr/iconActionUnflag</item>
+        <item name="messageListSwipeAddStarIcon">@drawable/ic_star</item>
+        <item name="messageListSwipeRemoveStarIcon">@drawable/ic_star_outline</item>
         <item name="messageListSwipeToggleStarBackgroundColor">@color/material_orange_600</item>
-        <item name="messageListSwipeArchiveIcon">?attr/iconActionArchive</item>
+        <item name="messageListSwipeArchiveIcon">@drawable/ic_archive</item>
         <item name="messageListSwipeArchiveBackgroundColor">@color/material_green_600</item>
-        <item name="messageListSwipeDeleteIcon">?attr/iconActionDelete</item>
+        <item name="messageListSwipeDeleteIcon">@drawable/ic_trash_can</item>
         <item name="messageListSwipeDeleteBackgroundColor">@color/material_red_600</item>
-        <item name="messageListSwipeSpamIcon">?attr/iconActionSpam</item>
+        <item name="messageListSwipeSpamIcon">@drawable/ic_alert_octagon</item>
         <item name="messageListSwipeSpamBackgroundColor">@color/material_red_700</item>
-        <item name="messageListSwipeMoveIcon">?attr/iconActionMove</item>
+        <item name="messageListSwipeMoveIcon">@drawable/ic_move_to_folder</item>
         <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_500</item>
 
         <item name="messageStarColor">#fbbc04</item>
@@ -267,55 +218,6 @@
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
-        <item name="iconFolder">@drawable/ic_folder</item>
-        <item name="iconFolderInbox">@drawable/ic_inbox</item>
-        <item name="iconFolderOutbox">@drawable/ic_outbox</item>
-        <item name="iconFolderArchive">@drawable/ic_archive</item>
-        <item name="iconFolderDrafts">@drawable/ic_drafts_folder</item>
-        <item name="iconFolderSent">@drawable/ic_send</item>
-        <item name="iconFolderSpam">@drawable/ic_alert_octagon</item>
-        <item name="iconFolderTrash">@drawable/ic_trash_can</item>
-        <item name="iconActionAddAttachment">@drawable/ic_attachment</item>
-        <item name="iconActionArchive">@drawable/ic_archive</item>
-        <item name="iconActionCompose">@drawable/ic_pencil</item>
-        <item name="iconActionDelete">@drawable/ic_trash_can</item>
-        <item name="iconActionMove">@drawable/ic_folder</item>
-        <item name="iconActionCopy">@drawable/ic_content_copy</item>
-        <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionRefresh">@drawable/ic_refresh</item>
-        <item name="iconActionSearch">@drawable/ic_magnify</item>
-        <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
-        <item name="iconActionSend">@drawable/ic_send</item>
-        <item name="iconActionSettings">@drawable/ic_cog</item>
-        <item name="iconActionSort">@drawable/ic_sort</item>
-        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>
-        <item name="iconActionFlag">@drawable/ic_star</item>
-        <item name="iconActionUnflag">@drawable/ic_star_outline</item>
-        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>
-        <item name="iconActionMarkAsUnread">@drawable/ic_mark_new</item>
-        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>
-        <item name="iconActionAdd">@drawable/ic_plus</item>
-        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
-        <item name="iconActionUpload">@drawable/ic_file_upload</item>
-        <item name="iconActionSelectAll">@drawable/ic_select_all</item>
-        <item name="iconActionSave">@drawable/ic_floppy</item>
-        <item name="iconActionSaveAttachment">@drawable/ic_download</item>
-        <item name="iconActionCancel">@drawable/ic_clear</item>
-        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_dark</item>
-        <item name="iconActionExpand">@drawable/ic_chevron_down</item>
-        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>
-        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>
-        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>
-        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>
-        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>
-        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>
-        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
-        <item name="iconPreferencesFolders">@drawable/ic_folder</item>
-        <item name="iconPreferencesSearch">@drawable/ic_magnify</item>
-        <item name="iconPreferencesCrypto">@drawable/ic_preferences_crypto</item>
-        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>
-        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>
-        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>
         <item name="iconSettingsAbout">@drawable/ic_info</item>
         <item name="iconSettingsGeneral">@drawable/ic_cog</item>
         <item name="iconSettingsAccount">@drawable/ic_account</item>
@@ -351,19 +253,19 @@
         <item name="messageListSwipeDisabledBackgroundColor">@color/material_gray_900</item>
         <item name="messageListSwipeSelectIcon">@drawable/ic_check_circle</item>
         <item name="messageListSwipeSelectBackgroundColor">@color/material_blue_700</item>
-        <item name="messageListSwipeMarkAsReadIcon">?attr/iconActionMarkAsRead</item>
-        <item name="messageListSwipeMarkAsUnreadIcon">?attr/iconActionMarkAsUnread</item>
+        <item name="messageListSwipeMarkAsReadIcon">@drawable/ic_opened_envelope</item>
+        <item name="messageListSwipeMarkAsUnreadIcon">@drawable/ic_mark_new</item>
         <item name="messageListSwipeToggleReadBackgroundColor">@color/material_blue_700</item>
-        <item name="messageListSwipeAddStarIcon">?attr/iconActionFlag</item>
-        <item name="messageListSwipeRemoveStarIcon">?attr/iconActionUnflag</item>
+        <item name="messageListSwipeAddStarIcon">@drawable/ic_star</item>
+        <item name="messageListSwipeRemoveStarIcon">@drawable/ic_star_outline</item>
         <item name="messageListSwipeToggleStarBackgroundColor">@color/material_orange_700</item>
-        <item name="messageListSwipeArchiveIcon">?attr/iconActionArchive</item>
+        <item name="messageListSwipeArchiveIcon">@drawable/ic_archive</item>
         <item name="messageListSwipeArchiveBackgroundColor">@color/material_green_700</item>
-        <item name="messageListSwipeDeleteIcon">?attr/iconActionDelete</item>
+        <item name="messageListSwipeDeleteIcon">@drawable/ic_trash_can</item>
         <item name="messageListSwipeDeleteBackgroundColor">@color/material_red_700</item>
-        <item name="messageListSwipeSpamIcon">?attr/iconActionSpam</item>
+        <item name="messageListSwipeSpamIcon">@drawable/ic_alert_octagon</item>
         <item name="messageListSwipeSpamBackgroundColor">@color/material_red_800</item>
-        <item name="messageListSwipeMoveIcon">?attr/iconActionMove</item>
+        <item name="messageListSwipeMoveIcon">@drawable/ic_move_to_folder</item>
         <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_600</item>
 
         <item name="messageStarColor">#fdd663</item>
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 ffef29a1b..0510b076e 100644
--- a/app/ui/legacy/src/main/res/xml/account_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/account_settings.xml
@@ -7,7 +7,7 @@
     android:title="@string/account_settings_title_fmt">
 
     <PreferenceScreen
-        android:icon="?attr/iconSettingsGeneral"
+        android:icon="@drawable/ic_cog"
         android:key="account_settings"
         android:title="@string/account_settings_general_title">
 
@@ -25,7 +25,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesReadMail"
+        android:icon="@drawable/ic_opened_envelope"
         android:key="reading_mail"
         android:title="@string/account_settings_reading_mail">
 
@@ -45,7 +45,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesFetchMail"
+        android:icon="@drawable/ic_preferences_check_mail"
         android:key="incoming_prefs"
         android:title="@string/account_settings_sync">
 
@@ -152,7 +152,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesCompose"
+        android:icon="@drawable/ic_pencil"
         android:key="composing"
         android:title="@string/account_settings_composition">
 
@@ -228,7 +228,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesFolders"
+        android:icon="@drawable/ic_folder"
         android:key="folders"
         android:title="@string/account_settings_folders">
 
@@ -293,7 +293,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesNotifications"
+        android:icon="@drawable/ic_notifications"
         android:key="notifications"
         android:title="@string/notifications_title">
 
@@ -378,7 +378,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesSearch"
+        android:icon="@drawable/ic_magnify"
         android:key="search"
         android:title="@string/account_settings_search">
 
@@ -393,7 +393,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesCrypto"
+        android:icon="@drawable/ic_preferences_crypto"
         android:key="openpgp"
         android:title="@string/account_settings_crypto">
 
diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml
index 4368c7d6f..a94f851f2 100644
--- a/app/ui/legacy/src/main/res/xml/general_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/general_settings.xml
@@ -8,7 +8,7 @@
     search:ignore="true">
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesDisplay"
+        android:icon="@drawable/ic_tv"
         android:key="display_preferences"
         android:title="@string/display_preferences"
         search:ignore="true">
@@ -305,7 +305,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesInteraction"
+        android:icon="@drawable/ic_touch"
         android:key="interaction_preferences"
         android:title="@string/interaction_preferences"
         search:ignore="true">
@@ -364,7 +364,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesNotifications"
+        android:icon="@drawable/ic_notifications"
         android:key="notification_preferences"
         android:title="@string/notifications_title"
         search:ignore="true">
@@ -415,7 +415,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesNetwork"
+        android:icon="@drawable/ic_arrow_up_down"
         android:key="network_preferences"
         android:title="@string/network_preferences"
         search:ignore="true">
@@ -431,7 +431,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesPrivacy"
+        android:icon="@drawable/ic_shield"
         android:key="privacy_preferences"
         android:title="@string/privacy_preferences"
         search:ignore="true">
@@ -449,7 +449,7 @@
     </PreferenceScreen>
 
     <PreferenceScreen
-        android:icon="?attr/iconPreferencesDebug"
+        android:icon="@drawable/ic_bug"
         android:key="debug_preferences"
         android:title="@string/debug_preferences"
         search:ignore="true">