From 4ea8c3b11220b2c2693241ee87754ce6d04177fc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 11 Dec 2021 15:14:56 +0100
Subject: [PATCH] Prevent crash

---
 .../eu/faircode/email/FixedImageButton.java   | 56 +++++++++++++++
 .../eu/faircode/email/FixedImageView.java     | 56 +++++++++++++++
 app/src/main/res/layout/action_button.xml     |  2 +-
 .../main/res/layout/action_button_text.xml    |  2 +-
 app/src/main/res/layout/activity_eml.xml      |  2 +-
 app/src/main/res/layout/activity_error.xml    |  4 +-
 app/src/main/res/layout/dialog_add_image.xml  |  2 +-
 app/src/main/res/layout/dialog_ask_again.xml  |  2 +-
 app/src/main/res/layout/dialog_ask_move.xml   |  2 +-
 .../main/res/layout/dialog_certificate.xml    |  2 +-
 .../main/res/layout/dialog_contact_group.xml  |  2 +-
 app/src/main/res/layout/dialog_deepl.xml      |  2 +-
 .../res/layout/dialog_error_reporting.xml     |  2 +-
 app/src/main/res/layout/dialog_first.xml      |  4 +-
 .../main/res/layout/dialog_folder_select.xml  |  4 +-
 app/src/main/res/layout/dialog_junk.xml       | 12 ++--
 app/src/main/res/layout/dialog_markdown.xml   |  2 +-
 .../main/res/layout/dialog_nav_options.xml    | 12 ++--
 app/src/main/res/layout/dialog_open_link.xml  | 12 ++--
 .../main/res/layout/dialog_review_account.xml |  2 +-
 app/src/main/res/layout/dialog_search.xml     | 16 ++---
 app/src/main/res/layout/dialog_send.xml       |  4 +-
 app/src/main/res/layout/dialog_setup.xml      |  4 +-
 .../main/res/layout/dialog_show_images.xml    |  4 +-
 app/src/main/res/layout/fragment_about.xml    |  2 +-
 app/src/main/res/layout/fragment_compose.xml  | 24 +++----
 app/src/main/res/layout/fragment_folder.xml   |  2 +-
 app/src/main/res/layout/fragment_folders.xml  |  4 +-
 app/src/main/res/layout/fragment_identity.xml |  2 +-
 .../res/layout/fragment_legend_compose.xml    | 22 +++---
 .../res/layout/fragment_legend_folders.xml    | 28 ++++----
 .../res/layout/fragment_legend_messages.xml   | 72 +++++++++----------
 .../fragment_legend_synchronization.xml       | 36 +++++-----
 app/src/main/res/layout/fragment_messages.xml | 18 ++---
 .../res/layout/fragment_options_display.xml   |  8 +--
 .../layout/fragment_options_encryption.xml    |  4 +-
 .../main/res/layout/fragment_options_misc.xml | 50 ++++++-------
 .../layout/fragment_options_notifications.xml | 16 ++---
 .../res/layout/fragment_options_privacy.xml   |  6 +-
 .../layout/fragment_options_synchronize.xml   |  4 +-
 app/src/main/res/layout/fragment_pro.xml      |  4 +-
 app/src/main/res/layout/fragment_rule.xml     |  6 +-
 app/src/main/res/layout/fragment_setup.xml    | 14 ++--
 .../res/layout/include_message_addresses.xml  | 12 ++--
 .../layout/include_message_attachments.xml    |  4 +-
 .../main/res/layout/include_message_body.xml  | 12 ++--
 .../res/layout/include_message_calendar.xml   |  2 +-
 .../res/layout/include_message_compact.xml    | 36 +++++-----
 .../res/layout/include_message_headers.xml    |  4 +-
 .../res/layout/include_message_navigation.xml | 62 ++++++++--------
 .../res/layout/include_message_normal.xml     | 36 +++++-----
 app/src/main/res/layout/include_nav.xml       | 22 +++---
 app/src/main/res/layout/item_account.xml      | 12 ++--
 app/src/main/res/layout/item_answer.xml       |  8 +--
 app/src/main/res/layout/item_attachment.xml   | 10 +--
 .../main/res/layout/item_attachment_eml.xml   |  6 +-
 app/src/main/res/layout/item_certificate.xml  |  2 +-
 app/src/main/res/layout/item_contact.xml      |  6 +-
 app/src/main/res/layout/item_folder.xml       | 24 +++----
 .../main/res/layout/item_folder_select.xml    |  4 +-
 .../res/layout/item_folder_unselectable.xml   |  4 +-
 app/src/main/res/layout/item_identity.xml     | 10 +--
 app/src/main/res/layout/item_image.xml        |  2 +-
 app/src/main/res/layout/item_keyword.xml      |  4 +-
 app/src/main/res/layout/item_nav.xml          |  8 +--
 app/src/main/res/layout/item_operation.xml    |  2 +-
 app/src/main/res/layout/item_order.xml        |  2 +-
 app/src/main/res/layout/item_rule.xml         |  2 +-
 app/src/main/res/layout/spinner_contact.xml   |  2 +-
 69 files changed, 472 insertions(+), 360 deletions(-)
 create mode 100644 app/src/main/java/eu/faircode/email/FixedImageButton.java
 create mode 100644 app/src/main/java/eu/faircode/email/FixedImageView.java

