diff --git a/res/drawable-hdpi/ic_send_sms_secure.png b/res/drawable-hdpi/ic_send_sms_secure.png
deleted file mode 100644
index 3b27105914..0000000000
Binary files a/res/drawable-hdpi/ic_send_sms_secure.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_send_sms_secure.png b/res/drawable-mdpi/ic_send_sms_secure.png
deleted file mode 100644
index 40dffb0962..0000000000
Binary files a/res/drawable-mdpi/ic_send_sms_secure.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_send_sms_secure.png b/res/drawable-xhdpi/ic_send_sms_secure.png
deleted file mode 100644
index f6a11ec22d..0000000000
Binary files a/res/drawable-xhdpi/ic_send_sms_secure.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_send_sms_secure.png b/res/drawable-xxhdpi/ic_send_sms_secure.png
deleted file mode 100644
index 869579bdfb..0000000000
Binary files a/res/drawable-xxhdpi/ic_send_sms_secure.png and /dev/null differ
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index e370aac582..2f561636bc 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -105,7 +105,7 @@
android:contentDescription="@string/conversation_activity__send"
android:nextFocusLeft="@+id/embedded_text_editor"
android:padding="12dp"
- android:src="?conversation_send_button_sms_insecure"
+ android:src="?conversation_transport_sms_indicator"
android:focusable="true"
android:clickable="false"
android:enabled="false" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a1a8777b41..97e01d7734 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -27,9 +27,6 @@
-
-
-
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4fecf33fe6..77ea2cf827 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -44,11 +44,8 @@
- #ffffffff
- @drawable/textlines
- #ff111111
- - @drawable/ic_send_push
- - @drawable/ic_send_sms_secure
- - @drawable/ic_send_sms_insecure
- @drawable/ic_delivery_delivered_dark
- - @drawable/ic_send_sms_insecure_dark
+ - @drawable/ic_send_sms_insecure
- @drawable/ic_send_push
- @color/white
- @drawable/ic_emoji_dark
@@ -176,9 +173,6 @@
- @color/black
- @drawable/textlines_dark
- #ffeeeeee
- - @drawable/ic_send_push
- - @drawable/ic_send_sms_secure
- - @drawable/ic_send_sms_insecure_dark
- @drawable/ic_delivery_delivered_dark
- @drawable/ic_send_sms_insecure_dark
- @drawable/ic_send_push