diff --git a/app/src/main/res/drawable/lock_simple_open.xml b/app/src/main/res/drawable/lock_simple_open.xml
index 34d68ddeb..0bf845678 100644
--- a/app/src/main/res/drawable/lock_simple_open.xml
+++ b/app/src/main/res/drawable/lock_simple_open.xml
@@ -1,9 +1,20 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M208,80L96,80L96,56a32,32 0,0 1,32 -32c15.37,0 29.2,11 32.16,25.59a8,8 0,0 0,15.68 -3.18C171.32,24.15 151.2,8 128,8A48.05,48.05 0,0 0,80 56L80,80L48,80A16,16 0,0 0,32 96L32,208a16,16 0,0 0,16 16L208,224a16,16 0,0 0,16 -16L224,96A16,16 0,0 0,208 80ZM208,208L48,208L48,96L208,96L208,208Z"
-      android:fillColor="#4e6074"/>
+      android:pathData="M19.5,8.25L4.5,8.25C4.086,8.25 3.75,8.586 3.75,9L3.75,19.5C3.75,19.914 4.086,20.25 4.5,20.25L19.5,20.25C19.914,20.25 20.25,19.914 20.25,19.5L20.25,9C20.25,8.586 19.914,8.25 19.5,8.25ZM19.5,8.25"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#4e6074"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8.25,8.25L8.25,5.25C8.25,4.254 7.855,3.301 7.152,2.598C6.449,1.895 5.496,1.5 4.5,1.5C2.688,1.5 1.098,2.789 0.75,4.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#4e6074"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 11713365b..580039cfc 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -146,7 +146,7 @@
                     app:layout_constraintEnd_toStartOf="@id/unsecure_label"
                     app:layout_constraintTop_toBottomOf="@id/title"
                     app:layout_constraintBottom_toBottomOf="@id/avatar"
-                    app:tint="?attr/color_warning_600"/>
+                    app:tint="?attr/color_plain_text_security_warning_600"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style"
@@ -158,7 +158,7 @@
                     android:paddingBottom="2dp"
                     android:text="@string/conversation_warning_unsafe_bottom_sheet_title"
                     android:textSize="12sp"
-                    android:textColor="?attr/color_warning_600"
+                    android:textColor="?attr/color_plain_text_security_warning_600"
                     android:maxLines="1"
                     android:ellipsize="end"
                     android:visibility="@{!viewModel.isEndToEndEncrypted &amp;&amp; viewModel.isEndToEndEncryptionAvailable ? View.VISIBLE : View.GONE, default=gone}"
diff --git a/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml b/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
index d916febca..0a620630c 100644
--- a/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
@@ -34,7 +34,7 @@
             android:adjustViewBounds="true"
             android:contentDescription="@null"
             android:src="@drawable/lock_simple_open"
-            app:tint="@color/orange_warning_600"
+            app:tint="?attr/color_plain_text_security_warning_600"
             app:layout_constraintTop_toTopOf="@id/disabled_title"
             app:layout_constraintBottom_toBottomOf="@id/disabled_subtitle"
             app:layout_constraintStart_toStartOf="@id/disabled_background"/>
@@ -49,7 +49,7 @@
             android:layout_marginEnd="15dp"
             android:text="@string/conversation_warning_disabled_because_not_secured_title"
             android:textSize="12sp"
-            android:textColor="@color/orange_warning_600"
+            android:textColor="?attr/color_plain_text_security_warning_600"
             app:layout_constraintStart_toEndOf="@id/disabled_icon"
             app:layout_constraintEnd_toEndOf="@id/disabled_background"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/chat_conversation_unsafe_first_event.xml b/app/src/main/res/layout/chat_conversation_unsafe_first_event.xml
index 0901cda21..16ec2b6c9 100644
--- a/app/src/main/res/layout/chat_conversation_unsafe_first_event.xml
+++ b/app/src/main/res/layout/chat_conversation_unsafe_first_event.xml
@@ -34,7 +34,7 @@
             android:adjustViewBounds="true"
             android:contentDescription="@null"
             android:src="@drawable/lock_simple_open"
-            app:tint="@color/orange_warning_600"
+            app:tint="?attr/color_plain_text_security_warning_600"
             app:layout_constraintTop_toTopOf="@id/unsafe_title"
             app:layout_constraintBottom_toBottomOf="@id/unsafe_subtitle"
             app:layout_constraintStart_toStartOf="@id/unsafe_background"/>
@@ -49,7 +49,7 @@
             android:layout_marginEnd="15dp"
             android:text="@string/conversation_warning_disabled_because_not_secured_title"
             android:textSize="12sp"
-            android:textColor="@color/orange_warning_600"
+            android:textColor="?attr/color_plain_text_security_warning_600"
             app:layout_constraintStart_toEndOf="@id/unsafe_icon"
             app:layout_constraintEnd_toEndOf="@id/unsafe_background"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 746c81f1d..fb6d4823a 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -207,7 +207,7 @@
             app:layout_constraintTop_toBottomOf="@id/date_time"
             app:layout_constraintBottom_toTopOf="@id/separator"
             app:layout_constraintEnd_toStartOf="@id/ephemeral"
-            app:tint="?attr/color_warning_600" />
+            app:tint="?attr/color_plain_text_security_warning_600" />
 
         <View
             android:id="@+id/separator"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fb069ad48..d331ac04c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -50,6 +50,7 @@
         <item name="color_info_500">@color/blue_info_500_night</item>
 
         <item name="color_warning_600">@color/orange_warning_600_night</item>
+        <item name="color_plain_text_security_warning_600">@color/orange_plain_text_security_warning_600</item>
 
         <item name="color_on_main">@color/bc_white</item>
         <item name="color_background_contrast_in_dark_mode">@color/background_color_alt_dark_mode</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ea34103d9..cf81fc54c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -48,6 +48,7 @@
         <attr name="color_info_500" format="color"/>
 
         <attr name="color_warning_600" format="color"/>
+        <attr name="color_plain_text_security_warning_600" format="color"/>
 
         <attr name="color_on_main" format="color"/>
         <attr name="color_background_contrast_in_dark_mode" format="color"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7b931aeaa..98036be3c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -54,6 +54,7 @@
     <color name="blue_info_500">#4AA8FF</color>
     <color name="blue_info_500_night">#64B4FF</color>
 
+    <color name="orange_plain_text_security_warning_600">#AF9308</color>
     <color name="orange_warning_600">#DBB820</color>
     <color name="orange_warning_600_night">#E1C133</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b19b6bd3e..fae1e19df 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -51,6 +51,7 @@
         <item name="color_info_500">@color/blue_info_500</item>
 
         <item name="color_warning_600">@color/orange_warning_600</item>
+        <item name="color_plain_text_security_warning_600">@color/orange_plain_text_security_warning_600</item>
 
         <item name="color_on_main">@color/bc_white</item>
         <item name="color_background_contrast_in_dark_mode">@color/bc_white</item>