diff --git a/app/src/main/java/eu/faircode/email/FixedImageButton.java b/app/src/main/java/eu/faircode/email/FixedImageButton.java
new file mode 100644
index 0000000000..55a4fe6801
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/FixedImageButton.java
@@ -0,0 +1,56 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2021 by Marcel Bokhorst (M66B)
+*/
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageButton;
+
+public class FixedImageButton extends AppCompatImageButton {
+    public FixedImageButton(@NonNull Context context) {
+        super(context);
+    }
+
+    public FixedImageButton(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FixedImageButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        try {
+            super.onDraw(canvas);
+        } catch (RuntimeException ex) {
+            Log.e(ex);
+            Context context = getContext();
+            Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
+            d.setBounds(getDrawable().getBounds());
+            d.draw(canvas);
+        }
+    }
+}
diff --git a/app/src/main/java/eu/faircode/email/FixedImageView.java b/app/src/main/java/eu/faircode/email/FixedImageView.java
new file mode 100644
index 0000000000..cce57eea9d
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/FixedImageView.java
@@ -0,0 +1,56 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2021 by Marcel Bokhorst (M66B)
+*/
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class FixedImageView extends androidx.appcompat.widget.AppCompatImageView {
+
+    public FixedImageView(@NonNull Context context) {
+        super(context);
+    }
+
+    public FixedImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FixedImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        try {
+            super.onDraw(canvas);
+        } catch (RuntimeException ex) {
+            Log.e(ex);
+            Context context = getContext();
+            Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
+            d.setBounds(getDrawable().getBounds());
+            d.draw(canvas);
+        }
+    }
+}
diff --git a/app/src/main/res/layout/action_button.xml b/app/src/main/res/layout/action_button.xml
index f43b763f12..ce526e0892 100644
--- a/app/src/main/res/layout/action_button.xml
+++ b/app/src/main/res/layout/action_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.faircode.email.FixedImageButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/action_button_text.xml b/app/src/main/res/layout/action_button_text.xml
index 46f6ee4c55..4fc2397d55 100644
--- a/app/src/main/res/layout/action_button_text.xml
+++ b/app/src/main/res/layout/action_button_text.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/button"
         style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index 5e6b8f255b..b104165180 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -293,7 +293,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <ImageButton
+                    <eu.faircode.email.FixedImageButton
                         android:id="@+id/ibEml"
                         android:layout_width="36dp"
                         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 7124b20cef..0fc6ee1f6b 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -80,7 +80,7 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-                    <ImageButton
+                    <eu.faircode.email.FixedImageButton
                         android:id="@+id/ibSetting"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                         app:layout_constraintTop_toBottomOf="@id/btnPassword"
                         app:srcCompat="@drawable/twotone_settings_24" />
 
-                    <ImageButton
+                    <eu.faircode.email.FixedImageButton
                         android:id="@+id/ibInfo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_add_image.xml b/app/src/main/res/layout/dialog_add_image.xml
index 7532e93080..07f61b3148 100644
--- a/app/src/main/res/layout/dialog_add_image.xml
+++ b/app/src/main/res/layout/dialog_add_image.xml
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index a81db8e23e..8b31e9e216 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_ask_move.xml b/app/src/main/res/layout/dialog_ask_move.xml
index 39d8d0c40e..c78385881b 100644
--- a/app/src/main/res/layout/dialog_ask_move.xml
+++ b/app/src/main/res/layout/dialog_ask_move.xml
@@ -38,7 +38,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessages" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivArrow"
             android:layout_width="48dp"
             android:layout_height="48dp"
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index 359e60f159..bb8e8b281e 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -102,7 +102,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEmailInvalid" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/dialog_contact_group.xml b/app/src/main/res/layout/dialog_contact_group.xml
index c8c7083034..5ce2c3b8f6 100644
--- a/app/src/main/res/layout/dialog_contact_group.xml
+++ b/app/src/main/res/layout/dialog_contact_group.xml
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index 6ed84fbe04..924f6da4a4 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_error_reporting.xml b/app/src/main/res/layout/dialog_error_reporting.xml
index 40803146ae..162e7cec71 100644
--- a/app/src/main/res/layout/dialog_error_reporting.xml
+++ b/app/src/main/res/layout/dialog_error_reporting.xml
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index 2e4f0be28d..40231b287e 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncNote" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibBatteryInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -82,7 +82,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibBatteryInfo" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibReformatInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_folder_select.xml b/app/src/main/res/layout/dialog_folder_select.xml
index b785025525..44cb1cf4ec 100644
--- a/app/src/main/res/layout/dialog_folder_select.xml
+++ b/app/src/main/res/layout/dialog_folder_select.xml
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibNext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
         app:layout_constraintStart_toEndOf="@id/tvFavorite2"
         app:layout_constraintTop_toBottomOf="@id/tvNoFolder" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibResetFavorites"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 2d74fb7091..9ed2d72f64 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -36,7 +36,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvMessage" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfoProvider"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -82,7 +82,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/cbBlockDomain" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbJunkFilter" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfoFilter"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -180,7 +180,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBlocklist" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfoBlocklist"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -206,7 +206,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBlocklistHint" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibRules"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -220,7 +220,7 @@
             app:layout_constraintTop_toTopOf="@id/btnClear"
             app:srcCompat="@drawable/twotone_filter_alt_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibManage"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_markdown.xml b/app/src/main/res/layout/dialog_markdown.xml
index d2d5a7e340..228c605f34 100644
--- a/app/src/main/res/layout/dialog_markdown.xml
+++ b/app/src/main/res/layout/dialog_markdown.xml
@@ -34,7 +34,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </eu.faircode.email.ScrollViewEx>
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibCancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index 5a2ddeb3fc..bf32b444c5 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -23,7 +23,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExpanderNav"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/expander_hor" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/pin" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivHide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSettings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_settings_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivFetchMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
             app:srcCompat="@drawable/twotone_get_app_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSync"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 95fd58e2f7..82adad0cd0 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibDifferent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -85,7 +85,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etLink" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSearch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_search_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibShare"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
             app:layout_constraintTop_toBottomOf="@id/tvLink"
             app:srcCompat="@drawable/twotone_share_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibCopy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -197,7 +197,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_review_account.xml b/app/src/main/res/layout/dialog_review_account.xml
index 04a9ac51c0..4ebf8b206e 100644
--- a/app/src/main/res/layout/dialog_review_account.xml
+++ b/app/src/main/res/layout/dialog_review_account.xml
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibEditName"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 4e6c85ba8e..2ac2259ce0 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -24,7 +24,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -52,7 +52,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibFlagged"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -64,7 +64,7 @@
             app:srcCompat="@drawable/twotone_star_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibUnseen"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -76,7 +76,7 @@
             app:srcCompat="@drawable/twotone_mail_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInvite"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -88,7 +88,7 @@
             app:srcCompat="@drawable/twotone_event_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibAttachment"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -100,7 +100,7 @@
             app:srcCompat="@drawable/twotone_attachment_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibNotes"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -184,7 +184,7 @@
             app:layout_constraintStart_toEndOf="@id/tvSearch2"
             app:layout_constraintTop_toBottomOf="@id/etQuery" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibResetSearches"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -206,7 +206,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSearch1" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 6389867751..1163fb438d 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -356,7 +356,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEncrypt" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibEncryption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -417,7 +417,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSendTitle" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSendAt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_setup.xml b/app/src/main/res/layout/dialog_setup.xml
