diff --git a/app/k9mail-jmap/src/main/res/values/themes.xml b/app/k9mail-jmap/src/main/res/values/themes.xml
index 23370b9b021bf963cef8f8fdcc6cf6061f371c04..fd36fad97d7cb9c46f1a450f7ecb21459fc1d1ee 100644
--- a/app/k9mail-jmap/src/main/res/values/themes.xml
+++ b/app/k9mail-jmap/src/main/res/values/themes.xml
@@ -115,9 +115,9 @@
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
         <item name="openpgp_black">#000</item>
-        <item name="openpgp_orange">#FF8800</item>
-        <item name="openpgp_red">#CC0000</item>
-        <item name="openpgp_green">#669900</item>
+        <item name="openpgp_orange">#FF7A00</item>
+        <item name="openpgp_red">#F8432E</item>
+        <item name="openpgp_green">#44B04C</item>
         <item name="openpgp_blue">#336699</item>
         <item name="openpgp_grey">#bbb</item>
         <item name="openpgp_dark_grey">#888</item>
@@ -234,10 +234,10 @@
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
         <item name="openpgp_black">#fff</item>
-        <item name="openpgp_orange">#ee7700</item>
-        <item name="openpgp_red">#CC0000</item>
-        <item name="openpgp_green">#77aa00</item>
-        <item name="openpgp_blue">#6699cc</item>
+        <item name="openpgp_orange">#FF7A00</item>
+        <item name="openpgp_red">#F8432E</item>
+        <item name="openpgp_green">#44B04C</item>
+        <item name="openpgp_blue">#336699</item>
         <item name="openpgp_grey">#888</item>
         <item name="openpgp_dark_grey">#bbb</item>
 
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 9da0928dd4ff21c978f1cc49339f79f5f106cc5e..5a61f2926049affa2f972f51a92039776273e125 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -140,9 +140,9 @@
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
         <item name="openpgp_black">@color/default_icon_color</item>
-        <item name="openpgp_orange">#FF8800</item>
-        <item name="openpgp_red">#CC0000</item>
-        <item name="openpgp_green">#669900</item>
+        <item name="openpgp_orange">#FF7A00</item>
+        <item name="openpgp_red">#F8432E</item>
+        <item name="openpgp_green">#44B04C</item>
         <item name="openpgp_blue">#336699</item>
         <item name="openpgp_grey">#bbb</item>
         <item name="openpgp_dark_grey">#888</item>
@@ -266,9 +266,9 @@
 
         <item name="unencryptedAttachmentUnlock">@drawable/ic_visibility</item>
         <item name="openpgp_black">@color/default_icon_color</item>
-        <item name="openpgp_orange">#FF8800</item>
-        <item name="openpgp_red">#CC0000</item>
-        <item name="openpgp_green">#669900</item>
+        <item name="openpgp_orange">#FF7A00</item>
+        <item name="openpgp_red">#F8432E</item>
+        <item name="openpgp_green">#44B04C</item>
         <item name="openpgp_blue">#336699</item>
         <item name="openpgp_grey">#bbb</item>
         <item name="openpgp_dark_grey">#888</item>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock.xml b/app/ui/legacy/src/main/res/drawable/status_lock.xml
