From 7360c1f832bb4f8b610d35b262fb37e49cdb0231 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Mar 2019 21:20:02 +0100
Subject: [PATCH] Improved dark theme

---
 .../contacts/ContactEditorFragment.java       | 10 ++----
 .../settings/LinphonePreferences.java         | 11 ++++---
 .../res/drawable/button_background_dark.xml   | 11 +++++++
 ...ground.xml => button_background_light.xml} |  3 +-
 app/src/main/res/drawable/toolbar_button.xml  |  9 ------
 app/src/main/res/layout-land/about.xml        |  4 +--
 app/src/main/res/layout-land/call.xml         | 24 +++++++-------
 app/src/main/res/layout-land/dialer.xml       |  2 +-
 app/src/main/res/layout-land/main.xml         |  5 +--
 .../main/res/layout-sw533dp-land/dialer.xml   |  2 +-
 app/src/main/res/layout-sw533dp-land/main.xml |  5 +--
 app/src/main/res/layout-sw533dp/dialer.xml    |  2 +-
 app/src/main/res/layout-sw533dp/main.xml      |  5 +--
 app/src/main/res/layout/about.xml             | 10 +++---
 app/src/main/res/layout/assistant_topbar.xml  |  7 ++--
 app/src/main/res/layout/call.xml              | 24 +++++++-------
 app/src/main/res/layout/call_outgoing.xml     |  4 +--
 app/src/main/res/layout/chat.xml              | 20 +++++++-----
 app/src/main/res/layout/chat_create.xml       | 18 ++++++-----
 app/src/main/res/layout/chat_device_group.xml |  3 +-
 app/src/main/res/layout/chat_devices.xml      | 14 +++-----
 app/src/main/res/layout/chat_imdn.xml         |  2 +-
 app/src/main/res/layout/chat_imdn_old.xml     |  2 +-
 app/src/main/res/layout/chat_infos.xml        | 14 ++++----
 app/src/main/res/layout/chatlist.xml          | 18 +++++++----
 app/src/main/res/layout/contact.xml           | 12 ++++---
 app/src/main/res/layout/contact_edit.xml      | 31 +++++-------------
 app/src/main/res/layout/contacts_list.xml     | 11 +++----
 app/src/main/res/layout/dialer.xml            |  2 +-
 app/src/main/res/layout/edit_list.xml         | 15 +++++----
 app/src/main/res/layout/history.xml           |  6 ++--
 app/src/main/res/layout/history_detail.xml    | 10 +++---
 app/src/main/res/layout/in_app.xml            |  4 +--
 app/src/main/res/layout/main.xml              |  5 +--
 app/src/main/res/layout/recordings_list.xml   |  7 ++--
 .../res/layout/side_menu_account_cell.xml     |  6 ++--
 .../main/res/layout/side_menu_item_cell.xml   |  1 -
 .../res/layout/side_menu_main_account.xml     | 17 ++++------
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/styles.xml            | 32 ++++++++++++++-----
 40 files changed, 206 insertions(+), 183 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_background_dark.xml
 rename app/src/main/res/drawable/{button_background.xml => button_background_light.xml} (80%)
 delete mode 100644 app/src/main/res/drawable/toolbar_button.xml

diff --git a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
index e64968494..df3c4fc04 100644
--- a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
@@ -58,8 +58,8 @@ import org.linphone.R;
 import org.linphone.core.tools.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.utils.FileUtils;
-import org.linphone.utils.ImageUtils;
 import org.linphone.utils.LinphoneUtils;