index 5d5ccb11ed..c076a65ee4 100644
--- a/app/src/main/res/layout/dialog_setup.xml
+++ b/app/src/main/res/layout/dialog_setup.xml
@@ -21,7 +21,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/two"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -53,7 +53,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title2" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/three"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index c52ba63b3a..09554cd79f 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivTracking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toEndOf="@id/ivTracking"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ivInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index d164b2bd8c..275f0dd43b 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -57,7 +57,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvUpdated" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibUpdate"
         android:layout_width="36dp"
         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 459a0f0d76..5d5fd18a11 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -68,7 +68,7 @@
                     app:layout_constraintStart_toEndOf="@id/etExtra"
                     app:layout_constraintTop_toTopOf="@+id/etExtra" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivToLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivToLegend"
                     app:layout_constraintTop_toBottomOf="@id/etExtra" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibToAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -112,7 +112,7 @@
                     app:srcCompat="@drawable/twotone_person_add_24"
                     app:tint="?attr/colorAccent" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivCcLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -141,7 +141,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivCcLegend"
                     app:layout_constraintTop_toBottomOf="@+id/etTo" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibCcAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -156,7 +156,7 @@
                     app:srcCompat="@drawable/twotone_person_add_24"
                     app:tint="?attr/colorAccent" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivBccLegend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -185,7 +185,7 @@
                     app:layout_constraintStart_toEndOf="@id/ivBccLegend"
                     app:layout_constraintTop_toBottomOf="@+id/etCc" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibBccAdd"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -216,7 +216,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/etBcc" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibCcBcc"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -360,7 +360,7 @@
                     app:layout_constraintStart_toStartOf="@id/ibSignature"
                     app:layout_constraintTop_toTopOf="@+id/tvSignature" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibSignature"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -384,7 +384,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvSignature" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibCloseRefHint"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
@@ -410,7 +410,7 @@
                     app:layout_constraintStart_toEndOf="@id/ibCloseRefHint"
                     app:layout_constraintTop_toBottomOf="@id/vSeparatorSignature" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibWriteAboveBelow"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -424,7 +424,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
                     app:srcCompat="@drawable/abovebelow" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibReferenceEdit"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
@@ -438,7 +438,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
                     app:srcCompat="@drawable/twotone_edit_24" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibReferenceImages"
                     android:layout_width="36dp"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 8c8d14a336..7f2da893b2 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -263,7 +263,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSyncDays" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index 9b5d8c1441..6cb156a0ff 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -28,7 +28,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibHintActions"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorActions" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibHintSync"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 72ae8fac31..2d4c073065 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -619,7 +619,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSenderExtra" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSenderExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index 1467b9be30..da2a8d06cc 100644