index 4d19d5e15f7fe2c3975aed0a9eab29d857a7e6a1..b6611d5123813b1a8cb19a50493911fda471765a 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock.xml
@@ -1,6 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="m81.5,45.13 l-1.92,0 0,-15.65C79.48,10.28 66.39,-0.16 50.48,-0.16 34.57,-0.16 20.3,10.78 20.8,29.48l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.13 L34.28,29.69c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M18,8.5H17V6.5C17,3.74 14.76,1.5 12,1.5C9.24,1.5 7,3.74 7,6.5V8.5H6C4.9,8.5 4,9.4 4,10.5V20.5C4,21.6 4.9,22.5 6,22.5H18C19.1,22.5 20,21.6 20,20.5V10.5C20,9.4 19.1,8.5 18,8.5ZM9,6.5C9,4.84 10.34,3.5 12,3.5C13.66,3.5 15,4.84 15,6.5V8.5H9V6.5ZM18,20.5H6V10.5H18V20.5ZM12,17.5C13.1,17.5 14,16.6 14,15.5C14,14.4 13.1,13.5 12,13.5C10.9,13.5 10,14.4 10,15.5C10,16.6 10.9,17.5 12,17.5Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
index 0f7777f6ca3f3de8414c9e6b12ab07308b70a098..0563ae6ea22fbde4c6339546d762c0d9f5f71e1b 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml
@@ -1,15 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="100.0"
-    android:viewportHeight="100.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M50.48,-0.16C39.1,-0.16 28.58,5.44 23.69,15.47L34.51,26.48C35.67,18.09 41.43,11.78 50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L52.83,45.13L90.18,83.16L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM20.8,27.68C20.79,28.27 20.78,28.87 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.19,99.84 85.92,99.3 88.51,95.59L38.2,45.13L34.26,45.13L34.27,41.19L20.8,27.68z" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="@color/default_icon_color"
-        android:pathData="m9.99,20.47 l4.79,-4.41 79.06,80.48 -4.01,4.01z"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
+        android:pathData="M18,8.5H17V6.5C17,3.74 14.76,1.5 12,1.5C9.24,1.5 7,3.74 7,6.5H9C9,4.84 10.34,3.5 12,3.5C13.66,3.5 15,4.84 15,6.5V8.5H6C4.9,8.5 4,9.4 4,10.5V20.5C4,21.6 4.9,22.5 6,22.5H18C19.1,22.5 20,21.6 20,20.5V10.5C20,9.4 19.1,8.5 18,8.5ZM18,20.5H6V10.5H18V20.5ZM12,17.5C13.1,17.5 14,16.6 14,15.5C14,14.4 13.1,13.5 12,13.5C10.9,13.5 10,14.4 10,15.5C10,16.6 10.9,17.5 12,17.5Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml
index c96eb7217d6154cb48a26b570799f708f847e501..4d63e30f7d842503049a87c0b7ce2f3e80b5997e 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled_dots_1.xml
@@ -1,8 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#FF000000" android:pathData="m50.48,0c-11.37,0 -21.89,5.61 -26.79,15.63l10.82,11.01c1.17,-8.4 6.92,-14.7 15.68,-14.7 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -13.27,0 37.36,38.03 0,-28.6c0,-8.45 -8.45,-9.43 -8.68,-9.43l-1.93,0 0,-15.65C79.48,10.45 66.39,0 50.48,0zM20.8,27.85c-0.01,0.59 -0.02,1.19 0,1.8l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.16,0 4.89,-0.54 7.48,-4.24l-50.31,-50.46 -3.94,0 0,-3.95L20.8,27.85z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M14.512,9.156H13.762V7.531C13.762,5.289 12.08,3.469 10.007,3.469C7.935,3.469 6.253,5.289 6.253,7.531V9.156H5.502C4.676,9.156 4,9.887 4,10.781V18.906C4,19.8 4.676,20.531 5.502,20.531H14.512C15.338,20.531 16.014,19.8 16.014,18.906V10.781C16.014,9.887 15.338,9.156 14.512,9.156ZM7.754,7.531C7.754,6.182 8.761,5.094 10.007,5.094C11.253,5.094 12.26,6.182 12.26,7.531V9.156H7.754V7.531ZM14.512,18.906H5.502V10.781H14.512V18.906ZM10.007,16.469C10.833,16.469 11.509,15.738 11.509,14.844C11.509,13.95 10.833,13.219 10.007,13.219C9.181,13.219 8.505,13.95 8.505,14.844C8.505,15.738 9.181,16.469 10.007,16.469Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20.505,15.759C19.684,15.759 19.011,16.431 19.011,17.253C19.011,18.075 19.684,18.748 20.505,18.748C21.327,18.748 22,18.075 22,17.253C22,16.431 21.327,15.759 20.505,15.759Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml b/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml
index bb155f30d4f65a12cdbd5b9d959676fab5dbfd66..ca305fb883740c6c7210e821a7b7ba612443ee91 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_dots_2.xml
@@ -1,13 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="149.99998" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#000000"
-        android:pathData="m81.5,45.3 l-1.92,0 0,-15.65C79.48,10.45 66.39,-0 50.48,-0 34.57,-0 20.3,10.95 20.8,29.64l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.3 L34.28,29.85c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z" android:strokeColor="#00000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M14.512,9.156H13.762V7.531C13.762,5.289 12.08,3.469 10.007,3.469C7.935,3.469 6.253,5.289 6.253,7.531V9.156H5.502C4.676,9.156 4,9.887 4,10.781V18.906C4,19.8 4.676,20.531 5.502,20.531H14.512C15.338,20.531 16.014,19.8 16.014,18.906V10.781C16.014,9.887 15.338,9.156 14.512,9.156ZM7.754,7.531C7.754,6.182 8.761,5.094 10.007,5.094C11.253,5.094 12.26,6.182 12.26,7.531V9.156H7.754V7.531ZM14.512,18.906H5.502V10.781H14.512V18.906ZM10.007,16.469C10.833,16.469 11.509,15.738 11.509,14.844C11.509,13.95 10.833,13.219 10.007,13.219C9.181,13.219 8.505,13.95 8.505,14.844C8.505,15.738 9.181,16.469 10.007,16.469Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20.505,11.275C19.684,11.275 19.011,11.948 19.011,12.77C19.011,13.592 19.684,14.264 20.505,14.264C21.327,14.264 22,13.592 22,12.77C22,11.948 21.327,11.275 20.505,11.275ZM20.505,15.759C19.684,15.759 19.011,16.431 19.011,17.253C19.011,18.075 19.684,18.748 20.505,18.748C21.327,18.748 22,18.075 22,17.253C22,16.431 21.327,15.759 20.505,15.759Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml
index d27cdd9e911591e8e01db96d806750dc4d8020e5..2fe03719255adcc4831221bea3018c29bd1c8fc3 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_dots_3.xml
@@ -1,17 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="150.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#000000"
-        android:pathData="m81.5,45.3 l-1.92,0 0,-15.65C79.48,10.45 66.39,-0 50.48,-0 34.57,-0 20.3,10.95 20.8,29.64l-0.02,15.63c0,0 0.24,0.02 -0.96,0.02 -1.27,0 -9.64,1.47 -9.64,8.94l0,35.82c0,7.96 9.42,9.94 9.64,9.94l61.2,0c0.22,0 9.15,-0.99 9.15,-9.94l0,-35.33c0,-8.45 -8.45,-9.43 -8.68,-9.43zM34.26,45.3 L34.28,29.85c0,-9.95 6.07,-17.9 15.91,-17.9 9.74,0 15.9,6.96 15.9,17.9l0.01,15.45 -31.84,0z" android:strokeColor="#00000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M14.518,9.87H13.767V8.368C13.767,6.294 12.084,4.611 10.01,4.611C7.937,4.611 6.254,6.294 6.254,8.368V9.87H5.503C4.676,9.87 4,10.546 4,11.373V18.886C4,19.712 4.676,20.388 5.503,20.388H14.518C15.344,20.388 16.021,19.712 16.021,18.886V11.373C16.021,10.546 15.344,9.87 14.518,9.87ZM7.756,8.368C7.756,7.121 8.763,6.114 10.01,6.114C11.257,6.114 12.264,7.121 12.264,8.368V9.87H7.756V8.368ZM14.518,18.886H5.503V11.373H14.518V18.886ZM10.01,16.632C10.837,16.632 11.513,15.956 11.513,15.129C11.513,14.303 10.837,13.627 10.01,13.627C9.184,13.627 8.508,14.303 8.508,15.129C8.508,15.956 9.184,16.632 10.01,16.632Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20.5,9.511C21.325,9.511 22,8.836 22,8.011C22,7.186 21.325,6.511 20.5,6.511C19.675,6.511 19,7.186 19,8.011C19,8.836 19.675,9.511 20.5,9.511ZM20.5,11.011C19.675,11.011 19,11.686 19,12.512C19,13.337 19.675,14.012 20.5,14.012C21.325,14.012 22,13.337 22,12.512C22,11.686 21.325,11.011 20.5,11.011ZM20.5,15.512C19.675,15.512 19,16.187 19,17.012C19,17.837 19.675,18.513 20.5,18.513C21.325,18.513 22,17.837 22,17.012C22,16.187 21.325,15.512 20.5,15.512Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_error.xml b/app/ui/legacy/src/main/res/drawable/status_lock_error.xml
index d5ed073de2979f84a2250f99cdd3b6c2d44036f0..6d35306c46c8f812965118d937a3636a03838c46 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_error.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_error.xml
@@ -1,6 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M80.46,45.47L78.53,45.47L78.53,29.83C78.43,10.63 65.34,0.18 49.43,0.18C33.53,0.18 19.26,11.13 19.76,29.83L19.75,45.45C19.75,45.45 19.99,45.47 18.78,45.47C17.51,45.47 9.15,46.95 9.15,54.41L9.15,90.23C9.15,98.19 18.57,100.17 18.78,100.17L79.98,100.17C80.2,100.17 89.14,99.18 89.14,90.23L89.14,54.9C89.14,46.45 80.68,45.47 80.46,45.47L80.46,45.47ZM33.23,30.03C33.23,20.08 39.3,12.13 49.14,12.13C58.88,12.13 65.04,19.09 65.04,30.03L65.06,45.47L33.22,45.47L33.23,30.03L33.23,30.03ZM59.4,90.87L48.46,79.93L38.23,90.36L31.64,83.76L42.58,72.82L32.34,62.59L38.75,56.11L49.7,67.05L60.12,56.71L66.64,63.22L55.69,74.17L66.01,84.48L59.4,90.87Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M18,8.5H17V6.5C17,3.74 14.76,1.5 12,1.5C9.24,1.5 7,3.74 7,6.5V8.5H6C4.9,8.5 4,9.4 4,10.5V20.5C4,21.6 4.9,22.5 6,22.5H18C19.1,22.5 20,21.6 20,20.5V10.5C20,9.4 19.1,8.5 18,8.5ZM9,6.5C9,4.84 10.34,3.5 12,3.5C13.66,3.5 15,4.84 15,6.5V8.5H9V6.5ZM18,20.5H6V10.5H18V20.5Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M10.414,12l4.997,4.997l-1.414,1.414l-4.997,-4.997z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M9,16.997l4.997,-4.997l1.414,1.414l-4.997,4.997z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml b/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml
index 35d6767d951414b172a8562e1d658e1532bff581..5cef3f41e140fa88da5c81b11a69b1197bb7cd6e 100644
--- a/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_lock_unknown.xml
@@ -1,6 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M50.48,-0.16C34.57,-0.16 20.3,10.78 20.8,29.48L20.79,45.11C20.79,45.11 21.02,45.13 19.82,45.13C18.55,45.13 10.19,46.61 10.19,54.07L10.19,89.89C10.19,97.85 19.6,99.84 19.82,99.84L81.03,99.84C81.25,99.84 90.18,98.84 90.18,89.89L90.18,54.56C90.18,46.11 81.73,45.13 81.5,45.13L79.58,45.13L79.58,29.48C79.48,10.28 66.39,-0.16 50.48,-0.16zM50.18,11.78C59.92,11.78 66.09,18.74 66.09,29.69L66.1,45.13L34.26,45.13L34.28,29.69C34.28,19.74 40.35,11.78 50.18,11.78zM50.02,51.68C52.58,51.68 54.71,52.04 56.42,52.76C58.13,53.47 59.51,54.36 60.55,55.43C61.6,56.49 62.34,57.64 62.79,58.87C63.24,60.1 63.47,61.25 63.47,62.31C63.47,64.07 63.24,65.52 62.79,66.66C62.34,67.8 61.78,68.77 61.12,69.58C60.45,70.39 59.71,71.08 58.9,71.64C58.09,72.21 57.33,72.78 56.61,73.35C55.89,73.92 55.25,74.57 54.69,75.3C54.13,76.04 53.78,76.96 53.64,78.06L53.64,80.15L46.35,80.15L46.35,77.67C46.46,76.1 46.75,74.77 47.24,73.71C47.73,72.65 48.29,71.74 48.94,70.98C49.59,70.23 50.27,69.58 50.99,69.03C51.71,68.48 52.38,67.93 52.99,67.38C53.6,66.83 54.1,66.22 54.48,65.56C54.85,64.9 55.02,64.07 54.99,63.08C54.99,61.4 54.58,60.15 53.77,59.34C52.96,58.53 51.84,58.13 50.4,58.13C49.43,58.13 48.59,58.32 47.89,58.71C47.19,59.09 46.61,59.61 46.16,60.25C45.71,60.89 45.38,61.64 45.16,62.5C44.94,63.37 44.84,64.29 44.84,65.29L36.9,65.29C36.93,63.3 37.27,61.49 37.9,59.83C38.53,58.18 39.41,56.75 40.54,55.54C41.68,54.33 43.05,53.38 44.65,52.7C46.25,52.02 48.04,51.68 50.02,51.68zM45.76,83.31L53.98,83.31L53.98,91.54L45.76,91.54L45.76,83.31z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M18,8.5H17V6.5C17,3.74 14.76,1.5 12,1.5C9.24,1.5 7,3.74 7,6.5H9C9,4.84 10.34,3.5 12,3.5C13.66,3.5 15,4.84 15,6.5V8.5H6C4.9,8.5 4,9.4 4,10.5V20.5C4,21.6 4.9,22.5 6,22.5H18C19.1,22.5 20,21.6 20,20.5V10.5C20,9.4 19.1,8.5 18,8.5ZM18,20.5H6V10.5H18V20.5Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M11.124,16.61H12.911V16.21C12.911,16.183 12.912,16.167 12.913,16.159C12.916,16.155 12.919,16.15 12.925,16.143L12.946,16.114L12.955,16.103C12.965,16.089 12.977,16.074 12.99,16.056C13.047,15.987 13.164,15.869 13.355,15.694C13.558,15.508 13.733,15.322 13.875,15.134C14.135,14.816 14.26,14.434 14.26,14.012C14.26,13.418 14.062,12.91 13.638,12.538C13.226,12.17 12.7,12.001 12.099,12.001C11.493,12.001 10.96,12.176 10.527,12.547C10.097,12.914 9.858,13.417 9.79,14.017L9.74,14.462H11.621L11.648,14.092C11.658,13.957 11.703,13.88 11.765,13.824L11.774,13.816C11.843,13.751 11.929,13.713 12.061,13.713C12.195,13.713 12.261,13.751 12.307,13.799L12.316,13.808C12.376,13.868 12.411,13.942 12.411,14.062C12.411,14.199 12.374,14.278 12.323,14.334L11.691,14.966C11.495,15.162 11.33,15.354 11.241,15.532L11.236,15.543C11.149,15.732 11.124,15.97 11.124,16.21V16.61ZM13.56,14.886C13.435,15.053 13.277,15.224 13.085,15.398C12.886,15.582 12.748,15.719 12.673,15.811C12.657,15.833 12.642,15.853 12.628,15.871L12.628,15.871C12.55,15.975 12.511,16.026 12.511,16.21H11.524C11.524,16.21 11.524,16.21 11.524,16.21H12.51C12.51,16.026 12.55,15.974 12.628,15.871C12.642,15.853 12.657,15.833 12.673,15.811C12.748,15.719 12.885,15.582 13.085,15.398C13.276,15.224 13.435,15.053 13.56,14.886C13.759,14.645 13.859,14.353 13.859,14.012C13.859,13.512 13.697,13.121 13.372,12.838C13.16,12.648 12.906,12.52 12.609,12.454C12.906,12.52 13.161,12.648 13.373,12.838C13.698,13.121 13.86,13.512 13.86,14.012C13.86,14.354 13.76,14.645 13.56,14.886ZM10.188,14.062C10.188,14.062 10.188,14.062 10.188,14.062H11.249C11.266,13.837 11.349,13.658 11.499,13.525C11.649,13.383 11.836,13.313 12.061,13.313C12.13,13.313 12.196,13.319 12.256,13.333C12.196,13.319 12.131,13.313 12.061,13.313C11.837,13.313 11.649,13.384 11.499,13.525C11.349,13.658 11.266,13.837 11.25,14.062H10.188Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12.023,18.052m-1.002,0a1.002,1.002 0,1 1,2.004 0a1.002,1.002 0,1 1,-2.004 0" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_signature.xml b/app/ui/legacy/src/main/res/drawable/status_signature.xml
index 142aac33a566a804bd649f5071dad48f22d883de..41f6b21c0cc2748c7d6d5714f751d0ae26ec1e08 100644
--- a/app/ui/legacy/src/main/res/drawable/status_signature.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_signature.xml
@@ -1,6 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
-        android:pathData="M50.11,97C76.07,97 97.11,75.96 97.11,50C97.11,24.04 76.07,3 50.11,3C24.15,3 3.11,24.04 3.11,50C3.11,75.96 24.15,97 50.11,97ZM46.38,77.51L20.11,57.83L28.03,47.63L43.42,59.52L70.42,23L80.98,30.78L46.38,77.51Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M12,2.5C6.48,2.5 2,6.98 2,12.5C2,18.02 6.48,22.5 12,22.5C17.52,22.5 22,18.02 22,12.5C22,6.98 17.52,2.5 12,2.5ZM10,17.5L5,12.5L6.41,11.09L10,14.67L17.59,7.08L19,8.5L10,17.5Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml
index e72ee19f8916f8ae9e20474e9241f6a089ea61d4..985021c83a6acecd5098d7348a50e418185b7aa1 100644
--- a/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_signature_dots_3.xml
@@ -1,18 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="100.0"
-    android:viewportWidth="150.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,84.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,50m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillAlpha="1" android:fillColor="#000000"
-        android:pathData="M121.43,15.5m-13,0a13,13 0,1 1,26 0a13,13 0,1 1,-26 0"
-        android:strokeAlpha="1" android:strokeColor="#000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="5"/>
-    <path android:fillColor="#000000"
-        android:pathData="M50.11,97C76.07,97 97.11,75.96 97.11,50C97.11,24.04 76.07,3 50.11,3C24.15,3 3.11,24.04 3.11,50C3.11,75.96 24.15,97 50.11,97ZM46.38,77.51L20.11,57.83L28.03,47.63L43.42,59.52L70.42,23L80.98,30.78L46.38,77.51Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M8.962,5.538C5.119,5.538 2,8.657 2,12.5C2,16.343 5.119,19.462 8.962,19.462C12.806,19.462 15.925,16.343 15.925,12.5C15.925,8.657 12.806,5.538 8.962,5.538ZM7.57,15.982L4.089,12.5L5.07,11.519L7.57,14.011L12.854,8.727L13.836,9.715L7.57,15.982Z" />
+    <path
+        android:fillColor="@color/default_icon_color"
+        android:pathData="M20.52,9.538C21.334,9.538 22.001,8.872 22.001,8.058C22.001,7.243 21.334,6.577 20.52,6.577C19.705,6.577 19.039,7.243 19.039,8.058C19.039,8.872 19.705,9.538 20.52,9.538ZM20.52,11.019C19.705,11.019 19.039,11.686 19.039,12.5C19.039,13.314 19.705,13.981 20.52,13.981C21.334,13.981 22.001,13.314 22.001,12.5C22.001,11.686 21.334,11.019 20.52,11.019ZM20.52,15.462C19.705,15.462 19.039,16.128 19.039,16.943C19.039,17.757 19.705,18.423 20.52,18.423C21.334,18.423 22.001,17.757 22.001,16.943C22.001,16.128 21.334,15.462 20.52,15.462Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
index 4ae926f4525dda0c9278008f8eb97d55c94155f4..e4ec718148d49ff20076cc3baa1541f6d384e251 100644
--- a/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
+++ b/app/ui/legacy/src/main/res/drawable/status_signature_unknown.xml
@@ -1,11 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="101.0"
-    android:viewportHeight="100.0">
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
     <path
         android:fillColor="@color/default_icon_color"