+import org.linphone.views.ContactAvatar;
 
 public class ContactEditorFragment extends Fragment {
     private static final int ADD_PHOTO = 1337;
@@ -311,13 +311,9 @@ public class ContactEditorFragment extends Fragment {
 
         mContactPicture = mView.findViewById(R.id.contact_picture);
         if (mContact != null) {
-            ImageUtils.setImagePictureFromUri(
-                    getActivity(),
-                    mContactPicture,
-                    mContact.getPhotoUri(),
-                    mContact.getThumbnailUri());
+            ContactAvatar.displayAvatar(mContact, mView.findViewById(R.id.avatar_layout));
         } else {
-            ImageUtils.setDefaultContactImage(mContactPicture);
+            ContactAvatar.displayAvatar("", mView.findViewById(R.id.avatar_layout));
         }
 
         mContactPicture.setOnClickListener(
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index f4b84230d..e5a006fb0 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import androidx.appcompat.app.AppCompatDelegate;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -1432,13 +1433,15 @@ public class LinphonePreferences {
     }
 
     public boolean isDarkModeEnabled() {
-        return /*AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
-               && */ getConfig().getBool("app", "dark_mode", false);
+        return getConfig()
+                .getBool(
+                        "app",
+                        "dark_mode",
+                        AppCompatDelegate.getDefaultNightMode()
+                                == AppCompatDelegate.MODE_NIGHT_YES);
     }
 
     public void enableDarkMode(boolean enable) {
-        /*AppCompatDelegate.setDefaultNightMode(
-        enable ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);*/
         getConfig().setBool("app", "dark_mode", enable);
     }
 
diff --git a/app/src/main/res/drawable/button_background_dark.xml b/app/src/main/res/drawable/button_background_dark.xml
new file mode 100644
index 000000000..8f3843085
--- /dev/null
+++ b/app/src/main/res/drawable/button_background_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true"
+		android:drawable="@color/colorD" />
+	<item android:state_enabled="false"
+		android:drawable="@color/colorC" />
+	<item android:state_selected="true"
+		android:drawable="@color/colorC" />
+	<item
+		android:drawable="@color/colorC" />
+</selector>
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background_light.xml
similarity index 80%
rename from app/src/main/res/drawable/button_background.xml
rename to app/src/main/res/drawable/button_background_light.xml
index c33946ec4..bc101d5e2 100644
--- a/app/src/main/res/drawable/button_background.xml
+++ b/app/src/main/res/drawable/button_background_light.xml
@@ -4,7 +4,8 @@
 		android:drawable="@color/colorE" />
 	<item android:state_enabled="false"
 		android:drawable="@color/colorF" />
+	<item android:state_selected="true"
+		android:drawable="@color/colorF" />
 	<item
 		android:drawable="@color/colorF" />
 </selector>
-
diff --git a/app/src/main/res/drawable/toolbar_button.xml b/app/src/main/res/drawable/toolbar_button.xml
deleted file mode 100644
index 3fa8135d8..000000000
--- a/app/src/main/res/drawable/toolbar_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		android:drawable="@color/colorE" />
-	<item android:state_selected="true"
-		android:drawable="@color/colorF" />
-	<item
-		android:drawable="@color/colorF" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index f7f0fb2ab..326212248 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -119,7 +119,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:background="@drawable/button_background"
+                android:background="?attr/button_background_drawable"
                 android:text="@string/menu_send_log" />
 
             <Button
@@ -128,7 +128,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:background="@drawable/button_background"
+                android:background="?attr/button_background_drawable"
                 android:text="@string/menu_reset_log" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index 7f905e2c9..fe1ff04fc 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -278,7 +278,7 @@
                             android:id="@+id/video"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_switch_video"
                             android:padding="20dp"
                             android:src="@drawable/camera" />
@@ -299,7 +299,7 @@
                         android:layout_width="0dp"
                         android:layout_height="60dp"
                         android:layout_weight="0.25"
-                        android:background="@drawable/button_background"
+                        android:background="?attr/button_background_drawable"
                         android:contentDescription="@string/content_description_toggle_micro"
                         android:padding="10dp"
                         android:src="@drawable/micro" />
@@ -314,7 +314,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_toggle_speaker"
                             android:padding="15dp"
                             android:src="@drawable/speaker" />
@@ -324,7 +324,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_audio_route"
                             android:padding="15dp"
                             android:src="@drawable/routes"
@@ -335,7 +335,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/audio_route"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_bluetooth"
                             android:padding="15dp"
                             android:src="@drawable/route_bluetooth"
@@ -346,7 +346,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/route_bluetooth"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_earpiece"
                             android:padding="15dp"
                             android:src="@drawable/route_earpiece"
@@ -357,7 +357,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/route_earpiece"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_toggle_speaker"
                             android:padding="15dp"
                             android:src="@drawable/route_speaker"
@@ -375,7 +375,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_call_options"
                             android:padding="15dp"
                             android:src="@drawable/options" />
@@ -385,7 +385,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/options"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_record_call"
                             android:padding="15dp"
                             android:src="@drawable/options_rec"
@@ -396,7 +396,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/record_call"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_add_call"
                             android:padding="15dp"
                             android:src="@drawable/options_add_call"
@@ -407,7 +407,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/add_call"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_transfer"
                             android:padding="15dp"
                             android:src="@drawable/options_transfer_call"
@@ -418,7 +418,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/transfer"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_conference"
                             android:padding="15dp"
                             android:src="@drawable/options_start_conference"
diff --git a/app/src/main/res/layout-land/dialer.xml b/app/src/main/res/layout-land/dialer.xml
index 7f91392bb..e7ac3d318 100644
--- a/app/src/main/res/layout-land/dialer.xml
+++ b/app/src/main/res/layout-land/dialer.xml
@@ -83,7 +83,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_add_contact"
                 android:padding="15dp"
                 android:src="@drawable/contact_add" />
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index d070d0920..894fa966e 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -34,10 +34,11 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.2"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_dialer_back"
                     android:padding="18dp"
-                    android:src="@drawable/back" />
+                    android:src="@drawable/back"
+                    android:tint="?attr/drawableDarkModeTintColor" />
 
                 <TextView
                     android:id="@+id/top_bar_title"
diff --git a/app/src/main/res/layout-sw533dp-land/dialer.xml b/app/src/main/res/layout-sw533dp-land/dialer.xml
index 71b153edf..34b4b7474 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer.xml
@@ -81,7 +81,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_add_contact"
                     android:padding="15dp"
                     android:src="@drawable/contact_add" />
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index c4b02991e..8bee5aba7 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -34,10 +34,11 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.2"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_dialer_back"
                     android:padding="18dp"
-                    android:src="@drawable/back" />
+                    android:src="@drawable/back"
+                    android:tint="?attr/drawableDarkModeTintColor" />
 
                 <TextView
                     android:id="@+id/top_bar_title"
diff --git a/app/src/main/res/layout-sw533dp/dialer.xml b/app/src/main/res/layout-sw533dp/dialer.xml
index 61e139874..2e7047dd9 100644
--- a/app/src/main/res/layout-sw533dp/dialer.xml
+++ b/app/src/main/res/layout-sw533dp/dialer.xml
@@ -81,7 +81,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_add_contact"
                     android:padding="15dp"
                     android:src="@drawable/contact_add" />
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 09b990d39..6cb81dc4d 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -34,10 +34,11 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.2"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_dialer_back"
                     android:padding="18dp"
-                    android:src="@drawable/back" />
+                    android:src="@drawable/back"
+                    android:tint="?attr/drawableDarkModeTintColor" />
 
                 <TextView
                     android:id="@+id/top_bar_title"
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 4ffaaf7af..7b554e980 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -103,21 +103,23 @@
 
             <Button
                 android:id="@+id/send_log"
-                style="android:attr/buttonBarButtonStyleStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:background="@drawable/button_background"
+                android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
+                style="@style/font8"
                 android:padding="10dp"
                 android:text="@string/menu_send_log" />
 
             <Button
                 android:id="@+id/reset_log"
-                style="android:attr/buttonBarButtonStyleStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
-                android:background="@drawable/button_background"
+                android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
+                style="@style/font8"
                 android:padding="10dp"
                 android:text="@string/menu_reset_log" />
 
diff --git a/app/src/main/res/layout/assistant_topbar.xml b/app/src/main/res/layout/assistant_topbar.xml
index b572c004b..1da027b11 100644
--- a/app/src/main/res/layout/assistant_topbar.xml
+++ b/app/src/main/res/layout/assistant_topbar.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:layout_gravity="center_horizontal"
-    android:background="@color/colorF"
+    android:background="?attr/lighToolbarBackgroundColor"
     android:orientation="horizontal">
 
     <ImageView
@@ -12,10 +12,11 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.2"
-        android:background="@drawable/toolbar_button"
+        android:background="?attr/button_background_drawable"
         android:contentDescription="@string/content_description_back"
         android:padding="18dp"
-        android:src="@drawable/back" />
+        android:src="@drawable/back"
+        android:tint="?attr/drawableDarkModeTintColor" />
 
     <TextView
         style="@style/font1"
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index e711d220d..18146e79e 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -219,7 +219,7 @@
                             android:id="@+id/video"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_switch_video"
                             android:padding="20dp"
                             android:src="@drawable/camera" />
@@ -240,7 +240,7 @@
                         android:layout_width="0dp"
                         android:layout_height="60dp"
                         android:layout_weight="0.25"
-                        android:background="@drawable/button_background"
+                        android:background="?attr/button_background_drawable"
                         android:contentDescription="@string/content_description_toggle_micro"
                         android:padding="10dp"
                         android:src="@drawable/micro" />
@@ -255,7 +255,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_toggle_speaker"
                             android:padding="15dp"
                             android:src="@drawable/speaker" />
@@ -265,7 +265,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_audio_route"
                             android:padding="15dp"
                             android:src="@drawable/routes"
@@ -276,7 +276,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/audio_route"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_bluetooth"
                             android:padding="15dp"
                             android:src="@drawable/route_bluetooth"
@@ -287,7 +287,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/route_bluetooth"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_earpiece"
                             android:padding="15dp"
                             android:src="@drawable/route_earpiece"
@@ -298,7 +298,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/route_earpiece"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_toggle_speaker"
                             android:padding="15dp"
                             android:src="@drawable/route_speaker"
@@ -316,7 +316,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_alignParentBottom="true"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_call_options"
                             android:padding="15dp"
                             android:src="@drawable/options" />
@@ -326,7 +326,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/options"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_record_call"
                             android:padding="15dp"
                             android:src="@drawable/options_rec"
@@ -337,7 +337,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/record_call"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_add_call"
                             android:padding="15dp"
                             android:src="@drawable/options_add_call"
@@ -348,7 +348,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/add_call"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_transfer"
                             android:padding="15dp"
                             android:src="@drawable/options_transfer_call"
@@ -359,7 +359,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="60dp"
                             android:layout_above="@id/transfer"
-                            android:background="@drawable/button_background"
+                            android:background="?attr/button_background_drawable"
                             android:contentDescription="@string/content_description_conference"
                             android:padding="15dp"
                             android:src="@drawable/options_start_conference"
diff --git a/app/src/main/res/layout/call_outgoing.xml b/app/src/main/res/layout/call_outgoing.xml
index ca4535ec7..306cf7085 100644
--- a/app/src/main/res/layout/call_outgoing.xml
+++ b/app/src/main/res/layout/call_outgoing.xml
@@ -106,7 +106,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/button_background"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_toggle_micro"
             android:padding="10dp"
             android:src="@drawable/micro" />
@@ -116,7 +116,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/button_background"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_toggle_speaker"
             android:padding="15dp"
             android:src="@drawable/speaker" />
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
index bad50e162..752c72668 100644
--- a/app/src/main/res/layout/chat.xml
+++ b/app/src/main/res/layout/chat.xml
@@ -21,10 +21,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -58,10 +59,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back_call"
                 android:padding="15dp"
                 android:src="@drawable/call_back"
+                android:tint="?attr/drawableDarkModeTintColor"
                 android:visibility="gone" />
 
             <ImageView
@@ -69,27 +71,29 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_call"
                 android:padding="15dp"
-                android:src="@drawable/call_alt_start" />
+                android:src="@drawable/call_alt_start"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <ImageView
                 android:id="@+id/group_infos"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_conversation_infos"
                 android:padding="15dp"
-                android:src="@drawable/chat_room_group_infos" />
+                android:src="@drawable/chat_room_group_infos"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <ImageView
                 android:id="@+id/edit"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_edit_list"
                 android:padding="15dp"
                 android:src="@drawable/delete" />
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index d249f0352..ee5fc8556 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -22,10 +22,11 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="left"
                 android:layout_weight="1"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -40,7 +41,7 @@
                     android:id="@+id/security_toogle_off"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:src="@drawable/security_toogle_icon_grey" />
+                    android:src="@drawable/security_toogle_icon_grey"/>
 
                 <Switch
                     android:id="@+id/security_toogle"
@@ -52,7 +53,7 @@
                     android:textOff=""
                     android:textOn=""
                     android:thumb="@drawable/security_switch_thumb"
-                    android:track="@drawable/security_switch_track" />
+                    android:track="@drawable/security_switch_track"/>
 
                 <ImageView
                     android:id="@+id/security_toogle_on"
@@ -72,7 +73,7 @@
                     android:id="@+id/all_contacts"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_all_contacts"
                     android:padding="15dp"
                     android:src="@drawable/contacts_all" />
@@ -95,7 +96,7 @@
                     android:id="@+id/linphone_contacts"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_linphone_contacts"
                     android:gravity="center"
                     android:padding="15dp"
@@ -116,7 +117,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
                 android:layout_weight="1"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_valid"
                 android:padding="18dp"
                 android:src="@drawable/chat_room_creation_next"
@@ -151,7 +152,7 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginTop="5dp"
-            android:background="@drawable/resizable_textfield"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:fadeScrollbars="false"
             android:lines="1">
 
@@ -164,6 +165,7 @@
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
                 android:scrollIndicators="bottom" />
+
         </HorizontalScrollView>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/chat_device_group.xml b/app/src/main/res/layout/chat_device_group.xml
index 83155d95b..d4ad560ed 100644
--- a/app/src/main/res/layout/chat_device_group.xml
+++ b/app/src/main/res/layout/chat_device_group.xml
@@ -44,7 +44,8 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="10dp"
-            android:src="@drawable/chevron_list_close" />
+            android:src="@drawable/chevron_list_close"
+            android:tint="?attr/drawableDarkModeTintColor"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_devices.xml b/app/src/main/res/layout/chat_devices.xml
index 4eeca886e..b2e0d446c 100644
--- a/app/src/main/res/layout/chat_devices.xml
+++ b/app/src/main/res/layout/chat_devices.xml
@@ -21,30 +21,24 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <TextView
                 android:id="@+id/title"
                 style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="0.6"
+                android:layout_weight="0.8"
                 android:ellipsize="marquee"
                 android:gravity="center"
                 android:padding="15dp"
                 android:singleLine="true"
                 android:text="@string/group_chat_room_devices" />
 
-            <ImageView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="15dp"
-                android:visibility="invisible" />
-
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/chat_imdn.xml b/app/src/main/res/layout/chat_imdn.xml
index 437efcf2d..65571ea10 100644
--- a/app/src/main/res/layout/chat_imdn.xml
+++ b/app/src/main/res/layout/chat_imdn.xml
@@ -21,7 +21,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
                 android:src="@drawable/back" />
diff --git a/app/src/main/res/layout/chat_imdn_old.xml b/app/src/main/res/layout/chat_imdn_old.xml
index cb3726b8f..5f9272507 100644
--- a/app/src/main/res/layout/chat_imdn_old.xml
+++ b/app/src/main/res/layout/chat_imdn_old.xml
@@ -21,7 +21,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
                 android:src="@drawable/back" />
diff --git a/app/src/main/res/layout/chat_infos.xml b/app/src/main/res/layout/chat_infos.xml
index fa22299c7..116d6f3dd 100644
--- a/app/src/main/res/layout/chat_infos.xml
+++ b/app/src/main/res/layout/chat_infos.xml
@@ -22,10 +22,11 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="left"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <TextView
                 style="@style/toolbar_small_title_font"
@@ -43,10 +44,11 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_valid"
                 android:padding="18dp"
-                android:src="@drawable/chat_room_creation_confirm" />
+                android:src="@drawable/chat_room_creation_confirm"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
         </LinearLayout>
 
@@ -75,7 +77,7 @@
             android:id="@+id/addParticipantsLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorG"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:paddingTop="8dp"
             android:paddingBottom="8dp">
 
@@ -84,7 +86,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/chat_room_participants"
-                android:textColor="@color/colorB"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="15sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/chatlist.xml b/app/src/main/res/layout/chatlist.xml
index 00e8522cf..177637931 100644
--- a/app/src/main/res/layout/chatlist.xml
+++ b/app/src/main/res/layout/chatlist.xml
@@ -21,30 +21,33 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_new_discussion"
                 android:padding="15dp"
-                android:src="@drawable/chat_new" />
+                android:src="@drawable/chat_new"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <ImageView
                 android:id="@+id/new_group_discussion"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_new_discussion"
                 android:padding="15dp"
-                android:src="@drawable/chat_group_new" />
+                android:src="@drawable/chat_group_new"
+                android:tint="?attr/drawableDarkModeTintColor"/>
 
             <ImageView
                 android:id="@+id/back_in_call"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back_call"
                 android:padding="15dp"
                 android:src="@drawable/call_back"
+                android:tint="?attr/drawableDarkModeTintColor"
                 android:visibility="invisible" />
 
             <View
@@ -57,10 +60,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_edit_list"
                 android:padding="15dp"
-                android:src="@drawable/delete" />
+                android:src="@drawable/delete"
+                android:tint="?attr/drawableDarkModeTintColor" />
         </LinearLayout>
 
         <include layout="@layout/edit_list" />
diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml
index 23f80887d..0a5095095 100644
--- a/app/src/main/res/layout/contact.xml
+++ b/app/src/main/res/layout/contact.xml
@@ -20,10 +20,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <View
                 android:layout_width="0dp"
@@ -35,7 +36,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_delete"
                 android:padding="15dp"
                 android:src="@drawable/delete" />
@@ -45,10 +46,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_edit"
                 android:padding="15dp"
-                android:src="@drawable/edit" />
+                android:src="@drawable/edit"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index 114d3efd9..e332d0bf8 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -16,10 +16,11 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_cancel_button"
             android:padding="15dp"
-            android:src="@drawable/cancel_edit" />
+            android:src="@drawable/cancel_edit"
+            android:tint="?attr/drawableDarkModeTintColor" />
 
         <View
             android:layout_width="0dp"
@@ -31,7 +32,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_delete"
             android:padding="15dp"
             android:src="@drawable/delete" />
@@ -41,10 +42,11 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_valid"
             android:padding="18dp"
-            android:src="@drawable/valid" />
+            android:src="@drawable/valid"
+            android:tint="?attr/drawableDarkModeTintColor" />
 
     </LinearLayout>
 
@@ -73,24 +75,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center">
 
-                    <ImageView
-                        android:id="@+id/contact_picture"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginLeft="5dp"
-                        android:adjustViewBounds="true"
-                        android:contentDescription="@string/content_description_contact_picture"
-                        android:src="@drawable/avatar" />
-
-                    <ImageView
-                        android:id="@+id/mask"
-                        android:layout_width="100dp"
-                        android:layout_height="100dp"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginLeft="5dp"
-                        android:adjustViewBounds="true"
-                        android:src="@drawable/avatar_mask" />
+                    <include layout="@layout/contact_avatar_big" />
 
                 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/contacts_list.xml b/app/src/main/res/layout/contacts_list.xml
index 719ecd589..850a9851b 100644
--- a/app/src/main/res/layout/contacts_list.xml
+++ b/app/src/main/res/layout/contacts_list.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/all_contacts"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_all_contacts"
                 android:padding="15dp"
                 android:src="@drawable/contacts_all" />
@@ -44,7 +44,7 @@
                 android:id="@+id/linphone_contacts"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_linphone_contacts"
                 android:gravity="center"
                 android:padding="15dp"
@@ -69,7 +69,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_new_contact"
             android:padding="15dp"
             android:src="@drawable/contact_add" />
@@ -79,7 +79,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_edit_list"
             android:padding="15dp"
             android:src="@drawable/delete" />
@@ -103,8 +103,7 @@
             android:inputType="textPersonName"
             android:paddingRight="5dp"
             android:queryBackground="@android:color/transparent"
-            android:queryHint="@string/chat_room_creation_filter_hint"
-            android:textColor="@color/colorC" />
+            android:queryHint="@string/chat_room_creation_filter_hint"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/dialer.xml b/app/src/main/res/layout/dialer.xml
index f48e99dab..d918f8cc3 100644
--- a/app/src/main/res/layout/dialer.xml
+++ b/app/src/main/res/layout/dialer.xml
@@ -76,7 +76,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_add_contact"
                 android:padding="15dp"
                 android:src="@drawable/contact_add" />
diff --git a/app/src/main/res/layout/edit_list.xml b/app/src/main/res/layout/edit_list.xml
index 75e94e6aa..292407729 100644
--- a/app/src/main/res/layout/edit_list.xml
+++ b/app/src/main/res/layout/edit_list.xml
@@ -12,10 +12,11 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.2"
-        android:background="@drawable/toolbar_button"
+        android:background="?attr/button_background_drawable"
         android:contentDescription="@string/content_description_cancel_button"
         android:padding="15dp"
-        android:src="@drawable/cancel_edit" />
+        android:src="@drawable/cancel_edit"
+        android:tint="?attr/drawableDarkModeTintColor" />
 
     <View
         android:layout_width="0dp"
@@ -27,20 +28,22 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.2"
-        android:background="@drawable/toolbar_button"
+        android:background="?attr/button_background_drawable"
         android:contentDescription="@string/content_description_select_all"
         android:padding="15dp"
-        android:src="@drawable/select_all" />
+        android:src="@drawable/select_all"
+        android:tint="?attr/drawableDarkModeTintColor" />
 
     <ImageView
         android:id="@+id/deselect_all"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.2"
-        android:background="@drawable/toolbar_button"
+        android:background="?attr/button_background_drawable"
         android:contentDescription="@string/content_description_deselect_all"
         android:padding="15dp"
         android:src="@drawable/deselect_all"
+        android:tint="?attr/drawableDarkModeTintColor"
         android:visibility="gone" />
 
     <ImageView
@@ -48,7 +51,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.2"
-        android:background="@drawable/toolbar_button"
+        android:background="?attr/button_background_drawable"
         android:contentDescription="@string/content_description_delete_selection"
         android:padding="15dp"
         android:src="@drawable/delete" />
diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
index 15b455906..8715a3fc9 100644
--- a/app/src/main/res/layout/history.xml
+++ b/app/src/main/res/layout/history.xml
@@ -25,7 +25,7 @@
                     android:id="@+id/all_calls"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_all_contacts"
                     android:padding="15dp"
                     android:src="@drawable/history_all" />
@@ -48,7 +48,7 @@
                     android:id="@+id/missed_calls"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_linphone_contacts"
                     android:gravity="center"
                     android:padding="15dp"
@@ -73,7 +73,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_edit_list"
                 android:padding="15dp"
                 android:src="@drawable/delete" />
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index 64b7bfb90..81e8ef756 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -21,10 +21,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_back"
                 android:padding="18dp"
-                android:src="@drawable/back" />
+                android:src="@drawable/back"
+                android:tint="?attr/drawableDarkModeTintColor" />
 
             <View
                 android:layout_width="0dp"
@@ -36,7 +37,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_add_contact"
                 android:padding="15dp"
                 android:src="@drawable/contact_add" />
@@ -46,10 +47,11 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
+                android:background="?attr/button_background_drawable"
                 android:contentDescription="@string/content_description_contacts"
                 android:padding="15dp"
                 android:src="@drawable/contact"
+                android:tint="?attr/drawableDarkModeTintColor"
                 android:visibility="gone" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/in_app.xml b/app/src/main/res/layout/in_app.xml
index 20985ca96..b8db11430 100644
--- a/app/src/main/res/layout/in_app.xml
+++ b/app/src/main/res/layout/in_app.xml
@@ -27,7 +27,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_back"
             android:padding="18dp"
             android:src="@drawable/back" />
@@ -45,7 +45,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_dialer_back"
             android:padding="15dp"
             android:src="@drawable/dialer_back" />
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 9acaf7dd1..71d333241 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -34,10 +34,11 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.2"
-                    android:background="@drawable/toolbar_button"
+                    android:background="?attr/button_background_drawable"
                     android:contentDescription="@string/content_description_dialer_back"
                     android:padding="18dp"
-                    android:src="@drawable/back" />
+                    android:src="@drawable/back"
+                    android:tint="?attr/drawableDarkModeTintColor" />
 
                 <TextView
                     android:id="@+id/top_bar_title"
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index 9375bc5bb..eef2a1c59 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -17,10 +17,11 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_back"
             android:padding="18dp"
-            android:src="@drawable/back" />
+            android:src="@drawable/back"
+            android:tint="?attr/drawableDarkModeTintColor" />
 
         <TextView
             android:id="@+id/top_bar_title"
@@ -38,7 +39,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
+            android:background="?attr/button_background_drawable"
             android:contentDescription="@string/content_description_edit_list"
             android:padding="15dp"
             android:src="@drawable/delete" />
diff --git a/app/src/main/res/layout/side_menu_account_cell.xml b/app/src/main/res/layout/side_menu_account_cell.xml
index c06be0ae5..2e818ae7d 100644
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ b/app/src/main/res/layout/side_menu_account_cell.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="35dp"
-    android:background="@color/colorG"
+    android:background="?attr/backgroundColor"
     android:gravity="center">
 
     <TextView
@@ -25,5 +25,7 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?attr/backgroundColor" />
+        android:layout_alignParentBottom="true"
+        android:background="?attr/dividerColor" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/side_menu_item_cell.xml b/app/src/main/res/layout/side_menu_item_cell.xml
index 2e7331389..1e4789cb2 100644
--- a/app/src/main/res/layout/side_menu_item_cell.xml
+++ b/app/src/main/res/layout/side_menu_item_cell.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="45dp">
diff --git a/app/src/main/res/layout/side_menu_main_account.xml b/app/src/main/res/layout/side_menu_main_account.xml
index 0ed0c7e08..f25d35318 100644
--- a/app/src/main/res/layout/side_menu_main_account.xml
+++ b/app/src/main/res/layout/side_menu_main_account.xml
@@ -6,20 +6,11 @@
     android:background="?attr/lighToolbarBackgroundColor"
     android:contentDescription="@string/content_description_default_account">
 
-    <ImageView
-        android:id="@+id/main_account_avatar"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:src="@drawable/avatar" />
-
     <LinearLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_toRightOf="@+id/main_account_avatar"
+        android:layout_marginLeft="10dp"
         android:gravity="center_vertical"
         android:orientation="vertical">
 
@@ -47,4 +38,10 @@
         android:padding="5dp"
         android:src="@drawable/led_connected" />
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="?attr/dividerColor" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index dda4b954b..8148f1abd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,5 +18,6 @@
         <attr name="lighToolbarTextColor" format="color"/>
         <attr name="darkToolbarBackgroundColor" format="color"/>
         <attr name="darkToolbarTextColor" format="color"/>
+        <attr name="button_background_drawable" format="reference" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1b0eb5b31..c82f09b0d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,6 +2,14 @@
 <resources>
 
     <style name="LinphoneStyleLight" parent="Theme.AppCompat.NoActionBar">
+        <!-- Android theme override -->
+        <item name="colorAccent">@color/colorA</item>
+        <item name="android:textColorPrimary">@color/colorC</item>
+        <item name="android:textColorSecondary">@color/colorH</item>
+        <item name="android:textColorHint">@color/colorE</item>
+        <item name="android:colorBackground">@color/colorH</item>
+        <item name="android:textColorPrimaryInverse">@color/colorH</item>
+
         <item name="accentColor">@color/colorA</item>
         <item name="accentTextColor">@color/colorH</item>
         <item name="primaryTextColor">@color/colorC</item>
@@ -19,9 +27,17 @@
         <item name="lighToolbarTextColor">@color/colorC</item>
         <item name="darkToolbarBackgroundColor">@color/colorC</item>
         <item name="darkToolbarTextColor">@color/colorH</item>
+        <item name="button_background_drawable">@drawable/button_background_light</item>
     </style>
 
-    <style name="LinphoneStyleDark" parent="Theme.AppCompat.NoActionBar">
+    <style name="LinphoneStyleDark" parent="LinphoneStyleLight">
+        <!-- Android theme override -->
+        <item name="android:textColorPrimary">@color/colorH</item>
+        <item name="android:textColorSecondary">@color/colorC</item>
+        <item name="android:textColorHint">@color/colorF</item>
+        <item name="android:colorBackground">@color/colorC</item>
+        <item name="android:textColorPrimaryInverse">@color/colorC</item>
+
         <item name="accentColor">@color/colorA</item>
         <item name="accentTextColor">@color/colorH</item>
         <item name="primaryTextColor">@color/colorH</item>
@@ -32,15 +48,15 @@
         <item name="drawableDarkModeTintColor">@color/colorH</item>
 
         <!-- Same value for now -->
-        <item name="dividerColor">@color/colorE</item>
-        <item name="drawableTintColor">@color/colorC</item>
-        <item name="drawableTintDisabledColor">@color/colorDisabled</item>
+        <item name="drawableTintColor">@color/colorH</item>
+        <item name="drawableTintDisabledColor">@color/colorE</item>
         <item name="drawableTintOverColor">@color/colorA</item>
-        <item name="lighToolbarBackgroundColor">@color/colorF</item>
+        <item name="lighToolbarBackgroundColor">@color/colorC</item>
         <item name="lighToolbarBackgroundDisabledColor">@color/colorE</item>
-        <item name="lighToolbarTextColor">@color/colorC</item>
+        <item name="lighToolbarTextColor">@color/colorH</item>
         <item name="darkToolbarBackgroundColor">@color/colorC</item>
         <item name="darkToolbarTextColor">@color/colorH</item>
+        <item name="button_background_drawable">@drawable/button_background_dark</item>
     </style>
 
     <style name="main_account_font" parent="@android:style/TextAppearance.Medium">
@@ -84,7 +100,7 @@
     </style>
 
     <style name="toolbar_small_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">18sp</item>
     </style>
 
@@ -146,7 +162,7 @@
     </style>
 
     <style name="font13" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorE</item>
+        <item name="android:textColor">?attr/primarySubtextLightColor</item>
         <item name="android:textSize">13sp</item>
     </style>