--- a/app/src/main/res/layout/fragment_legend_compose.xml
+++ b/app/src/main/res/layout/fragment_legend_compose.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPick"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPick"
             app:layout_constraintTop_toTopOf="@id/ivPick" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivCC"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
             app:layout_constraintStart_toEndOf="@id/ivCC"
             app:layout_constraintTop_toTopOf="@id/ivCC" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivLink"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLink"
             app:layout_constraintTop_toTopOf="@id/ivLink" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivFile"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toEndOf="@id/ivFile"
             app:layout_constraintTop_toTopOf="@id/ivFile" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPicture"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPicture"
             app:layout_constraintTop_toTopOf="@id/ivPicture" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPhoto"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPhoto"
             app:layout_constraintTop_toTopOf="@id/ivPhoto" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAudio"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -166,7 +166,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAudio"
             app:layout_constraintTop_toTopOf="@id/ivAudio" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBold"
             app:layout_constraintTop_toTopOf="@id/ivBold" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivItalic"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -210,7 +210,7 @@
             app:layout_constraintStart_toEndOf="@id/ivItalic"
             app:layout_constraintTop_toTopOf="@id/ivItalic" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivUnderline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
             app:layout_constraintStart_toEndOf="@id/ivUnderline"
             app:layout_constraintTop_toTopOf="@id/ivUnderline" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index dcbd84918c..6fd738c2ba 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="@id/ivType" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivInbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
             app:layout_constraintStart_toEndOf="@id/ivInbox"
             app:layout_constraintTop_toTopOf="@id/ivInbox" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDrafts"
             app:layout_constraintTop_toTopOf="@id/ivDrafts" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSent"
             app:layout_constraintTop_toTopOf="@id/ivSent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivArchive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
             app:layout_constraintStart_toEndOf="@id/ivArchive"
             app:layout_constraintTop_toTopOf="@id/ivArchive" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivTrash"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
             app:layout_constraintStart_toEndOf="@id/ivTrash"
             app:layout_constraintTop_toTopOf="@id/ivTrash" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -166,7 +166,7 @@
             app:layout_constraintStart_toEndOf="@id/ivJunk"
             app:layout_constraintTop_toTopOf="@id/ivJunk" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimary"
             app:layout_constraintTop_toTopOf="@id/ivPrimary" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSubscribed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -210,7 +210,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSubscribed"
             app:layout_constraintTop_toTopOf="@id/ivSubscribed" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivRule"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
             app:layout_constraintStart_toEndOf="@id/ivRule"
             app:layout_constraintTop_toTopOf="@id/ivRule" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivNotify"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -265,7 +265,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvDownloadFetchLegend" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloadFetch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvSyncKeepLegend" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSyncKeep"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -322,7 +322,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSyncKeep"
             app:layout_constraintTop_toBottomOf="@id/tvDownloadFetchLegend" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivStop"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 9e43f43f65..2d5cdfd217 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivThread"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             app:layout_constraintStart_toEndOf="@id/ivThread"
             app:layout_constraintTop_toTopOf="@id/ivThread" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBookmark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBookmark"
             app:layout_constraintTop_toTopOf="@id/ivBookmark" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivZoom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_constraintStart_toEndOf="@id/ivZoom"
             app:layout_constraintTop_toTopOf="@id/ivZoom" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDraft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDraft"
             app:layout_constraintTop_toTopOf="@id/ivDraft" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAuth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -124,7 +124,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAuth"
             app:layout_constraintTop_toTopOf="@id/ivAuth" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivHighPriority"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHighPriority"
             app:layout_constraintTop_toTopOf="@id/ivHighPriority" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivLowPriority"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLowPriority"
             app:layout_constraintTop_toTopOf="@id/ivLowPriority" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivHighImportance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -191,7 +191,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHighImportance"
             app:layout_constraintTop_toTopOf="@id/ivHighImportance" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivLowImportance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -213,7 +213,7 @@
             app:layout_constraintStart_toEndOf="@id/ivLowImportance"
             app:layout_constraintTop_toTopOf="@id/ivLowImportance" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSigned"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -235,7 +235,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSigned"
             app:layout_constraintTop_toTopOf="@id/ivSigned" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivEncrypted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -257,7 +257,7 @@
             app:layout_constraintStart_toEndOf="@id/ivEncrypted"
             app:layout_constraintTop_toTopOf="@id/ivEncrypted" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivClassified"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -279,7 +279,7 @@
             app:layout_constraintStart_toEndOf="@id/ivClassified"
             app:layout_constraintTop_toTopOf="@id/ivClassified" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSnoozed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -301,7 +301,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSnoozed"
             app:layout_constraintTop_toTopOf="@id/ivSnoozed" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAnswered"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -323,7 +323,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAnswered"
             app:layout_constraintTop_toTopOf="@id/ivAnswered" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivForwarded"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -345,7 +345,7 @@
             app:layout_constraintStart_toEndOf="@id/ivForwarded"
             app:layout_constraintTop_toTopOf="@id/ivForwarded" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPlain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -367,7 +367,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPlain"
             app:layout_constraintTop_toTopOf="@id/ivPlain" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivReceipt"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -390,7 +390,7 @@
             app:layout_constraintStart_toEndOf="@id/ivReceipt"
             app:layout_constraintTop_toTopOf="@id/ivReceipt" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAutoSubmitted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -412,7 +412,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAutoSubmitted"
             app:layout_constraintTop_toTopOf="@id/ivAutoSubmitted" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBrowsed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -434,7 +434,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBrowsed"
             app:layout_constraintTop_toTopOf="@id/ivBrowsed" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAttachment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -456,7 +456,7 @@
             app:layout_constraintStart_toEndOf="@id/ivAttachment"
             app:layout_constraintTop_toTopOf="@id/ivAttachment" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivStarred"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -478,7 +478,7 @@
             app:layout_constraintStart_toEndOf="@id/ivStarred"
             app:layout_constraintTop_toTopOf="@id/ivStarred" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSearch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -500,7 +500,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSearch"
             app:layout_constraintTop_toTopOf="@id/ivSearch" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -522,7 +522,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPin"
             app:layout_constraintTop_toTopOf="@id/ivPin" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivContacts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -544,7 +544,7 @@
             app:layout_constraintStart_toEndOf="@id/ivContacts"
             app:layout_constraintTop_toTopOf="@id/ivContacts" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -566,7 +566,7 @@
             app:layout_constraintStart_toEndOf="@id/ivView"
             app:layout_constraintTop_toTopOf="@id/ivView" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivHide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -588,7 +588,7 @@
             app:layout_constraintStart_toEndOf="@id/ivHide"
             app:layout_constraintTop_toTopOf="@id/ivHide" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownload"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -610,7 +610,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownload"
             app:layout_constraintTop_toTopOf="@id/ivDownload" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivRule"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -632,7 +632,7 @@
             app:layout_constraintStart_toEndOf="@id/ivRule"
             app:layout_constraintTop_toTopOf="@id/ivRule" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivUnsubscribe"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -654,7 +654,7 @@
             app:layout_constraintStart_toEndOf="@id/ivUnsubscribe"
             app:layout_constraintTop_toTopOf="@id/ivUnsubscribe" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivOriginal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -676,7 +676,7 @@
             app:layout_constraintStart_toEndOf="@id/ivOriginal"
             app:layout_constraintTop_toTopOf="@id/ivOriginal" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivReformatted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -698,7 +698,7 @@
             app:layout_constraintStart_toEndOf="@id/ivReformatted"
             app:layout_constraintTop_toTopOf="@id/ivReformatted" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExternalImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -720,7 +720,7 @@
             app:layout_constraintStart_toEndOf="@id/ivExternalImage"
             app:layout_constraintTop_toTopOf="@id/ivExternalImage" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivEmbeddedImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -742,7 +742,7 @@
             app:layout_constraintStart_toEndOf="@id/ivEmbeddedImage"
             app:layout_constraintTop_toTopOf="@id/ivEmbeddedImage" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivTrackingPixel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -765,7 +765,7 @@
             app:layout_constraintStart_toEndOf="@id/ivTrackingPixel"
             app:layout_constraintTop_toTopOf="@id/ivTrackingPixel" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBrokenImage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -787,7 +787,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBrokenImage"
             app:layout_constraintTop_toTopOf="@id/ivBrokenImage" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDeletePermanent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 01b6948794..c3364a8718 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivOAuth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
             app:layout_constraintStart_toEndOf="@id/ivOAuth"
             app:layout_constraintTop_toTopOf="@id/ivOAuth" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimaryConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryConnected"
             app:layout_constraintTop_toTopOf="@id/ivPrimaryConnected" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivPrimaryDisconnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryDisconnected"
             app:layout_constraintTop_toTopOf="@id/ivPrimaryDisconnected" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloadOn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloadOn"
             app:layout_constraintTop_toTopOf="@id/ivDownloadOn" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloadOff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloadOff"
             app:layout_constraintTop_toTopOf="@id/ivDownloadOff" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronize"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronize"
             app:layout_constraintTop_toTopOf="@id/ivSynchronize" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizeOff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -166,7 +166,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizeOff"
             app:layout_constraintTop_toTopOf="@id/ivSynchronizeOff" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizePoll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizePoll"
             app:layout_constraintTop_toTopOf="@id/ivSynchronizePoll" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDisconnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -210,7 +210,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDisconnected"
             app:layout_constraintTop_toTopOf="@id/ivDisconnected" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivConnecting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
             app:layout_constraintStart_toEndOf="@id/ivConnecting"
             app:layout_constraintTop_toTopOf="@id/ivConnecting" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -254,7 +254,7 @@
             app:layout_constraintStart_toEndOf="@id/ivConnected"
             app:layout_constraintTop_toTopOf="@id/ivConnected" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBackoff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
             app:layout_constraintStart_toEndOf="@id/ivBackoff"
             app:layout_constraintTop_toTopOf="@id/ivBackoff" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInfoBackoff"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -287,7 +287,7 @@
             app:layout_constraintTop_toTopOf="@id/ivBackoff"
             app:srcCompat="@drawable/twotone_info_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivQuota"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -310,7 +310,7 @@
             app:layout_constraintStart_toEndOf="@id/ivQuota"
             app:layout_constraintTop_toTopOf="@id/ivQuota" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExecuting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -332,7 +332,7 @@
             app:layout_constraintStart_toEndOf="@id/ivExecuting"
             app:layout_constraintTop_toTopOf="@id/ivExecuting" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivSynchronizing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -354,7 +354,7 @@
             app:layout_constraintStart_toEndOf="@id/ivSynchronizing"
             app:layout_constraintTop_toTopOf="@id/ivSynchronizing" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDownloading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -376,7 +376,7 @@
             app:layout_constraintStart_toEndOf="@id/ivDownloading"
             app:layout_constraintTop_toTopOf="@id/ivDownloading" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivClosing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 99d05cd134..4fc79f50ea 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -49,7 +49,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibHintSupport"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibHintSwipe"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSwipe" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibHintSelect"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -215,7 +215,7 @@
                 app:srcCompat="@drawable/twotone_reply_24_options"
                 app:tint="?attr/colorFabForeground" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibDown"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -230,7 +230,7 @@
                 app:srcCompat="@drawable/twotone_vertical_align_bottom_24"
                 app:tint="?attr/colorAccent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibUp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
                 app:srcCompat="@drawable/twotone_vertical_align_top_24"
                 app:tint="?attr/colorAccent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibOutbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -284,7 +284,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/etSearch"
                 app:layout_constraintStart_toEndOf="@+id/tvOutboxCount" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibSeen"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -299,7 +299,7 @@
                 app:srcCompat="@drawable/twotone_drafts_24"
                 app:tint="?attr/colorAccent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibUnflagged"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -313,7 +313,7 @@
                 app:srcCompat="@drawable/baseline_star_24"
                 app:tint="?attr/colorAccent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibSnoozed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 468c24ccdb..cefad08e1a 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -660,7 +660,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvBimiUnverified" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibBimi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -757,7 +757,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swIdenticons"
                     app:switchPadding="12dp" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivRed"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -767,7 +767,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCircular"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivGreen"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
