diff --git a/app/src/main/res/drawable-xhdpi/back.png b/app/src/main/res/drawable-xhdpi/back_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/back.png
rename to app/src/main/res/drawable-xhdpi/back_default.png
diff --git a/app/src/main/res/drawable-xhdpi/call_alt_start.png b/app/src/main/res/drawable-xhdpi/call_alt_start_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/call_alt_start.png
rename to app/src/main/res/drawable-xhdpi/call_alt_start_default.png
diff --git a/app/src/main/res/drawable-xhdpi/call_back.png b/app/src/main/res/drawable-xhdpi/call_back_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/call_back.png
rename to app/src/main/res/drawable-xhdpi/call_back_default.png
diff --git a/app/src/main/res/drawable-xhdpi/cancel_edit.png b/app/src/main/res/drawable-xhdpi/cancel_edit_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/cancel_edit.png
rename to app/src/main/res/drawable-xhdpi/cancel_edit_default.png
diff --git a/app/src/main/res/drawable-xhdpi/chat_add.png b/app/src/main/res/drawable-xhdpi/chat_add.png
deleted file mode 100644
index a9733a833..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_group_new.png b/app/src/main/res/drawable-xhdpi/chat_group_new_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/chat_group_new.png
rename to app/src/main/res/drawable-xhdpi/chat_group_new_default.png
diff --git a/app/src/main/res/drawable-xhdpi/chat_new.png b/app/src/main/res/drawable-xhdpi/chat_new_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/chat_new.png
rename to app/src/main/res/drawable-xhdpi/chat_new_default.png
diff --git a/app/src/main/res/drawable-xhdpi/chevron_list_close.png b/app/src/main/res/drawable-xhdpi/chevron_list_close_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/chevron_list_close.png
rename to app/src/main/res/drawable-xhdpi/chevron_list_close_default.png
diff --git a/app/src/main/res/drawable-xhdpi/chevron_list_open.png b/app/src/main/res/drawable-xhdpi/chevron_list_open_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/chevron_list_open.png
rename to app/src/main/res/drawable-xhdpi/chevron_list_open_default.png
diff --git a/app/src/main/res/drawable-xhdpi/contact.png b/app/src/main/res/drawable-xhdpi/contact_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/contact.png
rename to app/src/main/res/drawable-xhdpi/contact_default.png
diff --git a/app/src/main/res/drawable-xhdpi/deselect_all.png b/app/src/main/res/drawable-xhdpi/deselect_all_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/deselect_all.png
rename to app/src/main/res/drawable-xhdpi/deselect_all_default.png
diff --git a/app/src/main/res/drawable-xhdpi/dialer_back.png b/app/src/main/res/drawable-xhdpi/dialer_back.png
deleted file mode 100644
index a9eb45734..000000000
Binary files a/app/src/main/res/drawable-xhdpi/dialer_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/edit.png b/app/src/main/res/drawable-xhdpi/edit_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/edit.png
rename to app/src/main/res/drawable-xhdpi/edit_default.png
diff --git a/app/src/main/res/drawable-xhdpi/menu_about.png b/app/src/main/res/drawable-xhdpi/menu_about_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/menu_about.png
rename to app/src/main/res/drawable-xhdpi/menu_about_default.png
diff --git a/app/src/main/res/drawable-xhdpi/menu_assistant.png b/app/src/main/res/drawable-xhdpi/menu_assistant_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/menu_assistant.png
rename to app/src/main/res/drawable-xhdpi/menu_assistant_default.png
diff --git a/app/src/main/res/drawable-xhdpi/menu_options.png b/app/src/main/res/drawable-xhdpi/menu_options_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/menu_options.png
rename to app/src/main/res/drawable-xhdpi/menu_options_default.png
diff --git a/app/src/main/res/drawable-xhdpi/menu_recordings.png b/app/src/main/res/drawable-xhdpi/menu_recordings_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/menu_recordings.png
rename to app/src/main/res/drawable-xhdpi/menu_recordings_default.png
diff --git a/app/src/main/res/drawable-xhdpi/next.png b/app/src/main/res/drawable-xhdpi/next_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/next.png
rename to app/src/main/res/drawable-xhdpi/next_default.png
diff --git a/app/src/main/res/drawable-xhdpi/select_all.png b/app/src/main/res/drawable-xhdpi/select_all_default.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/select_all.png
rename to app/src/main/res/drawable-xhdpi/select_all_default.png
diff --git a/app/src/main/res/drawable-xhdpi/valid_disabled.png b/app/src/main/res/drawable-xhdpi/valid_disabled.png
deleted file mode 100644
index a7c040c4b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/valid_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable/chat_room_creation_next.xml b/app/src/main/res/drawable/back.xml
similarity index 72%
rename from app/src/main/res/drawable/chat_room_creation_next.xml
rename to app/src/main/res/drawable/back.xml
index 217470dae..a298e171c 100644
--- a/app/src/main/res/drawable/chat_room_creation_next.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -1,15 +1,15 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/chat_group_informations.xml b/app/src/main/res/drawable/call_alt_start.xml
similarity index 66%
rename from app/src/main/res/drawable/chat_group_informations.xml
rename to app/src/main/res/drawable/call_alt_start.xml
index 96f25a4c2..43d9d8be7 100644
--- a/app/src/main/res/drawable/chat_group_informations.xml
+++ b/app/src/main/res/drawable/call_alt_start.xml
@@ -1,15 +1,15 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/call_back.xml b/app/src/main/res/drawable/call_back.xml
new file mode 100644
index 000000000..06367ef0d
--- /dev/null
+++ b/app/src/main/res/drawable/call_back.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/cancel_edit.xml b/app/src/main/res/drawable/cancel_edit.xml
new file mode 100644
index 000000000..cc01397c9
--- /dev/null
+++ b/app/src/main/res/drawable/cancel_edit.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/chat_group_new.xml b/app/src/main/res/drawable/chat_group_new.xml
new file mode 100644
index 000000000..16fac5aa7
--- /dev/null
+++ b/app/src/main/res/drawable/chat_group_new.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/chat_new.xml b/app/src/main/res/drawable/chat_new.xml
new file mode 100644
index 000000000..fa5e61254
--- /dev/null
+++ b/app/src/main/res/drawable/chat_new.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/chat_room_creation_confirm.xml b/app/src/main/res/drawable/chat_room_creation_confirm.xml
deleted file mode 100644
index 21fcf1005..000000000
--- a/app/src/main/res/drawable/chat_room_creation_confirm.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/chevron_list_close.xml b/app/src/main/res/drawable/chevron_list_close.xml
new file mode 100644
index 000000000..d826e42e9
--- /dev/null
+++ b/app/src/main/res/drawable/chevron_list_close.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/chevron_list_open.xml b/app/src/main/res/drawable/chevron_list_open.xml
new file mode 100644
index 000000000..37bcf729b
--- /dev/null
+++ b/app/src/main/res/drawable/chevron_list_open.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/contact.xml b/app/src/main/res/drawable/contact.xml
new file mode 100644
index 000000000..3a33fc108
--- /dev/null
+++ b/app/src/main/res/drawable/contact.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/deselect_all.xml b/app/src/main/res/drawable/deselect_all.xml
new file mode 100644
index 000000000..2011e9ade
--- /dev/null
+++ b/app/src/main/res/drawable/deselect_all.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
new file mode 100644
index 000000000..f692e5846
--- /dev/null
+++ b/app/src/main/res/drawable/edit.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/menu_about.xml b/app/src/main/res/drawable/menu_about.xml
new file mode 100644
index 000000000..9fbb4ec59
--- /dev/null
+++ b/app/src/main/res/drawable/menu_about.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/menu_assistant.xml b/app/src/main/res/drawable/menu_assistant.xml
new file mode 100644
index 000000000..44b13bd10
--- /dev/null
+++ b/app/src/main/res/drawable/menu_assistant.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/menu_options.xml b/app/src/main/res/drawable/menu_options.xml
new file mode 100644
index 000000000..056ff36da
--- /dev/null
+++ b/app/src/main/res/drawable/menu_options.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/menu_recordings.xml b/app/src/main/res/drawable/menu_recordings.xml
new file mode 100644
index 000000000..e4d5f5e5e
--- /dev/null
+++ b/app/src/main/res/drawable/menu_recordings.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml
new file mode 100644
index 000000000..968192312
--- /dev/null
+++ b/app/src/main/res/drawable/next.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/numpad_eight.xml b/app/src/main/res/drawable/numpad_eight.xml
index de1aaefca..eba2595e3 100644
--- a/app/src/main/res/drawable/numpad_eight.xml
+++ b/app/src/main/res/drawable/numpad_eight.xml
@@ -6,7 +6,7 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_five.xml b/app/src/main/res/drawable/numpad_five.xml
index 3f87880ea..bd19a35a0 100644
--- a/app/src/main/res/drawable/numpad_five.xml
+++ b/app/src/main/res/drawable/numpad_five.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_four.xml b/app/src/main/res/drawable/numpad_four.xml
index 70eba49e7..791010381 100644
--- a/app/src/main/res/drawable/numpad_four.xml
+++ b/app/src/main/res/drawable/numpad_four.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_nine.xml b/app/src/main/res/drawable/numpad_nine.xml
index 92369bcad..4fcf8ba72 100644
--- a/app/src/main/res/drawable/numpad_nine.xml
+++ b/app/src/main/res/drawable/numpad_nine.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_one.xml b/app/src/main/res/drawable/numpad_one.xml
index 8ed31506a..392b53e3f 100644
--- a/app/src/main/res/drawable/numpad_one.xml
+++ b/app/src/main/res/drawable/numpad_one.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_seven.xml b/app/src/main/res/drawable/numpad_seven.xml
index 00a23694e..a8aad2d4f 100644
--- a/app/src/main/res/drawable/numpad_seven.xml
+++ b/app/src/main/res/drawable/numpad_seven.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_sharp.xml b/app/src/main/res/drawable/numpad_sharp.xml
index 76bceb018..84bbed502 100644
--- a/app/src/main/res/drawable/numpad_sharp.xml
+++ b/app/src/main/res/drawable/numpad_sharp.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_six.xml b/app/src/main/res/drawable/numpad_six.xml
index 8d8273f27..de101da62 100644
--- a/app/src/main/res/drawable/numpad_six.xml
+++ b/app/src/main/res/drawable/numpad_six.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_star_digit.xml b/app/src/main/res/drawable/numpad_star_digit.xml
index 83f1d96db..985778188 100644
--- a/app/src/main/res/drawable/numpad_star_digit.xml
+++ b/app/src/main/res/drawable/numpad_star_digit.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_three.xml b/app/src/main/res/drawable/numpad_three.xml
index ac9fade1e..ed428bb70 100644
--- a/app/src/main/res/drawable/numpad_three.xml
+++ b/app/src/main/res/drawable/numpad_three.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_two.xml b/app/src/main/res/drawable/numpad_two.xml
index 17c52efcb..3762419f4 100644
--- a/app/src/main/res/drawable/numpad_two.xml
+++ b/app/src/main/res/drawable/numpad_two.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/numpad_zero.xml b/app/src/main/res/drawable/numpad_zero.xml
index 3e9e0fac4..c43fe66e8 100644
--- a/app/src/main/res/drawable/numpad_zero.xml
+++ b/app/src/main/res/drawable/numpad_zero.xml
@@ -6,6 +6,6 @@
-
+ android:tint="?attr/drawableTintColor"/>
diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml
new file mode 100644
index 000000000..294ddea41
--- /dev/null
+++ b/app/src/main/res/drawable/select_all.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
diff --git a/app/src/main/res/drawable/valid.xml b/app/src/main/res/drawable/valid.xml
index 270d62b41..3be5be72e 100644
--- a/app/src/main/res/drawable/valid.xml
+++ b/app/src/main/res/drawable/valid.xml
@@ -1,5 +1,15 @@
-
-
+ -
+
+
+ -
+
+
+ -
+
+
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 894fa966e..94369e840 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -37,8 +37,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_dialer_back"
android:padding="18dp"
- android:src="@drawable/back"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+ android:src="@drawable/call_alt_start" />
+ android:src="@drawable/chat_room_group_infos" />
+ android:src="@drawable/back" />
diff --git a/app/src/main/res/layout/chat_device_group.xml b/app/src/main/res/layout/chat_device_group.xml
index d4ad560ed..9ab1f0d2e 100644
--- a/app/src/main/res/layout/chat_device_group.xml
+++ b/app/src/main/res/layout/chat_device_group.xml
@@ -44,8 +44,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
- android:src="@drawable/chevron_list_close"
- android:tint="?attr/drawableDarkModeTintColor"/>
+ android:src="@drawable/chevron_list_close"/>
diff --git a/app/src/main/res/layout/chat_devices.xml b/app/src/main/res/layout/chat_devices.xml
index b2e0d446c..d76f976d5 100644
--- a/app/src/main/res/layout/chat_devices.xml
+++ b/app/src/main/res/layout/chat_devices.xml
@@ -24,8 +24,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_back"
android:padding="18dp"
- android:src="@drawable/back"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+ android:src="@drawable/valid" />
diff --git a/app/src/main/res/layout/chatlist.xml b/app/src/main/res/layout/chatlist.xml
index 177637931..e906cf8e2 100644
--- a/app/src/main/res/layout/chatlist.xml
+++ b/app/src/main/res/layout/chatlist.xml
@@ -24,8 +24,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_new_discussion"
android:padding="15dp"
- android:src="@drawable/chat_new"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/chat_new" />
+ android:src="@drawable/chat_group_new" />
+ android:src="@drawable/delete" />
diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml
index 0a5095095..bdb714a31 100644
--- a/app/src/main/res/layout/contact.xml
+++ b/app/src/main/res/layout/contact.xml
@@ -23,8 +23,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_back"
android:padding="18dp"
- android:src="@drawable/back"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/back" />
+ android:src="@drawable/edit" />
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index e332d0bf8..390671cce 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -19,8 +19,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_cancel_button"
android:padding="15dp"
- android:src="@drawable/cancel_edit"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/cancel_edit" />
+ android:src="@drawable/valid" />
diff --git a/app/src/main/res/layout/edit_list.xml b/app/src/main/res/layout/edit_list.xml
index 292407729..9d0a6c1d1 100644
--- a/app/src/main/res/layout/edit_list.xml
+++ b/app/src/main/res/layout/edit_list.xml
@@ -15,8 +15,7 @@
android:background="?attr/button_background_drawable"
android:contentDescription="@string/content_description_cancel_button"
android:padding="15dp"
- android:src="@drawable/cancel_edit"
- android:tint="?attr/drawableDarkModeTintColor" />
+ android:src="@drawable/cancel_edit" />
+ android:src="@drawable/select_all" />
+ android:src="@drawable/back" />
diff --git a/app/src/main/res/layout/in_app.xml b/app/src/main/res/layout/in_app.xml
index b8db11430..724a71628 100644
--- a/app/src/main/res/layout/in_app.xml
+++ b/app/src/main/res/layout/in_app.xml
@@ -40,15 +40,6 @@
android:gravity="center"
android:text="@string/inapp" />
-
+ android:src="@drawable/back" />
+ android:src="@drawable/back" />
+
+
+
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 084f5db29..7764b9ad3 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -22,7 +22,7 @@
#ffffff
#f3f3f3
#ffeee5
- #464646
+ #808080
#00000000
@color/colorA
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d5ce92222..64f40b084 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,7 +23,6 @@
- @color/colorC
- @color/colorDisabled
- @color/colorA
- - @color/colorC
- @color/colorF
- @color/colorE
@@ -55,7 +54,6 @@
- @color/colorH
- @color/colorE
- @color/colorA
- - @color/colorH
- @color/colorC
- @color/colorE