-        android:pathData="M50.81,96.55C76.76,96.55 97.81,75.51 97.81,49.55C97.81,23.59 76.76,2.55 50.81,2.55C24.85,2.55 3.81,23.59 3.81,49.55C3.81,75.51 24.85,96.55 50.81,96.55ZM43.83,79.43L43.83,67.01L56.25,67.01L56.25,79.43L43.83,79.43ZM69.57,41.86C68.89,43.58 68.05,45.05 67.04,46.27C66.03,47.49 64.92,48.53 63.7,49.39C62.47,50.25 61.32,51.11 60.23,51.97C59.14,52.83 58.18,53.81 57.33,54.92C56.49,56.03 55.96,57.41 55.74,59.08L55.74,62.24L44.73,62.24L44.73,58.5C44.9,56.11 45.34,54.12 46.08,52.51C46.81,50.9 47.67,49.53 48.65,48.39C49.63,47.26 50.66,46.27 51.75,45.44C52.83,44.61 53.84,43.78 54.76,42.95C55.69,42.11 56.44,41.2 57.01,40.2C57.58,39.2 57.83,37.96 57.78,36.46C57.78,33.91 57.17,32.03 55.95,30.8C54.72,29.59 53.02,28.98 50.85,28.98C49.38,28.98 48.12,29.27 47.05,29.85C46,30.43 45.12,31.21 44.45,32.18C43.76,33.15 43.26,34.28 42.94,35.59C42.61,36.89 42.45,38.29 42.45,39.79L30.46,39.79C30.51,36.79 31.02,34.05 31.97,31.55C32.92,29.06 34.25,26.9 35.96,25.07C37.68,23.24 39.74,21.81 42.16,20.78C44.58,19.76 47.29,19.24 50.28,19.24C54.14,19.24 57.36,19.79 59.94,20.87C62.52,21.95 64.61,23.29 66.18,24.9C67.76,26.51 68.89,28.24 69.57,30.1C70.25,31.96 70.59,33.69 70.59,35.3C70.59,37.96 70.25,40.15 69.57,41.86Z"
-        android:strokeWidth="1"
-        android:strokeColor="@color/default_icon_color" />
+        android:pathData="M12,2.5C6.48,2.5 2,6.98 2,12.5C2,18.02 6.48,22.5 12,22.5C17.52,22.5 22,18.02 22,12.5C22,6.98 17.52,2.5 12,2.5ZM13,19.5H11V17.5H13V19.5ZM15.07,11.75L14.17,12.67C13.45,13.4 13,14 13,15.5H11V15C11,13.9 11.45,12.9 12.17,12.17L13.41,10.91C13.78,10.55 14,10.05 14,9.5C14,8.4 13.1,7.5 12,7.5C10.9,7.5 10,8.4 10,9.5H8C8,7.29 9.79,5.5 12,5.5C14.21,5.5 16,7.29 16,9.5C16,10.38 15.64,11.18 15.07,11.75Z" />
 </vector>
diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 4d178c2666c01d5b59f4d80231b07e290cc5374e..f754aa561f82fa13c03236af6d99ea1af99654f1 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -31,6 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="45dp"
+                android:layout_marginTop="13dp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -38,7 +39,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_marginTop="13dp"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="28dp"
                     android:layout_marginBottom="4dp"
@@ -54,8 +54,6 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginTop="13dp"
                     app:srcCompat="@drawable/status_lock_disabled"
                     android:visibility="gone"
                     />
@@ -66,7 +64,6 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:layout_marginEnd="8dp"
-                    android:layout_marginTop="13dp"
                     android:focusable="false"
                     android:checked="false"
                     style="@style/MessageStarStyle" />