@@ -777,7 +777,7 @@
                     app:layout_constraintTop_toBottomOf="@id/swCircular"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivBlue"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 9f8a65a7b3..02a29fd0af 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -63,7 +63,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvOpenPgp" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibOpenKeychain"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 50dd6611d3..df2555c744 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -192,7 +192,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swClassification" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibClassification"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -271,7 +271,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibResetLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -308,7 +308,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvLanguageHint"
                     app:switchPadding="12dp" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibDeepL"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -671,7 +671,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvRoomQueryThreads" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibRoom"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -737,7 +737,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSqliteCache" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibSqliteCache"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -943,7 +943,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swInfra" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_awsses"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -952,7 +952,7 @@
                     app:srcCompat="@drawable/infra_awsses"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_elastic"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -961,7 +961,7 @@
                     app:srcCompat="@drawable/infra_elastic"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_gmail"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -970,7 +970,7 @@
                     app:srcCompat="@drawable/infra_gmail"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_icloud"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -979,7 +979,7 @@
                     app:srcCompat="@drawable/infra_icloud"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_icontact"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -988,7 +988,7 @@
                     app:srcCompat="@drawable/infra_icontact"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_mailchimp"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -997,7 +997,7 @@
                     app:srcCompat="@drawable/infra_mailchimp"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_mailgun"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1006,7 +1006,7 @@
                     app:srcCompat="@drawable/infra_mailgun"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_mailjet"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1015,7 +1015,7 @@
                     app:srcCompat="@drawable/infra_mailjet"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_mandrill"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1024,7 +1024,7 @@
                     app:srcCompat="@drawable/infra_mandrill"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_netcore"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1033,7 +1033,7 @@
                     app:srcCompat="@drawable/infra_netcore"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_outlook"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1042,7 +1042,7 @@
                     app:srcCompat="@drawable/infra_outlook"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_phpmailer"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1051,7 +1051,7 @@
                     app:srcCompat="@drawable/infra_phpmailer"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_postmark"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1060,7 +1060,7 @@
                     app:srcCompat="@drawable/infra_postmark"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_salesforce"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1069,7 +1069,7 @@
                     app:srcCompat="@drawable/infra_salesforce"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_sendgrid"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1078,7 +1078,7 @@
                     app:srcCompat="@drawable/infra_sendgrid"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_sendinblue"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1087,7 +1087,7 @@
                     app:srcCompat="@drawable/infra_sendinblue"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_sparkpost"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1096,7 +1096,7 @@
                     app:srcCompat="@drawable/infra_sparkpost"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_yahoo"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1105,7 +1105,7 @@
                     app:srcCompat="@drawable/infra_yahoo"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_zeptomail"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -1114,7 +1114,7 @@
                     app:srcCompat="@drawable/infra_zeptomail"
                     tools:ignore="MissingConstraints" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/infra_zoho"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index fc28cf67fc..acdfcabddf 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -75,7 +75,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibClear"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvManageHint" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivChannelDefault"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -143,7 +143,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvManageDefaultHint" />
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/ivChannelService"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -165,7 +165,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnManageService" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibWhy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -488,7 +488,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swBadge" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibBadge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -685,7 +685,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvNotifyPreviewOnlyHint"
                     app:switchPadding="12dp" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibLight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -719,7 +719,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swWearablePreview" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibWearable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -752,7 +752,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swMessagingStyle" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibCar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index 9738961da4..2497af6ea7 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -426,7 +426,7 @@
                     app:layout_constraintTop_toBottomOf="@id/tvDisplayHiddenHint"
                     app:switchPadding="12dp" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibIncognitoKeyboard"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -506,7 +506,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swSafeBrowsing" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibSafeBrowsing"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -553,7 +553,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLoadEmojiHint" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibDisconnectBlacklist"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 573cd39ea8..31c36b4508 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -145,7 +145,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swOptimize" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibOptimizeInfo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -337,7 +337,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbDay5" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibSchedules"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index c2a60ade67..74b085232a 100644
