diff --git a/app/src/main/res/color/icon_tab_selector.xml b/app/src/main/res/color/icon_tab_selector.xml
deleted file mode 100644
index 30cd1bdc27..0000000000
--- a/app/src/main/res/color/icon_tab_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/signal_icon_tint_tab_selected" android:state_selected="true" />
-    <item android:color="@color/signal_icon_tint_tab_unselected" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/divet_lower_right_dark.png b/app/src/main/res/drawable-hdpi/divet_lower_right_dark.png
deleted file mode 100644
index d37eece35c..0000000000
Binary files a/app/src/main/res/drawable-hdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_account_box_dark.png b/app/src/main/res/drawable-hdpi/ic_account_box_dark.png
deleted file mode 100644
index 5aed1dfcd6..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_box_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_account_box_light.png b/app/src/main/res/drawable-hdpi/ic_account_box_light.png
deleted file mode 100644
index 042b0b8559..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_account_box_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png
deleted file mode 100644
index 13c7f0c28d..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_audio_light.png b/app/src/main/res/drawable-hdpi/ic_audio_light.png
deleted file mode 100644
index 45c439e07f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_audio_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/divet_lower_right_dark.png b/app/src/main/res/drawable-mdpi/divet_lower_right_dark.png
deleted file mode 100644
index 8d2bc439ec..0000000000
Binary files a/app/src/main/res/drawable-mdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_box_dark.png b/app/src/main/res/drawable-mdpi/ic_account_box_dark.png
deleted file mode 100644
index 285689f3c3..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_box_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_account_box_light.png b/app/src/main/res/drawable-mdpi/ic_account_box_light.png
deleted file mode 100644
index 2d9417bd09..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_account_box_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png
deleted file mode 100644
index 0ea546b1f9..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_audio_light.png b/app/src/main/res/drawable-mdpi/ic_audio_light.png
deleted file mode 100644
index fd2d3d06da..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_audio_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.png b/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.png
deleted file mode 100644
index e4a3d77a00..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_box_dark.png b/app/src/main/res/drawable-xhdpi/ic_account_box_dark.png
deleted file mode 100644
index 2559c4dbf1..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_box_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_account_box_light.png b/app/src/main/res/drawable-xhdpi/ic_account_box_light.png
deleted file mode 100644
index ddd06d7487..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_account_box_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png
deleted file mode 100644
index 28aef9e9b1..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_audio_light.png b/app/src/main/res/drawable-xhdpi/ic_audio_light.png
deleted file mode 100644
index 3fe1d58cb0..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_audio_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png b/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png
deleted file mode 100644
index f07336f56b..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_box_dark.png b/app/src/main/res/drawable-xxhdpi/ic_account_box_dark.png
deleted file mode 100644
index a95c8006c5..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_box_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_box_light.png b/app/src/main/res/drawable-xxhdpi/ic_account_box_light.png
deleted file mode 100644
index 67716eff3b..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_account_box_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png
deleted file mode 100644
index 7b0785e116..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_audio_light.png b/app/src/main/res/drawable-xxhdpi/ic_audio_light.png
deleted file mode 100644
index d53eef6ff6..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_audio_light.png and /dev/null differ
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 389a190622..4325748b8f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -22,7 +22,6 @@
     <attr name="conversation_group_member_name" format="reference|color"/>
 
     <attr name="fab_color" format="reference|color" />
-    <attr name="lower_right_divet" format="reference" />
 
     <attr name="ic_arrow_forward" format="reference" />
     <attr name="ic_visibility_on" format="reference" />
@@ -51,7 +50,6 @@
     <attr name="conversation_attach_image" format="reference"/>
     <attr name="conversation_attach_video" format="reference"/>
     <attr name="conversation_attach_sound" format="reference"/>
-    <attr name="conversation_attach_contact_info" format="reference"/>
     <attr name="conversation_attach" format="reference"/>
     <attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
     <attr name="conversation_number_picker_text_color_selected" format="reference|color"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2a63533952..23b7b5f5db 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -169,7 +169,6 @@
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
         <item name="fab_color">?colorAccent</item>
-        <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
         <item name="conversation_background">@color/loki_darkest_gray</item>
         <item name="conversation_editor_background">#22ffffff</item>
@@ -182,7 +181,6 @@
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
         <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
-        <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
         <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
         <item name="conversation_number_picker_text_color_normal">@color/gray13</item>
         <item name="conversation_number_picker_text_color_selected">@color/white</item>
diff --git a/libsession/src/main/res/values/attrs.xml b/libsession/src/main/res/values/attrs.xml
index 5588e25ece..1bfeb02360 100644
--- a/libsession/src/main/res/values/attrs.xml
+++ b/libsession/src/main/res/values/attrs.xml
@@ -22,7 +22,6 @@
     <attr name="conversation_group_member_name" format="reference|color"/>
 
     <attr name="fab_color" format="reference|color" />
-    <attr name="lower_right_divet" format="reference" />
 
     <attr name="ic_arrow_forward" format="reference" />
     <attr name="ic_visibility_on" format="reference" />
@@ -43,7 +42,6 @@
     <attr name="conversation_attach_image" format="reference"/>
     <attr name="conversation_attach_video" format="reference"/>
     <attr name="conversation_attach_sound" format="reference"/>
-    <attr name="conversation_attach_contact_info" format="reference"/>
     <attr name="conversation_attach" format="reference"/>
     <attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
     <attr name="conversation_number_picker_text_color_selected" format="reference|color"/>