--- a/app/src/main/res/layout/fragment_pro.xml
+++ b/app/src/main/res/layout/fragment_pro.xml
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvWhichever" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExternal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -194,7 +194,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRestoreHint" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivConnected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index 982425acc0..ab1950d3a5 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -165,7 +165,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbSender" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibSender"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -239,7 +239,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbRecipient" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibRecipient"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -850,7 +850,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibTo"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 340beb90d5..87dc7ce830 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -124,7 +124,7 @@
                     app:layout_constraintStart_toEndOf="@id/tvPrivacy"
                     app:layout_constraintTop_toBottomOf="@id/analytics" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibWelcome"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -162,7 +162,7 @@
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/one"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -199,7 +199,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/title1" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibHelp"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
@@ -261,7 +261,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvQuickRemarkMultiple" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibManual"
                     android:layout_width="36dp"
                     android:layout_height="48dp"
@@ -548,7 +548,7 @@
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/two"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -638,7 +638,7 @@
                 android:paddingHorizontal="6dp"
                 android:paddingVertical="12dp">
 
-                <ImageView
+                <eu.faircode.email.FixedImageView
                     android:id="@+id/three"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
@@ -718,7 +718,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDozeHint" />
 
-                <ImageButton
+                <eu.faircode.email.FixedImageButton
                     android:id="@+id/ibDoze"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 14eafb0da5..cc31acb3d1 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -13,7 +13,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderAddress"
         android:layout_width="0dp"
         android:layout_height="24dp"
@@ -35,7 +35,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_notes_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibReceipt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_playlist_add_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSearchContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibNotifyContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_notifications_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibPinContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -103,7 +103,7 @@
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/twotone_person_pin_circle_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibAddContact"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_message_attachments.xml b/app/src/main/res/layout/include_message_attachments.xml
index fa4318a8c1..1efb6668ac 100644
--- a/app/src/main/res/layout/include_message_attachments.xml
+++ b/app/src/main/res/layout/include_message_attachments.xml
@@ -25,7 +25,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibDownloadAttachments"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -38,7 +38,7 @@
         app:layout_constraintTop_toBottomOf="@+id/vSeparatorAttachments"
         app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSaveAttachments"
         android:layout_width="36dp"
         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index 0ec77c3fab..40816cb4a1 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -75,7 +75,7 @@
         app:layout_constraintStart_toStartOf="@id/tvDownloading"
         app:layout_constraintTop_toTopOf="@id/tvDownloading" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibDownloading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibInfrastructure"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -125,7 +125,7 @@
         app:layout_constraintTop_toBottomOf="@id/wvBody"
         app:srcCompat="@drawable/infra_awsses" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibTrashBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -139,7 +139,7 @@
         app:srcCompat="@drawable/twotone_delete_24"
         app:tint="?attr/colorAccent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibArchiveBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -154,7 +154,7 @@
         app:srcCompat="@drawable/twotone_archive_24"
         app:tint="?attr/colorAccent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibMoveBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -169,7 +169,7 @@
         app:srcCompat="@drawable/twotone_drive_file_move_24"
         app:tint="?attr/colorAccent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSeenBottom"
         android:layout_width="36dp"
         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/include_message_calendar.xml b/app/src/main/res/layout/include_message_calendar.xml
index 46d8a9b7df..eef17389cf 100644
--- a/app/src/main/res/layout/include_message_calendar.xml
+++ b/app/src/main/res/layout/include_message_calendar.xml
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibCalendar"
         android:layout_width="36dp"
         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index e7bf6632c5..6911a7a272 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -22,7 +22,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpander"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:layout_constraintStart_toEndOf="@+id/ibExpander"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -57,7 +57,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/twotone_person_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibVerified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -69,7 +69,7 @@
         app:srcCompat="@drawable/verified"
         app:tint="?attr/colorAccent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -82,7 +82,7 @@
         app:srcCompat="@drawable/authenticated"
         app:tint="?attr/colorWarning" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibPriority"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -94,7 +94,7 @@
         app:srcCompat="@drawable/priority"
         app:tint="?attr/colorAccent" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivImportance"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -105,7 +105,7 @@
         app:srcCompat="@drawable/importance"
         app:tint="?attr/colorAccent" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivSigned"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -116,7 +116,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_gesture_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivEncrypted"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -169,7 +169,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
         app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivType"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -179,7 +179,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_edit_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivFound"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -190,7 +190,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -201,7 +201,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_push_pin_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -213,7 +213,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivAnswered"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -224,7 +224,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_reply_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivForwarded"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -235,7 +235,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_forwarded_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivAttachments"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -275,7 +275,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ivThread"
         app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivThread"
         android:layout_width="15dp"
         android:layout_height="15dp"
@@ -285,7 +285,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_message_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibFlagged"
         android:layout_width="24dp"
         android:layout_height="36dp"
@@ -402,7 +402,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvNotes" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSettings"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_message_headers.xml b/app/src/main/res/layout/include_message_headers.xml
index b326597b0d..529719e72e 100644
--- a/app/src/main/res/layout/include_message_headers.xml
+++ b/app/src/main/res/layout/include_message_headers.xml
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibCopyHeaders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
         app:layout_constraintTop_toBottomOf="@+id/tvHeaders"
         app:srcCompat="@drawable/twotone_file_copy_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibCloseHeaders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 6a1ebd08a3..16a0805e34 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -32,7 +32,7 @@
             app:layout_constraintTop_toBottomOf="@id/vSeparator"
             app:show_delay="750" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibTools"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -65,7 +65,7 @@
             android:layout_height="36dp"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibMore"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -77,7 +77,7 @@
             app:srcCompat="@drawable/twotone_more_horiz_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibInbox"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -89,7 +89,7 @@
             app:srcCompat="@drawable/twotone_move_to_inbox_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibJunk"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -101,7 +101,7 @@
             app:srcCompat="@drawable/twotone_report_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibTrash"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -113,7 +113,7 @@
             app:srcCompat="@drawable/twotone_delete_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibArchive"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -125,7 +125,7 @@
             app:srcCompat="@drawable/twotone_archive_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibMove"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -137,7 +137,7 @@
             app:srcCompat="@drawable/twotone_drive_file_move_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibCopy"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -149,7 +149,7 @@
             app:srcCompat="@drawable/twotone_file_copy_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibNotes"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -159,7 +159,7 @@
             app:srcCompat="@drawable/twotone_sticky_note_2_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibRule"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -171,7 +171,7 @@
             app:srcCompat="@drawable/twotone_filter_alt_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibKeywords"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -181,7 +181,7 @@
             app:srcCompat="@drawable/twotone_label_important_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibLabels"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -191,7 +191,7 @@
             app:srcCompat="@drawable/twotone_label_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibAnswer"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -203,7 +203,7 @@
             app:srcCompat="@drawable/twotone_reply_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSeen"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -215,7 +215,7 @@
             app:srcCompat="@drawable/twotone_mail_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibHide"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -227,7 +227,7 @@
             app:srcCompat="@drawable/twotone_visibility_off_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibImportance"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -239,7 +239,7 @@
             app:srcCompat="@drawable/importance"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSearch"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -251,7 +251,7 @@
             app:srcCompat="@drawable/twotone_search_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSearchText"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -263,7 +263,7 @@
             app:srcCompat="@drawable/twotone_manage_search_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibTranslate"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -275,7 +275,7 @@
             app:srcCompat="@drawable/twotone_translate_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibForceLight"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -287,7 +287,7 @@
             app:srcCompat="@drawable/lightdark"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibEvent"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -299,7 +299,7 @@
             app:srcCompat="@drawable/twotone_event_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibShare"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -311,7 +311,7 @@
             app:srcCompat="@drawable/twotone_share_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibPin"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -323,7 +323,7 @@
             app:srcCompat="@drawable/twotone_push_pin_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibPrint"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -335,7 +335,7 @@
             app:srcCompat="@drawable/twotone_print_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibHeaders"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -347,7 +347,7 @@
             app:srcCompat="@drawable/baseline_code_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibUnsubscribe"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -359,7 +359,7 @@
             app:srcCompat="@drawable/twotone_unsubscribe_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibUndo"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -371,7 +371,7 @@
             app:srcCompat="@drawable/twotone_cancel_schedule_send_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibVerify"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -385,7 +385,7 @@
             app:layout_constraintTop_toBottomOf="@+id/ibFull"
             app:srcCompat="@drawable/twotone_gesture_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibDecrypt"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -398,7 +398,7 @@
             app:layout_constraintTop_toBottomOf="@+id/ibFull"
             app:srcCompat="@drawable/twotone_lock_open_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibImages"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -413,7 +413,7 @@
             app:srcCompat="@drawable/twotone_image_24"
             app:tint="?attr/colorAccent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibFull"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index d0708156d6..31e5544438 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpander"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toEndOf="@+id/ibExpander"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibAvatar"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -56,7 +56,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/twotone_person_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibVerified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -68,7 +68,7 @@
         app:srcCompat="@drawable/verified"
         app:tint="?attr/colorAccent" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibAuth"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -81,7 +81,7 @@
         app:srcCompat="@drawable/authenticated"
         app:tint="?attr/colorWarning" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibPriority"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -93,7 +93,7 @@
         app:srcCompat="@drawable/priority"
         app:tint="?attr/colorAccent" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivImportance"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -104,7 +104,7 @@
         app:srcCompat="@drawable/importance"
         app:tint="?attr/colorAccent" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivSigned"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -115,7 +115,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
         app:srcCompat="@drawable/twotone_gesture_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivEncrypted"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -197,7 +197,7 @@
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toBottomOf="@id/tvSubject" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibFlagged"
         android:layout_width="42dp"
         android:layout_height="42dp"
@@ -209,7 +209,7 @@
         app:layout_constraintTop_toBottomOf="@id/paddingTop"
         app:srcCompat="@drawable/baseline_star_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivType"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -219,7 +219,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_edit_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivFound"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -230,7 +230,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -241,7 +241,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_push_pin_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -253,7 +253,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivAnswered"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -264,7 +264,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_reply_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivForwarded"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -275,7 +275,7 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_forwarded_24" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivAttachments"
         android:layout_width="21dp"
         android:layout_height="21dp"
@@ -315,7 +315,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ivThread"
         app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivThread"
         android:layout_width="15dp"
         android:layout_height="15dp"
@@ -402,7 +402,7 @@
         app:layout_constraintStart_toEndOf="@id/paddingStart"
         app:layout_constraintTop_toBottomOf="@id/tvNotes" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSettings"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index ed97d0e5e3..53329c6f0a 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -8,7 +8,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderNav"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/expander_hor" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibPin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/pin" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibHide"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_visibility_off_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibSettings"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_settings_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibFetchMore"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/twotone_save_alt_24" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibForceSync"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderNav" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderAccount"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvAccount" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderUnified"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvUnified" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderSearch"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvSearch" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderMenu"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -218,7 +218,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rvMenu" />
 
-    <ImageButton
+    <eu.faircode.email.FixedImageButton
         android:id="@+id/ibExpanderExtra"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 1e5e3c89dd..92ceac81cd 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -32,7 +32,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -44,7 +44,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivOAuth"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -55,7 +55,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_security_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivPrimary"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -66,7 +66,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivNotify"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivNotify"
                 app:layout_constraintTop_toBottomOf="@id/marginTop" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -104,7 +104,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibInbox"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
diff --git a/app/src/main/res/layout/item_answer.xml b/app/src/main/res/layout/item_answer.xml
index a93525988d..1e736e0c3d 100644
--- a/app/src/main/res/layout/item_answer.xml
+++ b/app/src/main/res/layout/item_answer.xml
@@ -61,7 +61,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvGroup" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivExternal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivReceipt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_playlist_add_check_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivStandard"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_quickreply_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivFavorite"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 0170d561fb..43f5964216 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -13,7 +13,7 @@
         android:paddingTop="6dp"
         android:paddingBottom="6dp">
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibDelete"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -26,7 +26,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_delete_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivType"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -37,7 +37,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/file_bin" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDisposition"
             android:layout_width="12dp"
             android:layout_height="12dp"
@@ -59,7 +59,7 @@
             app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivStatus"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -70,7 +70,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_cloud_download_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSave"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/item_attachment_eml.xml b/app/src/main/res/layout/item_attachment_eml.xml
index a4e9a0b30e..29ec3689b9 100644
--- a/app/src/main/res/layout/item_attachment_eml.xml
+++ b/app/src/main/res/layout/item_attachment_eml.xml
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="3dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAttachments"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -62,7 +62,7 @@
             app:layout_constraintStart_toEndOf="@id/tvType"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivStatus"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -71,7 +71,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_visibility_24" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSave"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
diff --git a/app/src/main/res/layout/item_certificate.xml b/app/src/main/res/layout/item_certificate.xml
index 7193ee725d..3b21b27ccd 100644
--- a/app/src/main/res/layout/item_certificate.xml
+++ b/app/src/main/res/layout/item_certificate.xml
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivIntermediate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index 98c34038ab..7e99a83a57 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:padding="3dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivType"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -19,7 +19,7 @@
             app:layout_constraintTop_toTopOf="@+id/ivAvatar"
             app:srcCompat="@drawable/twotone_call_received_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivAvatar"
             android:layout_width="42dp"
             android:layout_height="0dp"
@@ -81,7 +81,7 @@
             app:layout_constraintEnd_toStartOf="@+id/ivFavorite"
             app:layout_constraintTop_toBottomOf="@+id/tvTimes" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivFavorite"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index a957b691a8..e6288c79de 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -25,7 +25,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -36,7 +36,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivReadOnly"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -53,7 +53,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivState"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibExpander"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
@@ -67,7 +67,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/expander" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivUnified"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -78,7 +78,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_folder_special_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivSubscribed"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -89,7 +89,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_bookmark_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivRule"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -100,7 +100,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_filter_alt_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivNotify"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -111,7 +111,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_notifications_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivAutoAdd"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -148,7 +148,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ivMessages"
                 app:layout_constraintTop_toTopOf="@+id/tvName" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivMessages"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -158,7 +158,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_mail_outline_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivType"
                 android:layout_width="30dp"
                 android:layout_height="24dp"
@@ -210,7 +210,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ibSync"
                 app:layout_constraintTop_toTopOf="@+id/tvType" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -247,7 +247,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
                 app:layout_constraintTop_toTopOf="@+id/tvKeywords" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ibFlagged"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_folder_select.xml b/app/src/main/res/layout/item_folder_select.xml
index e40c5da2e5..0374de39d6 100644
--- a/app/src/main/res/layout/item_folder_select.xml
+++ b/app/src/main/res/layout/item_folder_select.xml
@@ -19,7 +19,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibExpander"
             android:layout_width="36dp"
             android:layout_height="0dp"
@@ -32,7 +32,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/expander" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivType"
             android:layout_width="24dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/item_folder_unselectable.xml b/app/src/main/res/layout/item_folder_unselectable.xml
index a27fbd5b0b..e070d43de0 100644
--- a/app/src/main/res/layout/item_folder_unselectable.xml
+++ b/app/src/main/res/layout/item_folder_unselectable.xml
@@ -22,7 +22,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -41,7 +41,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivState"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageButton
+            <eu.faircode.email.FixedImageButton
                 android:id="@+id/ibExpander"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
diff --git a/app/src/main/res/layout/item_identity.xml b/app/src/main/res/layout/item_identity.xml
index fd47b25682..8ee1589530 100644
--- a/app/src/main/res/layout/item_identity.xml
+++ b/app/src/main/res/layout/item_identity.xml
@@ -32,7 +32,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivState"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -44,7 +44,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_cloud_off_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivOAuth"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -55,7 +55,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_security_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivPrimary"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -66,7 +66,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tvName"
                 app:srcCompat="@drawable/twotone_star_24" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivGroup"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toEndOf="@id/ivGroup"
                 app:layout_constraintTop_toBottomOf="@id/marginTop" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index aef48c736d..da25d40aa5 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="6dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_keyword.xml b/app/src/main/res/layout/item_keyword.xml
index 4e36379f8f..78751a8462 100644
--- a/app/src/main/res/layout/item_keyword.xml
+++ b/app/src/main/res/layout/item_keyword.xml
@@ -22,7 +22,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/btnColor" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibEdit"
             android:layout_width="36dp"
             android:layout_height="36dp"
@@ -50,7 +50,7 @@
             app:layout_constraintStart_toEndOf="@id/ibEdit"
             app:layout_constraintTop_toTopOf="@+id/btnColor" />
 
-        <ImageButton
+        <eu.faircode.email.FixedImageButton
             android:id="@+id/ibSave"
             android:layout_width="36dp"
             android:layout_height="36dp"
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index bee5099aaa..bdc8197b9c 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -12,7 +12,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:minHeight="42dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivItem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_folder_special_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivBadge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
             app:layout_constraintStart_toEndOf="@id/tvItem"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivExtra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivWarning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_operation.xml b/app/src/main/res/layout/item_operation.xml
index b547588017..f16ca52b5f 100644
--- a/app/src/main/res/layout/item_operation.xml
+++ b/app/src/main/res/layout/item_operation.xml
@@ -14,7 +14,7 @@
         android:paddingEnd="6dp"
         android:paddingBottom="3dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivState"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index d3986152e2..a77321d3ef 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -13,7 +13,7 @@
         android:foreground="?attr/selectableItemBackground"
         android:padding="12dp">
 
-        <ImageView
+        <eu.faircode.email.FixedImageView
             android:id="@+id/ivDragHandle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_rule.xml b/app/src/main/res/layout/item_rule.xml
index 59939c308a..e227aa4ab0 100644
--- a/app/src/main/res/layout/item_rule.xml
+++ b/app/src/main/res/layout/item_rule.xml
@@ -42,7 +42,7 @@
                 app:layout_constraintEnd_toStartOf="@+id/ivStop"
                 app:layout_constraintTop_toTopOf="@+id/ivStop" />
 
-            <ImageView
+            <eu.faircode.email.FixedImageView
                 android:id="@+id/ivStop"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/layout/spinner_contact.xml b/app/src/main/res/layout/spinner_contact.xml
index 0ce390f9d6..5084c8e5fa 100644
--- a/app/src/main/res/layout/spinner_contact.xml
+++ b/app/src/main/res/layout/spinner_contact.xml
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName" />
 
-    <ImageView
+    <eu.faircode.email.FixedImageView
         android:id="@+id/ivPhoto"
         android:layout_width="0dp"
         android:layout_height="36dp"