diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 949e6c1cf..ea2f2e74b 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,7 +67,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:noHistory="true"
-            android:theme="@style/NoTitle"
+            android:theme="@style/LinphoneStyleLight"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -125,7 +125,7 @@
         <activity
             android:name=".LinphoneActivity"
             android:launchMode="singleTask"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -134,7 +134,7 @@
             android:name=".call.CallIncomingActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -143,7 +143,7 @@
             android:name=".call.CallOutgoingActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -152,7 +152,7 @@
             android:name=".call.CallActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/FullScreen">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -168,7 +168,7 @@
         <activity
             android:name=".assistant.AssistantActivity"
             android:screenOrientation="behind"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -176,7 +176,7 @@
         <activity
             android:name=".purchase.InAppPurchaseActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -184,7 +184,7 @@
         <activity
             android:name=".assistant.RemoteProvisioningLoginActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -192,7 +192,7 @@
         <activity
             android:name=".assistant.RemoteProvisioningActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index c7b490e9a..864e4ae58 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
@@ -80,8 +79,9 @@ import org.linphone.mediastream.Version;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.settings.LinphonePreferences.AccountBuilder;
 import org.linphone.utils.LinphoneUtils;
+import org.linphone.utils.ThemableActivity;
 
-public class AssistantActivity extends Activity
+public class AssistantActivity extends ThemableActivity
         implements OnClickListener,
                 ActivityCompat.OnRequestPermissionsResultCallback,
                 AccountCreatorListener {
@@ -673,7 +673,7 @@ public class AssistantActivity extends Activity
                             WindowManager.LayoutParams.MATCH_PARENT,
                             WindowManager.LayoutParams.MATCH_PARENT);
             mProgress.getWindow().setBackgroundDrawable(d);
-            mProgress.setContentView(R.layout.progress_dialog);
+            mProgress.setContentView(R.layout.wait_layout);
             mProgress.show();
         }
     }
@@ -690,7 +690,7 @@ public class AssistantActivity extends Activity
                         WindowManager.LayoutParams.MATCH_PARENT,
                         WindowManager.LayoutParams.MATCH_PARENT);
         mProgress.getWindow().setBackgroundDrawable(d);
-        mProgress.setContentView(R.layout.progress_dialog);
+        mProgress.setContentView(R.layout.wait_layout);
         mProgress.show();
     }
 
diff --git a/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java b/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
index 3db01412a..1660f1757 100644
--- a/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
+++ b/app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java
@@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -39,8 +38,9 @@ import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
+import org.linphone.utils.ThemableActivity;
 
-public class RemoteProvisioningActivity extends Activity {
+public class RemoteProvisioningActivity extends ThemableActivity {
     private final Handler mHandler = new Handler();
     private String mConfigUriParam = null;
     private ProgressBar mSpinner;
diff --git a/app/src/main/java/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/app/src/main/java/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index 5429c7698..0869985a3 100644
--- a/app/src/main/java/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/app/src/main/java/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -31,10 +31,11 @@ import org.linphone.core.ConfiguringState;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.settings.LinphonePreferences;
+import org.linphone.utils.ThemableActivity;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
 
-public class RemoteProvisioningLoginActivity extends Activity implements OnClickListener {
+public class RemoteProvisioningLoginActivity extends ThemableActivity implements OnClickListener {
     private EditText mLogin, mPassword, mDomain;
     private Button mConnect;
     private CoreListenerStub mListener;
diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java
index 5ad2898a9..fb0fa586d 100644
--- a/app/src/main/java/org/linphone/call/CallActivity.java
+++ b/app/src/main/java/org/linphone/call/CallActivity.java
@@ -684,8 +684,7 @@ public class CallActivity extends LinphoneGenericActivity
                 !LinphoneManager.getLc().soundResourcesLocked()
                         && currentCall != null
                         && currentCall.getCurrentParams().getRecordFile() != null);
-        mRecordCall.setImageResource(
-                mIsRecording ? R.drawable.options_rec_selected : R.drawable.options_rec_default);
+        mRecordCall.setSelected(mIsRecording);
 
         mRecording.setEnabled(mIsRecording);
         mRecording.setVisibility(mIsRecording ? View.VISIBLE : View.GONE);
@@ -823,8 +822,7 @@ public class CallActivity extends LinphoneGenericActivity
         if (enable && !mIsRecording) {
             call.startRecording();
             Log.d("start call mRecording");
-
-            mRecordCall.setImageResource(R.drawable.options_rec_selected);
+            mRecordCall.setSelected(true);
 
             mRecording.setVisibility(View.VISIBLE);
             mRecording.setEnabled(true);
@@ -833,8 +831,7 @@ public class CallActivity extends LinphoneGenericActivity
         } else if (!enable && mIsRecording) {
             call.stopRecording();
             Log.d("stop call mRecording");
-
-            mRecordCall.setImageResource(R.drawable.options_rec_default);
+            mRecordCall.setSelected(false);
 
             mRecording.setVisibility(View.GONE);
             mRecording.setEnabled(false);
diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
index 834a71847..0b7914618 100644
--- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
@@ -216,20 +216,12 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
 
         if (id == R.id.micro) {
             mIsMicMuted = !mIsMicMuted;
-            if (mIsMicMuted) {
-                mMicro.setImageResource(R.drawable.micro_selected);
-            } else {
-                mMicro.setImageResource(R.drawable.micro_default);
-            }
+            mMicro.setSelected(mIsMicMuted);
             LinphoneManager.getLc().enableMic(!mIsMicMuted);
         }
         if (id == R.id.speaker) {
             mIsSpeakerEnabled = !mIsSpeakerEnabled;
-            if (mIsSpeakerEnabled) {
-                mSpeaker.setImageResource(R.drawable.route_speaker_selected);
-            } else {
-                mSpeaker.setImageResource(R.drawable.route_speaker_default);
-            }
+            mSpeaker.setSelected(mIsSpeakerEnabled);
             LinphoneManager.getInstance().enableSpeaker(mIsSpeakerEnabled);
         }
         if (id == R.id.outgoing_hang_up) {
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
index 0e7d2f32e..9a53e8845 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
@@ -260,8 +260,7 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                         holder.fileTransferAction, mContext, R.style.font15);
                 holder.fileTransferAction.setBackgroundResource(
                         R.drawable.resizable_confirm_delete_button);
-                ContactAvatar.setAvatarMask(
-                        holder.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
+                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
             } else {
                 for (LinphoneContact c : mParticipants) {
                     if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
@@ -287,11 +286,12 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                 }
 
                 holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-                Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
+                Compatibility.setTextAppearance(
+                        holder.contactName, mContext, R.style.contact_organization_font);
                 Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
                 holder.fileTransferAction.setBackgroundResource(
                         R.drawable.resizable_assistant_button);
-                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_chat_mask);
+                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
             }
 
             if (contact == null) {
diff --git a/app/src/main/java/org/linphone/chat/ImdnOldFragment.java b/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
index 7ee26e190..35b8cbe5b 100644
--- a/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
+++ b/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
@@ -151,11 +151,12 @@ public class ImdnOldFragment extends Fragment {
             ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
         } else {
             mBubble.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-            Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font9);
+            Compatibility.setTextAppearance(
+                    mBubble.contactName, getActivity(), R.style.contact_organization_font);
             Compatibility.setTextAppearance(
                     mBubble.fileTransferAction, getActivity(), R.style.font8);
             mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
-            ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask);
+            ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_mask);
         }
 
         return view;
diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index dd411448f..98393916e 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -120,7 +120,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
                         WindowManager.LayoutParams.MATCH_PARENT,
                         WindowManager.LayoutParams.MATCH_PARENT);
         mProgress.getWindow().setBackgroundDrawable(d);
-        mProgress.setContentView(R.layout.progress_dialog);
+        mProgress.setContentView(R.layout.wait_layout);
         mProgress.show();
     }
 
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index b02b547ad..f4b84230d 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -1431,6 +1431,17 @@ public class LinphonePreferences {
         getConfig().setBool("app", "android_power_saver_dialog", b);
     }
 
+    public boolean isDarkModeEnabled() {
+        return /*AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
+               && */ getConfig().getBool("app", "dark_mode", false);
+    }
+
+    public void enableDarkMode(boolean enable) {
+        /*AppCompatDelegate.setDefaultNightMode(
+        enable ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);*/
+        getConfig().setBool("app", "dark_mode", enable);
+    }
+
     public static class AccountBuilder {
         private final Core lc;
         private String tempUsername;
diff --git a/app/src/main/java/org/linphone/settings/SettingsFragment.java b/app/src/main/java/org/linphone/settings/SettingsFragment.java
index 0c63f47a5..fb0acdac1 100644
--- a/app/src/main/java/org/linphone/settings/SettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/SettingsFragment.java
@@ -1689,6 +1689,8 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void initAdvancedSettings() {
+        ((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
+                .setChecked(mPrefs.isDarkModeEnabled());
         ((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key)))
                 .setChecked(mPrefs.isFriendlistsubscriptionEnabled());
         ((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key)))
@@ -1710,6 +1712,23 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void setAdvancedPreferencesListener() {
+        findPreference(getString(R.string.pref_dark_mode_key))
+                .setOnPreferenceChangeListener(
+                        new OnPreferenceChangeListener() {
+                            @Override
+                            public boolean onPreferenceChange(
+                                    Preference preference, Object newValue) {
+                                boolean value = (Boolean) newValue;
+                                mPrefs.enableDarkMode(value);
+                                if (value) {
+                                    LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
+                                } else {
+                                    LinphoneActivity.instance()
+                                            .setTheme(R.style.LinphoneStyleLight);
+                                }
+                                return true;
+                            }
+                        });
 
         findPreference(getString(R.string.pref_friendlist_subscribe_key))
                 .setOnPreferenceChangeListener(
diff --git a/app/src/main/java/org/linphone/utils/LinphoneGenericActivity.java b/app/src/main/java/org/linphone/utils/LinphoneGenericActivity.java
index 842a928f1..73925d363 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneGenericActivity.java
+++ b/app/src/main/java/org/linphone/utils/LinphoneGenericActivity.java
@@ -19,13 +19,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-import android.app.Activity;
 import android.os.Bundle;
 import org.linphone.LinphoneLauncherActivity;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 
-public class LinphoneGenericActivity extends Activity {
+public class LinphoneGenericActivity extends ThemableActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/linphone/utils/ThemableActivity.java b/app/src/main/java/org/linphone/utils/ThemableActivity.java
new file mode 100644
index 000000000..871607a51
--- /dev/null
+++ b/app/src/main/java/org/linphone/utils/ThemableActivity.java
@@ -0,0 +1,37 @@
+package org.linphone.utils;
+
+/*
+ThemableActivity.java
+Copyright (C) 2019 Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import org.linphone.R;
+import org.linphone.settings.LinphonePreferences;
+
+public class ThemableActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        if (LinphonePreferences.instance().isDarkModeEnabled()) {
+            setTheme(R.style.LinphoneStyleDark);
+        }
+
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/app/src/main/java/org/linphone/views/EraseButton.java b/app/src/main/java/org/linphone/views/EraseButton.java
index d6f0c7ce7..0d73d0e94 100644
--- a/app/src/main/java/org/linphone/views/EraseButton.java
+++ b/app/src/main/java/org/linphone/views/EraseButton.java
@@ -36,6 +36,7 @@ public class EraseButton extends ImageView
 
     public EraseButton(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setEnabled(false);
         setOnClickListener(this);
         setOnLongClickListener(this);
     }
@@ -50,6 +51,7 @@ public class EraseButton extends ImageView
                 mAddress.getEditableText().delete(lBegin - 1, lBegin);
             }
         }
+        setEnabled(mAddress.getText().length() > 0);
     }
 
     public boolean onLongClick(View v) {
diff --git a/app/src/main/res/drawable-xhdpi/avatar_chat_mask.png b/app/src/main/res/drawable-xhdpi/avatar_chat_mask.png
deleted file mode 100644
index 43d40040e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/avatar_chat_mask.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/backspace_disabled.png b/app/src/main/res/drawable-xhdpi/backspace_disabled.png
deleted file mode 100644
index 9895301ce..000000000
Binary files a/app/src/main/res/drawable-xhdpi/backspace_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/backspace_over.png b/app/src/main/res/drawable-xhdpi/backspace_over.png
deleted file mode 100644
index 5d3d2bdfe..000000000
Binary files a/app/src/main/res/drawable-xhdpi/backspace_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/camera_disabled.png b/app/src/main/res/drawable-xhdpi/camera_disabled.png
deleted file mode 100644
index 0fa899521..000000000
Binary files a/app/src/main/res/drawable-xhdpi/camera_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/camera_selected.png b/app/src/main/res/drawable-xhdpi/camera_selected.png
deleted file mode 100644
index 4d3664d84..000000000
Binary files a/app/src/main/res/drawable-xhdpi/camera_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat_group_informations_disabled.png b/app/src/main/res/drawable-xhdpi/chat_group_informations_disabled.png
deleted file mode 100644
index 2f699cf12..000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat_group_informations_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contact_add_disabled.png b/app/src/main/res/drawable-xhdpi/contact_add_disabled.png
deleted file mode 100644
index 2be5d9cc9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contact_add_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contacts_all_selected.png b/app/src/main/res/drawable-xhdpi/contacts_all_selected.png
deleted file mode 100644
index 382793626..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contacts_all_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/contacts_sip_selected.png b/app/src/main/res/drawable-xhdpi/contacts_sip_selected.png
deleted file mode 100644
index e00dee6a1..000000000
Binary files a/app/src/main/res/drawable-xhdpi/contacts_sip_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/delete_disabled.png b/app/src/main/res/drawable-xhdpi/delete_disabled.png
deleted file mode 100644
index ce7025092..000000000
Binary files a/app/src/main/res/drawable-xhdpi/delete_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/edit_list_disabled.png b/app/src/main/res/drawable-xhdpi/edit_list_disabled.png
deleted file mode 100644
index 4817a6b0a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/edit_list_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/history_all_selected.png b/app/src/main/res/drawable-xhdpi/history_all_selected.png
deleted file mode 100644
index cf4a2293a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/history_all_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/history_missed_selected.png b/app/src/main/res/drawable-xhdpi/history_missed_selected.png
deleted file mode 100644
index f7d893608..000000000
Binary files a/app/src/main/res/drawable-xhdpi/history_missed_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/micro_selected.png b/app/src/main/res/drawable-xhdpi/micro_selected.png
deleted file mode 100644
index 065a417f8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/micro_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/next_disabled.png b/app/src/main/res/drawable-xhdpi/next_disabled.png
deleted file mode 100644
index 0f6ae047a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/next_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_0_over.png b/app/src/main/res/drawable-xhdpi/numpad_0_over.png
deleted file mode 100644
index 305b4bb8b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_0_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_1_over.png b/app/src/main/res/drawable-xhdpi/numpad_1_over.png
deleted file mode 100644
index d45557431..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_1_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_2_over.png b/app/src/main/res/drawable-xhdpi/numpad_2_over.png
deleted file mode 100644
index c20a6b0fb..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_2_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_3_over.png b/app/src/main/res/drawable-xhdpi/numpad_3_over.png
deleted file mode 100644
index fc9471697..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_3_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_4_over.png b/app/src/main/res/drawable-xhdpi/numpad_4_over.png
deleted file mode 100644
index b7600314c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_4_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_5_over.png b/app/src/main/res/drawable-xhdpi/numpad_5_over.png
deleted file mode 100644
index e90b11bd7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_5_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_6_over.png b/app/src/main/res/drawable-xhdpi/numpad_6_over.png
deleted file mode 100644
index a3f840217..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_6_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_7_over.png b/app/src/main/res/drawable-xhdpi/numpad_7_over.png
deleted file mode 100644
index 6d071f7ec..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_7_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_8_over.png b/app/src/main/res/drawable-xhdpi/numpad_8_over.png
deleted file mode 100644
index 37b47df28..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_8_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_9_over.png b/app/src/main/res/drawable-xhdpi/numpad_9_over.png
deleted file mode 100644
index ffce7c1af..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_9_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_hash_over.png b/app/src/main/res/drawable-xhdpi/numpad_hash_over.png
deleted file mode 100644
index 0d4858fe7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_hash_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/numpad_star_over.png b/app/src/main/res/drawable-xhdpi/numpad_star_over.png
deleted file mode 100644
index a73206aca..000000000
Binary files a/app/src/main/res/drawable-xhdpi/numpad_star_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/options_add_call_disabled.png b/app/src/main/res/drawable-xhdpi/options_add_call_disabled.png
deleted file mode 100644
index 82a0e832e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/options_add_call_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/options_rec_selected.png b/app/src/main/res/drawable-xhdpi/options_rec_selected.png
deleted file mode 100644
index 0ef1ca322..000000000
Binary files a/app/src/main/res/drawable-xhdpi/options_rec_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/options_selected.png b/app/src/main/res/drawable-xhdpi/options_selected.png
deleted file mode 100644
index 3123fcf77..000000000
Binary files a/app/src/main/res/drawable-xhdpi/options_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/options_start_conference_disabled.png b/app/src/main/res/drawable-xhdpi/options_start_conference_disabled.png
deleted file mode 100644
index 468dc128d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/options_start_conference_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/options_transfer_call_disabled.png b/app/src/main/res/drawable-xhdpi/options_transfer_call_disabled.png
deleted file mode 100644
index bbb11170b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/options_transfer_call_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/recording.png b/app/src/main/res/drawable-xhdpi/recording.png
deleted file mode 100644
index fb4e82669..000000000
Binary files a/app/src/main/res/drawable-xhdpi/recording.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/route_bluetooth_selected.png b/app/src/main/res/drawable-xhdpi/route_bluetooth_selected.png
deleted file mode 100644
index 2ece4746e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/route_bluetooth_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/route_earpiece_selected.png b/app/src/main/res/drawable-xhdpi/route_earpiece_selected.png
deleted file mode 100644
index 8d85693f8..000000000
Binary files a/app/src/main/res/drawable-xhdpi/route_earpiece_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/route_speaker_selected.png b/app/src/main/res/drawable-xhdpi/route_speaker_selected.png
deleted file mode 100644
index 3ea594615..000000000
Binary files a/app/src/main/res/drawable-xhdpi/route_speaker_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/routes_selected.png b/app/src/main/res/drawable-xhdpi/routes_selected.png
deleted file mode 100644
index e31599672..000000000
Binary files a/app/src/main/res/drawable-xhdpi/routes_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable/backspace.xml b/app/src/main/res/drawable/backspace.xml
index e5209e310..70117222f 100644
--- a/app/src/main/res/drawable/backspace.xml
+++ b/app/src/main/res/drawable/backspace.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/backspace_over" />
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/backspace_disabled" />
-    <item
-         android:drawable="@drawable/backspace_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/backspace_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/backspace_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/backspace_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
index 2a0ff0c72..c33946ec4 100644
--- a/app/src/main/res/drawable/button_background.xml
+++ b/app/src/main/res/drawable/button_background.xml
@@ -1,9 +1,9 @@
 <?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" />
+		android:drawable="@color/colorE" />
 	<item android:state_enabled="false"
-		  android:drawable="@color/colorF" />
+		android:drawable="@color/colorF" />
 	<item
 		android:drawable="@color/colorF" />
 </selector>
diff --git a/app/src/main/res/drawable/camera.xml b/app/src/main/res/drawable/camera.xml
index cedc0ed7f..afd4a7e38 100644
--- a/app/src/main/res/drawable/camera.xml
+++ b/app/src/main/res/drawable/camera.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/camera_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/camera_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/camera_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/camera_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/camera_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/camera_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/chat.xml b/app/src/main/res/drawable/chat.xml
deleted file mode 100644
index 525c33507..000000000
--- a/app/src/main/res/drawable/chat.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorA" android:state_pressed="true" />
-    <item android:drawable="@color/colorD" android:state_selected="true" />
-    <item android:drawable="@color/colorD" />
-</selector>
diff --git a/app/src/main/res/drawable/chat_group_informations.xml b/app/src/main/res/drawable/chat_group_informations.xml
index efd354b8c..96f25a4c2 100644
--- a/app/src/main/res/drawable/chat_group_informations.xml
+++ b/app/src/main/res/drawable/chat_group_informations.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/chat_group_informations_disabled" />
-    <item
-         android:drawable="@drawable/chat_group_informations_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/chat_room_creation_confirm.xml b/app/src/main/res/drawable/chat_room_creation_confirm.xml
index 43da7ea12..21fcf1005 100644
--- a/app/src/main/res/drawable/chat_room_creation_confirm.xml
+++ b/app/src/main/res/drawable/chat_room_creation_confirm.xml
@@ -3,6 +3,6 @@
     <item android:state_enabled="true" 
         android:drawable="@drawable/valid_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/valid_disabled" />
+        android:drawable="@drawable/valid_disabled" />
 </selector>
 
diff --git a/app/src/main/res/drawable/chat_room_creation_next.xml b/app/src/main/res/drawable/chat_room_creation_next.xml
index ccd3183a5..217470dae 100644
--- a/app/src/main/res/drawable/chat_room_creation_next.xml
+++ b/app/src/main/res/drawable/chat_room_creation_next.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/next" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/next_disabled" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/next"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/next"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/next"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/chat_room_group_infos.xml b/app/src/main/res/drawable/chat_room_group_infos.xml
index 018bdd84d..96f25a4c2 100644
--- a/app/src/main/res/drawable/chat_room_group_infos.xml
+++ b/app/src/main/res/drawable/chat_room_group_infos.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/chat_group_informations" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/chat_group_informations_disabled" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/chat_send_message.xml b/app/src/main/res/drawable/chat_send_message.xml
index 8cc2b9dc4..ff32a79f2 100644
--- a/app/src/main/res/drawable/chat_send_message.xml
+++ b/app/src/main/res/drawable/chat_send_message.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/chat_send_over" />
     <item
-         android:drawable="@drawable/chat_send_default" />
+        android:drawable="@drawable/chat_send_default" />
 </selector>
 
diff --git a/app/src/main/res/drawable/checkbox.xml b/app/src/main/res/drawable/checkbox.xml
index 8239dc456..accbf4d23 100644
--- a/app/src/main/res/drawable/checkbox.xml
+++ b/app/src/main/res/drawable/checkbox.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 	<item android:state_checked="false"
-		  android:drawable="@drawable/checkbox_unchecked"/>
+		android:drawable="@drawable/checkbox_unchecked"/>
 	<item android:state_checked="true"
-		  android:drawable="@drawable/checkbox_checked"/>
+		android:drawable="@drawable/checkbox_checked"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/clean_field.xml b/app/src/main/res/drawable/clean_field.xml
index 00b0bc086..dd9843324 100644
--- a/app/src/main/res/drawable/clean_field.xml
+++ b/app/src/main/res/drawable/clean_field.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-         android:drawable="@drawable/clean_field_over" />
+        android:drawable="@drawable/clean_field_over" />
     <item
         android:drawable="@drawable/clean_field_default" />
 </selector>
diff --git a/app/src/main/res/drawable/contact_add.xml b/app/src/main/res/drawable/contact_add.xml
index dc67799c5..d3e79717c 100644
--- a/app/src/main/res/drawable/contact_add.xml
+++ b/app/src/main/res/drawable/contact_add.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/contact_add_disabled" />
-	<item
-		android:drawable="@drawable/contact_add_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/contact_add_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contact_add_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contact_add_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/contacts_all.xml b/app/src/main/res/drawable/contacts_all.xml
index 5ec1f5aa4..b6ecf35ff 100644
--- a/app/src/main/res/drawable/contacts_all.xml
+++ b/app/src/main/res/drawable/contacts_all.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/contacts_all_selected" />
-    <item
-        android:drawable="@drawable/contacts_all_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/contacts_all_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contacts_all_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contacts_all_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/contacts_sip.xml b/app/src/main/res/drawable/contacts_sip.xml
index b70fb7c4c..33d9524f0 100644
--- a/app/src/main/res/drawable/contacts_sip.xml
+++ b/app/src/main/res/drawable/contacts_sip.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/contacts_sip_selected" />
-    <item
-        android:drawable="@drawable/contacts_sip_default" />
-</selector>
\ No newline at end of file
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/contacts_sip_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contacts_sip_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contacts_sip_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index a7d8a0b2f..a3000e1f3 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/delete_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/delete_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/delete_field.xml b/app/src/main/res/drawable/delete_field.xml
index 17252aad3..ab5826102 100644
--- a/app/src/main/res/drawable/delete_field.xml
+++ b/app/src/main/res/drawable/delete_field.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@drawable/delete_field_over" />
+		android:drawable="@drawable/delete_field_over" />
 	<item
 		android:drawable="@drawable/delete_field_default" />
 </selector>
diff --git a/app/src/main/res/drawable/edit_list.xml b/app/src/main/res/drawable/edit_list.xml
index dcd5230cc..fd959e163 100644
--- a/app/src/main/res/drawable/edit_list.xml
+++ b/app/src/main/res/drawable/edit_list.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/edit_list_disabled" />
-    <item
-         android:drawable="@drawable/edit_list_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/edit_list_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/edit_list_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/edit_list_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/event_decoration_gray.xml b/app/src/main/res/drawable/event_decoration_gray.xml
index e037f8225..626663ad7 100644
--- a/app/src/main/res/drawable/event_decoration_gray.xml
+++ b/app/src/main/res/drawable/event_decoration_gray.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke android:width="1dp" android:color="@color/colorE"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
+    <stroke android:width="1dp" android:color="?attr/dividerColor"/>
     <size android:height="1dp" android:width="50dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/footer_button.xml b/app/src/main/res/drawable/footer_button.xml
index a621e8f73..ff9921a98 100644
--- a/app/src/main/res/drawable/footer_button.xml
+++ b/app/src/main/res/drawable/footer_button.xml
@@ -1,10 +1,9 @@
 <?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/colorA" />
+		android:drawable="@color/colorA" />
 	<item android:state_selected="true"
-		  android:drawable="@color/colorC" />
-
+		android:drawable="@color/colorC" />
 	<item
 		android:drawable="@color/colorC" />
 </selector>
diff --git a/app/src/main/res/drawable/generated_avatar_bg.xml b/app/src/main/res/drawable/generated_avatar_bg.xml
index fc0aa3883..52d05a405 100644
--- a/app/src/main/res/drawable/generated_avatar_bg.xml
+++ b/app/src/main/res/drawable/generated_avatar_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorC"/>
+    <solid android:color="?attr/primaryTextColor"/>
     <size android:width="35dp" android:height="35dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/history_all.xml b/app/src/main/res/drawable/history_all.xml
index 21ae3a817..b3f33e5c1 100644
--- a/app/src/main/res/drawable/history_all.xml
+++ b/app/src/main/res/drawable/history_all.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/history_all_selected" />
-    <item
-        android:drawable="@drawable/history_all_default"/>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/history_all_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/history_all_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/history_all_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/history_missed.xml b/app/src/main/res/drawable/history_missed.xml
index 1521d4756..4a634f2ca 100644
--- a/app/src/main/res/drawable/history_missed.xml
+++ b/app/src/main/res/drawable/history_missed.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:drawable="@drawable/history_missed_selected" />
-    <item
-        android:drawable="@drawable/history_missed_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/history_missed_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/history_missed_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/history_missed_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/list_detail.xml b/app/src/main/res/drawable/list_detail.xml
index 90a37d7ef..1ca68cb09 100644
--- a/app/src/main/res/drawable/list_detail.xml
+++ b/app/src/main/res/drawable/list_detail.xml
@@ -3,5 +3,5 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/list_details_over" />
     <item
-         android:drawable="@drawable/list_details_default" />
+        android:drawable="@drawable/list_details_default" />
 </selector>
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
deleted file mode 100644
index a24232d1d..000000000
--- a/app/src/main/res/drawable/list_selector.xml
+++ /dev/null
@@ -1,8 +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/colorH" />
-    <item
-         android:drawable="@color/colorH" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/micro.xml b/app/src/main/res/drawable/micro.xml
index 7cc575277..888275bc4 100644
--- a/app/src/main/res/drawable/micro.xml
+++ b/app/src/main/res/drawable/micro.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/micro_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/micro_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/numpad_eight.xml b/app/src/main/res/drawable/numpad_eight.xml
index 0bc160196..de1aaefca 100644
--- a/app/src/main/res/drawable/numpad_eight.xml
+++ b/app/src/main/res/drawable/numpad_eight.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/numpad_8_over" />
-    <item
-         android:drawable="@drawable/numpad_8" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_8"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_8"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/numpad_five.xml b/app/src/main/res/drawable/numpad_five.xml
index 7b16e525c..3f87880ea 100644
--- a/app/src/main/res/drawable/numpad_five.xml
+++ b/app/src/main/res/drawable/numpad_five.xml
@@ -1,8 +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="@drawable/numpad_5_over" />
-    <item
-         android:drawable="@drawable/numpad_5" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_5"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_5"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_four.xml b/app/src/main/res/drawable/numpad_four.xml
index 0c58614bf..70eba49e7 100644
--- a/app/src/main/res/drawable/numpad_four.xml
+++ b/app/src/main/res/drawable/numpad_four.xml
@@ -1,8 +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="@drawable/numpad_4_over" />
-    <item
-         android:drawable="@drawable/numpad_4" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_4"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_4"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_nine.xml b/app/src/main/res/drawable/numpad_nine.xml
index 32059b5be..92369bcad 100644
--- a/app/src/main/res/drawable/numpad_nine.xml
+++ b/app/src/main/res/drawable/numpad_nine.xml
@@ -1,8 +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="@drawable/numpad_9_over" />
-    <item
-         android:drawable="@drawable/numpad_9" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_9"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_9"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_one.xml b/app/src/main/res/drawable/numpad_one.xml
index dc46fba4b..8ed31506a 100644
--- a/app/src/main/res/drawable/numpad_one.xml
+++ b/app/src/main/res/drawable/numpad_one.xml
@@ -1,8 +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="@drawable/numpad_1_over" />
-    <item
-         android:drawable="@drawable/numpad_1" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_1"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_1"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_seven.xml b/app/src/main/res/drawable/numpad_seven.xml
index 7f152177e..00a23694e 100644
--- a/app/src/main/res/drawable/numpad_seven.xml
+++ b/app/src/main/res/drawable/numpad_seven.xml
@@ -1,8 +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="@drawable/numpad_7_over" />
-    <item
-         android:drawable="@drawable/numpad_7" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_7"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_7"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_sharp.xml b/app/src/main/res/drawable/numpad_sharp.xml
index 56eebda1e..76bceb018 100644
--- a/app/src/main/res/drawable/numpad_sharp.xml
+++ b/app/src/main/res/drawable/numpad_sharp.xml
@@ -1,8 +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="@drawable/numpad_hash_over" />
-    <item
-         android:drawable="@drawable/numpad_hash" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_hash"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_hash"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_six.xml b/app/src/main/res/drawable/numpad_six.xml
index 88620e5f9..8d8273f27 100644
--- a/app/src/main/res/drawable/numpad_six.xml
+++ b/app/src/main/res/drawable/numpad_six.xml
@@ -1,8 +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="@drawable/numpad_6_over" />
-    <item
-         android:drawable="@drawable/numpad_6" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_6"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_6"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_star_digit.xml b/app/src/main/res/drawable/numpad_star_digit.xml
index a68ea64c9..83f1d96db 100644
--- a/app/src/main/res/drawable/numpad_star_digit.xml
+++ b/app/src/main/res/drawable/numpad_star_digit.xml
@@ -1,8 +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="@drawable/numpad_star_over" />
-    <item
-         android:drawable="@drawable/numpad_star" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_star"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_star"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_three.xml b/app/src/main/res/drawable/numpad_three.xml
index 3828174b7..ac9fade1e 100644
--- a/app/src/main/res/drawable/numpad_three.xml
+++ b/app/src/main/res/drawable/numpad_three.xml
@@ -1,8 +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="@drawable/numpad_3_over" />
-    <item
-         android:drawable="@drawable/numpad_3" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_3"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_3"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_two.xml b/app/src/main/res/drawable/numpad_two.xml
index 8b60338cc..17c52efcb 100644
--- a/app/src/main/res/drawable/numpad_two.xml
+++ b/app/src/main/res/drawable/numpad_two.xml
@@ -1,8 +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="@drawable/numpad_2_over" />
-    <item
-         android:drawable="@drawable/numpad_2" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_2"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_2"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/numpad_zero.xml b/app/src/main/res/drawable/numpad_zero.xml
index 34a4ed955..3e9e0fac4 100644
--- a/app/src/main/res/drawable/numpad_zero.xml
+++ b/app/src/main/res/drawable/numpad_zero.xml
@@ -1,8 +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="@drawable/numpad_0_over" />
-    <item
-         android:drawable="@drawable/numpad_0" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/numpad_0"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_0"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-
diff --git a/app/src/main/res/drawable/options.xml b/app/src/main/res/drawable/options.xml
index 0d23abd97..cf70c676e 100644
--- a/app/src/main/res/drawable/options.xml
+++ b/app/src/main/res/drawable/options.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/options_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/options_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/options_add_call.xml b/app/src/main/res/drawable/options_add_call.xml
index 9fb115ad4..97922cc63 100644
--- a/app/src/main/res/drawable/options_add_call.xml
+++ b/app/src/main/res/drawable/options_add_call.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_add_call_disabled" />
-	<item
-		android:drawable="@drawable/options_add_call_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_add_call_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_add_call_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_add_call_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/options_rec.xml b/app/src/main/res/drawable/options_rec.xml
new file mode 100644
index 000000000..3d75c109a
--- /dev/null
+++ b/app/src/main/res/drawable/options_rec.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/options_start_conference.xml b/app/src/main/res/drawable/options_start_conference.xml
index 56c2ff309..1a974f2e9 100644
--- a/app/src/main/res/drawable/options_start_conference.xml
+++ b/app/src/main/res/drawable/options_start_conference.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_start_conference_disabled" />
-	<item
-		android:drawable="@drawable/options_start_conference_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_start_conference_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_start_conference_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_start_conference_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/options_transfer_call.xml b/app/src/main/res/drawable/options_transfer_call.xml
index a02c56ed0..d979d34db 100644
--- a/app/src/main/res/drawable/options_transfer_call.xml
+++ b/app/src/main/res/drawable/options_transfer_call.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/options_transfer_call_disabled" />
-	<item
-		android:drawable="@drawable/options_transfer_call_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_transfer_call_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_transfer_call_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_transfer_call_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/resizable_assistant_button.xml b/app/src/main/res/drawable/resizable_assistant_button.xml
index 4fa102bfb..eeef6ce02 100644
--- a/app/src/main/res/drawable/resizable_assistant_button.xml
+++ b/app/src/main/res/drawable/resizable_assistant_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_enabled="false"
-		  android:drawable="@drawable/resizable_assistant_button_disabled" />
+		android:drawable="@drawable/resizable_assistant_button_disabled" />
 	<item android:state_pressed="true"
 		android:drawable="@drawable/resizable_assistant_button_over" />
 	<item
diff --git a/app/src/main/res/drawable/round_button_background.xml b/app/src/main/res/drawable/round_button_background.xml
index 52a2a199b..315bdc63a 100644
--- a/app/src/main/res/drawable/round_button_background.xml
+++ b/app/src/main/res/drawable/round_button_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@drawable/round_button_background_over" />
+		android:drawable="@drawable/round_button_background_over" />
 	<item
 		android:drawable="@drawable/round_button_background_default" />
 </selector>
diff --git a/app/src/main/res/drawable/route_bluetooth.xml b/app/src/main/res/drawable/route_bluetooth.xml
index 153c218db..ea4daaf07 100644
--- a/app/src/main/res/drawable/route_bluetooth.xml
+++ b/app/src/main/res/drawable/route_bluetooth.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
-		  android:drawable="@drawable/route_bluetooth_selected" />
-	<item
-		android:drawable="@drawable/route_bluetooth_default" />
+	<item android:state_pressed="true">
+		<bitmap android:src="@drawable/route_bluetooth_default"
+			android:tint="?attr/drawableTintOverColor"/>
+	</item>
+	<item android:state_enabled="false">
+		<bitmap android:src="@drawable/route_bluetooth_default"
+			android:tint="?attr/drawableTintDisabledColor"/>
+	</item>
+	<item>
+		<bitmap android:src="@drawable/route_bluetooth_default"
+			android:tint="?attr/drawableTintColor"/>
+	</item>
 </selector>
diff --git a/app/src/main/res/drawable/route_earpiece.xml b/app/src/main/res/drawable/route_earpiece.xml
index ecbec5c61..f8d501869 100644
--- a/app/src/main/res/drawable/route_earpiece.xml
+++ b/app/src/main/res/drawable/route_earpiece.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
-		  android:drawable="@drawable/route_earpiece_selected" />
-	<item
-		android:drawable="@drawable/route_earpiece_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/route_earpiece_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_earpiece_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_earpiece_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/route_speaker.xml b/app/src/main/res/drawable/route_speaker.xml
index 136cc9f71..5121b9298 100644
--- a/app/src/main/res/drawable/route_speaker.xml
+++ b/app/src/main/res/drawable/route_speaker.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
-		  android:drawable="@drawable/route_speaker_selected" />
-	<item
-		android:drawable="@drawable/route_speaker_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/routes.xml b/app/src/main/res/drawable/routes.xml
index ce4245e08..c3d06a0df 100644
--- a/app/src/main/res/drawable/routes.xml
+++ b/app/src/main/res/drawable/routes.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/routes_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/routes_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/speaker.xml b/app/src/main/res/drawable/speaker.xml
index 428395dee..b27e3b04b 100644
--- a/app/src/main/res/drawable/speaker.xml
+++ b/app/src/main/res/drawable/speaker.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/route_speaker_selected"
-        android:state_selected="true" />
-    <item
-         android:drawable="@drawable/route_speaker_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/switch_camera.xml b/app/src/main/res/drawable/switch_camera.xml
index b51a46377..5a4dc9418 100644
--- a/app/src/main/res/drawable/switch_camera.xml
+++ b/app/src/main/res/drawable/switch_camera.xml
@@ -3,5 +3,5 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/camera_switch_over" />
     <item
-         android:drawable="@drawable/camera_switch_default" />
+        android:drawable="@drawable/camera_switch_default" />
 </selector>
diff --git a/app/src/main/res/drawable/toolbar_button.xml b/app/src/main/res/drawable/toolbar_button.xml
index b10f6f259..3fa8135d8 100644
--- a/app/src/main/res/drawable/toolbar_button.xml
+++ b/app/src/main/res/drawable/toolbar_button.xml
@@ -1,9 +1,9 @@
 <?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" />
+		android:drawable="@color/colorE" />
 	<item android:state_selected="true"
-		  android:drawable="@color/colorF" />
+		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/assistant_codec_downloader.xml b/app/src/main/res/layout-land/assistant_codec_downloader.xml
index cca7b5e57..00f29fc76 100644
--- a/app/src/main/res/layout-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-land/assistant_codec_downloader.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="30dp">
+    android:padding="30dp"
+    android:background="?attr/backgroundColor">
 
     <TextView
         android:id="@+id/question"
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index f6f7a0f23..7f905e2c9 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -55,7 +55,7 @@
 
                         <TextView
                             android:id="@+id/current_contact_name"
-                            style="@style/font5"
+                            style="@style/big_contact_name_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
@@ -189,7 +189,7 @@
                     android:background="@drawable/round_orange_button_background"
                     android:contentDescription="@string/content_description_record_call"
                     android:padding="8dp"
-                    android:src="@drawable/recording"
+                    android:src="@drawable/options_rec"
                     android:visibility="gone" />
 
             </RelativeLayout>
@@ -248,7 +248,7 @@
 
                         <TextView
                             android:id="@+id/missed_chats"
-                            style="@style/font18"
+                            style="@style/unread_count_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="15dp"
@@ -388,7 +388,7 @@
                             android:background="@drawable/button_background"
                             android:contentDescription="@string/content_description_record_call"
                             android:padding="15dp"
-                            android:src="@drawable/options_rec_default"
+                            android:src="@drawable/options_rec"
                             android:visibility="gone" />
 
                         <ImageView
diff --git a/app/src/main/res/layout-land/dialer.xml b/app/src/main/res/layout-land/dialer.xml
index 43fd1b25e..7f91392bb 100644
--- a/app/src/main/res/layout-land/dialer.xml
+++ b/app/src/main/res/layout-land/dialer.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/dialer"
@@ -11,7 +11,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="50dp"
-        android:background="@color/colorH"
+        android:background="?attr/backgroundColor"
         android:visibility="gone"/>
 
     <RelativeLayout
@@ -20,7 +20,7 @@
         android:layout_height="60dp"
         android:layout_alignParentTop="true"
         android:layout_marginBottom="10dp"
-        android:background="@color/colorF">
+        android:background="?attr/lighToolbarBackgroundColor">
 
         <org.linphone.views.EraseButton
             android:id="@+id/erase"
@@ -35,12 +35,11 @@
 
         <org.linphone.views.AddressText
             android:id="@+id/address"
-            style="@style/font5"
+            style="@style/numpad_composed_number_font"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/erase"
-            android:background="@color/colorF"
             android:ellipsize="start"
             android:hint="@string/address_bar_hint"
             android:inputType="textEmailAddress"
diff --git a/app/src/main/res/layout-land/launch_screen.xml b/app/src/main/res/layout-land/launch_screen.xml
index fc625216a..c96f0dee7 100644
--- a/app/src/main/res/layout-land/launch_screen.xml
+++ b/app/src/main/res/layout-land/launch_screen.xml
@@ -18,7 +18,7 @@
             android:src="@drawable/splashscreen" />
 
         <TextView
-            style="@style/font21"
+            style="@style/splash_screen_app_name_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -27,12 +27,11 @@
             android:visibility="gone" />
 
         <TextView
+            style="@style/splash_screen_subtitle_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/app_description"
-            android:textColor="@color/colorA"
-            android:textSize="28sp" />
+            android:text="@string/app_description" />
 
     </LinearLayout>
 
@@ -40,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
+        android:indeterminateTint="@color/colorA"
         android:layout_marginBottom="20dp" />
 
     <View
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 360487c7b..d070d0920 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
-                android:background="@color/colorF"
+                android:background="?attr/lighToolbarBackgroundColor"
                 android:orientation="horizontal"
                 android:visibility="gone">
 
@@ -41,7 +41,7 @@
 
                 <TextView
                     android:id="@+id/top_bar_title"
-                    style="@style/font1"
+                    style="@style/toolbar_title_font"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
@@ -103,12 +103,12 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_calls"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -141,7 +141,7 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
                 </RelativeLayout>
 
@@ -165,7 +165,7 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA" />
+                        android:background="?attr/accentColor" />
 
                 </RelativeLayout>
 
@@ -189,12 +189,12 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_chats"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -232,7 +232,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA"
+                android:background="?attr/accentColor"
                 android:gravity="bottom">
 
                 <ImageView
@@ -246,7 +246,7 @@
 
                 <TextView
                     android:id="@+id/quit"
-                    style="@style/font14"
+                    style="@style/quit_button_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
@@ -259,7 +259,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@id/side_menu_quit"
-                android:background="@color/colorH"
                 android:orientation="vertical">
 
                 <include layout="@layout/side_menu_main_account" />
@@ -268,7 +267,6 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorH"
                     android:cacheColorHint="@color/transparent"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
@@ -278,17 +276,10 @@
                     android:id="@+id/item_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorH"
                     android:choiceMode="singleChoice"
-                    android:divider="@color/colorE"
+                    android:divider="?attr/dividerColor"
                     android:dividerHeight="1dp"
-                    android:footerDividersEnabled="true"
-                    android:listSelector="@color/colorH" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/colorE" />
+                    android:footerDividersEnabled="true" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
index a90a5f924..c67c7ca33 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -133,7 +134,7 @@
 
                             <TextView
                                 android:id="@+id/sip_uri"
-                                style="@style/font9"
+                                style="@style/contact_organization_font"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:visibility="visible" />
@@ -328,6 +329,8 @@
                     android:layout_height="wrap_content"
                     android:layout_column="1"
                     android:checked="false"
+                    android:button="@drawable/checkbox"
+                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/use_username_instead_or_phone_number"
                     android:visibility="visible" />
             </TableRow>
@@ -344,10 +347,13 @@
                     android:layout_height="wrap_content"
                     android:layout_column="1"
                     android:checked="false"
+                    android:button="@drawable/checkbox"
+                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/use_email_for_validation"
                     android:visibility="visible" />
 
             </TableRow>
+
         </TableLayout>
 
         <Button
@@ -377,4 +383,5 @@
             android:visibility="gone" />
 
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml b/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
index 45d66f172..8abe9a35b 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="30dp">
+    android:padding="30dp"
+    android:background="?attr/backgroundColor">
 
     <TextView
         android:id="@+id/question"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
index 898ff6726..eb46d09f2 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="?attr/backgroundColor"
     android:padding="30dp">
 
     <TextView
@@ -212,6 +213,8 @@
                 android:id="@+id/use_username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:button="@drawable/checkbox"
+                android:textColor="?attr/primaryTextColor"
                 android:text="@string/login_with_username"
                 android:visibility="visible" />
         </TableRow>
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
index f0be1c9db..f6a50dca4 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
@@ -197,6 +197,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
                             android:text="@string/pref_transport_udp" />
 
                         <RadioButton
@@ -204,6 +205,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
                             android:text="@string/pref_transport_tcp" />
 
                         <RadioButton
@@ -211,12 +213,15 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="5dp"
+                            android:textColor="?attr/primaryTextColor"
                             android:checked="true"
                             android:text="@string/pref_transport_tls" />
                     </RadioGroup>
 
                 </LinearLayout>
+
             </TableRow>
+
         </TableLayout>
 
         <Button
@@ -233,4 +238,5 @@
             android:textColor="@drawable/assistant_button_text_color" />
 
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml b/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
index f7aaa41b9..bc7cfbe5c 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -43,6 +44,7 @@
                     android:layout_height="40dp"
                     android:layout_weight="1"
                     android:background="@drawable/assistant_button"
+                    android:textColor="@drawable/assistant_button_text_color"
                     android:contentDescription="@string/assistant_create_account"
                     android:text="@string/assistant_create_account" />
 
@@ -54,6 +56,7 @@
                     android:layout_marginLeft="30dp"
                     android:layout_weight="1"
                     android:background="@drawable/assistant_button"
+                    android:textColor="@drawable/assistant_button_text_color"
                     android:contentDescription="@string/assistant_login_linphone"
                     android:text="@string/assistant_login_linphone" />
             </TableRow>
@@ -70,6 +73,7 @@
                     android:layout_height="40dp"
                     android:layout_weight="1"
                     android:background="@drawable/assistant_button"
+                    android:textColor="@drawable/assistant_button_text_color"
                     android:contentDescription="@string/assistant_login_generic"
                     android:text="@string/assistant_login_generic" />
 
@@ -81,11 +85,14 @@
                     android:layout_marginLeft="30dp"
                     android:layout_weight="1"
                     android:background="@drawable/assistant_button"
+                    android:textColor="@drawable/assistant_button_text_color"
                     android:contentDescription="@string/assistant_remote_provisioning"
                     android:text="@string/assistant_remote_provisioning" />
 
             </TableRow>
+
         </TableLayout>
 
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw533dp-land/dialer.xml b/app/src/main/res/layout-sw533dp-land/dialer.xml
index aeaf5e91c..71b153edf 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer.xml
@@ -17,7 +17,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="50dp"
-        android:background="@color/colorH">
+        android:background="?attr/backgroundColor">
 
         <RelativeLayout
             android:id="@+id/address_bar"
@@ -25,7 +25,7 @@
             android:layout_height="60dp"
             android:layout_alignParentTop="true"
             android:layout_marginBottom="10dp"
-            android:background="@color/colorF">
+            android:background="?attr/lighToolbarBackgroundColor">
 
             <org.linphone.views.EraseButton
                 android:id="@+id/erase"
@@ -40,12 +40,11 @@
 
             <org.linphone.views.AddressText
                 android:id="@+id/address"
-                style="@style/font5"
+                style="@style/numpad_composed_number_font"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@id/erase"
-                android:background="@color/colorF"
                 android:ellipsize="start"
                 android:hint="@string/address_bar_hint"
                 android:inputType="textEmailAddress"
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index 639e5c8e8..c4b02991e 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
-                android:background="@color/colorF"
+                android:background="?attr/lighToolbarBackgroundColor"
                 android:orientation="horizontal"
                 android:visibility="gone">
 
@@ -91,7 +91,7 @@
                             <View
                                 android:layout_width="1dp"
                                 android:layout_height="match_parent"
-                                android:background="@color/colorE" />
+                                android:background="?attr/dividerColor" />
                         </LinearLayout>
 
                     </LinearLayout>
@@ -127,12 +127,12 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_calls"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -165,7 +165,7 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
                 </RelativeLayout>
 
@@ -189,7 +189,7 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA" />
+                        android:background="?attr/accentColor" />
 
                 </RelativeLayout>
 
@@ -213,12 +213,12 @@
                         android:layout_width="5dp"
                         android:layout_height="match_parent"
                         android:layout_alignParentLeft="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_chats"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -253,7 +253,6 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorB"
                     android:cacheColorHint="@color/transparent"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
@@ -263,11 +262,10 @@
                     android:id="@+id/item_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@color/colorH"
                     android:choiceMode="singleChoice"
-                    android:divider="@color/colorE"
-                    android:dividerHeight="1dp"
-                    android:listSelector="@color/colorH" />
+                    android:divider="?dividerColor"
+                    android:dividerHeight="1dp" />
+
             </LinearLayout>
 
             <RelativeLayout
@@ -275,7 +273,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA"
+                android:background="?attr/accentColor"
                 android:gravity="bottom">
 
                 <ImageView
@@ -289,7 +287,7 @@
 
                 <TextView
                     android:id="@+id/quit"
-                    style="@style/font14"
+                    style="@style/quit_button_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml b/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
index 80db6506b..effba2971 100644
--- a/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="30dp">
+    android:padding="30dp"
+    android:background="?attr/backgroundColor">
 
     <TextView
         android:id="@+id/question"
diff --git a/app/src/main/res/layout-sw533dp/dialer.xml b/app/src/main/res/layout-sw533dp/dialer.xml
index e5f74795d..61e139874 100644
--- a/app/src/main/res/layout-sw533dp/dialer.xml
+++ b/app/src/main/res/layout-sw533dp/dialer.xml
@@ -17,7 +17,7 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="50dp"
-        android:background="@color/colorH">
+        android:background="?attr/backgroundColor">
 
         <RelativeLayout
             android:id="@+id/address_bar"
@@ -25,7 +25,7 @@
             android:layout_height="60dp"
             android:layout_alignParentTop="true"
             android:layout_marginBottom="10dp"
-            android:background="@color/colorF">
+            android:background="?attr/lighToolbarBackgroundColor">
 
             <org.linphone.views.EraseButton
                 android:id="@+id/erase"
@@ -40,12 +40,11 @@
 
             <org.linphone.views.AddressText
                 android:id="@+id/address"
-                style="@style/font5"
+                style="@style/numpad_composed_number_font"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@id/erase"
-                android:background="@color/colorF"
                 android:ellipsize="start"
                 android:hint="@string/address_bar_hint"
                 android:inputType="textEmailAddress"
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 43ffcd0e4..09b990d39 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
-                android:background="@color/colorF"
+                android:background="?attr/lighToolbarBackgroundColor"
                 android:orientation="horizontal"
                 android:visibility="gone">
 
@@ -90,7 +90,7 @@
                             <View
                                 android:layout_width="1dp"
                                 android:layout_height="match_parent"
-                                android:background="@color/colorE" />
+                                android:background="?attr/dividerColor" />
 
                         </LinearLayout>
 
@@ -129,12 +129,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_calls"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -166,7 +166,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
                 </RelativeLayout>
 
@@ -190,7 +190,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA" />
+                        android:background="?attr/accentColor" />
 
                 </RelativeLayout>
 
@@ -214,12 +214,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_chats"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentTop="true"
@@ -253,7 +253,6 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorB"
                     android:cacheColorHint="@color/transparent"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
@@ -263,11 +262,10 @@
                     android:id="@+id/item_list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@color/colorH"
                     android:choiceMode="singleChoice"
-                    android:divider="@color/colorE"
-                    android:dividerHeight="1dp"
-                    android:listSelector="@color/colorH" />
+                    android:divider="?attr/dividerColor"
+                    android:dividerHeight="1dp" />
+
             </LinearLayout>
 
             <RelativeLayout
@@ -275,7 +273,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA"
+                android:background="?attr/accentColor"
                 android:gravity="bottom">
 
                 <ImageView
@@ -289,7 +287,7 @@
 
                 <TextView
                     android:id="@+id/quit"
-                    style="@style/font14"
+                    style="@style/quit_button_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml b/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
index 2eb19b520..c270e26b6 100644
--- a/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="30dp">
+    android:padding="30dp"
+    android:background="?attr/backgroundColor">
 
     <TextView
         android:id="@+id/question"
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 72bcc935b..4ffaaf7af 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
@@ -63,7 +63,6 @@
         android:layout_height="0dp"
         android:layout_gravity="center"
         android:layout_weight="1"
-        android:background="@color/colorH"
         android:orientation="vertical"
         android:padding="10dp">
 
diff --git a/app/src/main/res/layout/assistant.xml b/app/src/main/res/layout/assistant.xml
index f990a7695..2822e7ead 100644
--- a/app/src/main/res/layout/assistant.xml
+++ b/app/src/main/res/layout/assistant.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <fragment
@@ -21,6 +21,7 @@
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/backgroundColor"
         android:orientation="horizontal" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/assistant_account_creation.xml b/app/src/main/res/layout/assistant_account_creation.xml
index c47551462..b9fa923ab 100644
--- a/app/src/main/res/layout/assistant_account_creation.xml
+++ b/app/src/main/res/layout/assistant_account_creation.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/backgroundColor">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -115,7 +116,7 @@
 
 					<TextView
 						android:id="@+id/sip_uri"
-						style="@style/font9"
+						style="@style/contact_organization_font"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
@@ -289,13 +290,17 @@
 				android:visibility="gone"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/use_username_instead_or_phone_number"/>
+                android:button="@drawable/checkbox"
+				android:text="@string/use_username_instead_or_phone_number"
+                android:textColor="?attr/primaryTextColor"/>
 
 			<CheckBox
 				android:id="@+id/use_email"
 				android:visibility="gone"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+                android:button="@drawable/checkbox"
+                android:textColor="?attr/primaryTextColor"
 				android:text="@string/use_email_for_validation"/>
 
 			<Button
@@ -323,5 +328,7 @@
 				android:layout_marginTop="20dp"/>
 
 		</LinearLayout>
+
 	</LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_account_creation_code_activation.xml b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
index 18b74092e..f0cb1f63d 100644
--- a/app/src/main/res/layout/assistant_account_creation_code_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/backgroundColor">
 
 	<LinearLayout
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/assistant_account_creation_email_activation.xml b/app/src/main/res/layout/assistant_account_creation_email_activation.xml
index 4b0a51ffe..8bc1a7ddc 100644
--- a/app/src/main/res/layout/assistant_account_creation_email_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_email_activation.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/backgroundColor">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -58,4 +59,5 @@
 			android:paddingRight="10dp"/>
 
 	</LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_codec_downloader.xml b/app/src/main/res/layout/assistant_codec_downloader.xml
index ad7eaf0fe..b675553e2 100644
--- a/app/src/main/res/layout/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout/assistant_codec_downloader.xml
@@ -3,7 +3,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:padding="30dp"
-	android:orientation="vertical" >
+	android:orientation="vertical"
+	android:background="?attr/backgroundColor">
 
 	<TextView
 		android:text="@string/assistant_codec_down_question"
diff --git a/app/src/main/res/layout/assistant_ec_calibration.xml b/app/src/main/res/layout/assistant_ec_calibration.xml
index 83b6c88f3..bf87be6b6 100644
--- a/app/src/main/res/layout/assistant_ec_calibration.xml
+++ b/app/src/main/res/layout/assistant_ec_calibration.xml
@@ -3,7 +3,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:padding="30dp"
-	android:orientation="vertical" >
+	android:orientation="vertical"
+	android:background="?attr/backgroundColor">
 
 	<TextView
 		android:text="@string/assistant_ec_calibration"
diff --git a/app/src/main/res/layout/assistant_linphone_login.xml b/app/src/main/res/layout/assistant_linphone_login.xml
index 0320c9222..a1154ee8f 100644
--- a/app/src/main/res/layout/assistant_linphone_login.xml
+++ b/app/src/main/res/layout/assistant_linphone_login.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/backgroundColor">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -190,6 +191,8 @@
 				android:layout_marginTop="20dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
+				android:button="@drawable/checkbox"
+				android:textColor="?attr/primaryTextColor"
 				android:text="@string/login_with_username"/>
 
 			<Button
diff --git a/app/src/main/res/layout/assistant_login.xml b/app/src/main/res/layout/assistant_login.xml
index f2483c390..f3ca4a7d3 100644
--- a/app/src/main/res/layout/assistant_login.xml
+++ b/app/src/main/res/layout/assistant_login.xml
@@ -142,6 +142,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/pref_transport_udp" />
 
                 <RadioButton
@@ -149,6 +150,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:textColor="?attr/primaryTextColor"
                     android:text="@string/pref_transport_tcp" />
 
                 <RadioButton
@@ -156,6 +158,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:textColor="?attr/primaryTextColor"
                     android:checked="true"
                     android:text="@string/pref_transport_tls" />
             </RadioGroup>
@@ -173,5 +176,7 @@
                 android:textColor="@drawable/assistant_button_text_color" />
 
         </LinearLayout>
+
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_remote_provisioning.xml b/app/src/main/res/layout/assistant_remote_provisioning.xml
index 000bd4f53..54c90ced2 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 	android:padding="30dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+	android:background="?attr/backgroundColor">
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_title"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_login.xml b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
index a1c552a80..328b58089 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning_login.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:background="?attr/backgroundColor">
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_title"
diff --git a/app/src/main/res/layout/assistant_welcome.xml b/app/src/main/res/layout/assistant_welcome.xml
index 840aafaac..810669493 100644
--- a/app/src/main/res/layout/assistant_welcome.xml
+++ b/app/src/main/res/layout/assistant_welcome.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,6 +42,7 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
                 android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
                 android:contentDescription="@string/assistant_create_account"
                 android:text="@string/assistant_create_account" />
 
@@ -52,6 +54,7 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
                 android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
                 android:contentDescription="@string/assistant_login_linphone"
                 android:text="@string/assistant_login_linphone" />
 
@@ -62,6 +65,7 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
                 android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
                 android:contentDescription="@string/assistant_login_generic"
                 android:text="@string/assistant_login_generic" />
 
@@ -72,9 +76,12 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
                 android:background="@drawable/assistant_button"
+                android:textColor="@drawable/assistant_button_text_color"
                 android:contentDescription="@string/assistant_remote_provisioning"
                 android:text="@string/assistant_remote_provisioning" />
 
         </LinearLayout>
+
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/audio.xml b/app/src/main/res/layout/audio.xml
index 9e38233bd..97a592a43 100644
--- a/app/src/main/res/layout/audio.xml
+++ b/app/src/main/res/layout/audio.xml
@@ -2,5 +2,5 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:paddingTop="40dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index 2c052915f..e711d220d 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -51,12 +51,12 @@
                         android:layout_alignParentTop="true"
                         android:layout_centerHorizontal="true"
                         android:alpha="0.8"
-                        android:background="@color/colorH"
+                        android:background="?attr/backgroundColor"
                         android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/current_contact_name"
-                            style="@style/font5"
+                            style="@style/big_contact_name_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
@@ -153,7 +153,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:layout_gravity="bottom"
-                    android:background="@color/colorH"
+                    android:background="?attr/backgroundColor"
                     android:orientation="vertical"/>
 
                 <LinearLayout
@@ -161,7 +161,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_above="@id/calls_list"
-                    android:background="@color/colorC"
+                    android:background="?attr/backgroundColor"
                     android:gravity="center_vertical"
                     android:orientation="vertical"
                     android:visibility="gone">
@@ -190,7 +190,7 @@
                     android:background="@drawable/round_orange_button_background"
                     android:contentDescription="@string/content_description_record_call"
                     android:padding="10dp"
-                    android:src="@drawable/recording"
+                    android:src="@drawable/options_rec"
                     android:visibility="gone" />
 
             </RelativeLayout>
@@ -329,7 +329,7 @@
                             android:background="@drawable/button_background"
                             android:contentDescription="@string/content_description_record_call"
                             android:padding="15dp"
-                            android:src="@drawable/options_rec_default"
+                            android:src="@drawable/options_rec"
                             android:visibility="gone" />
 
                         <ImageView
@@ -415,7 +415,7 @@
 
                         <TextView
                             android:id="@+id/missed_chats"
-                            style="@style/font18"
+                            style="@style/unread_count_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_margin="15dp"
@@ -455,7 +455,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="left"
             android:layout_marginTop="40dp"
-            android:background="@color/colorH">
+            android:background="?attr/backgroundColor">
 
             <include
                 android:id="@+id/incall_stats"
diff --git a/app/src/main/res/layout/call_inactive_row.xml b/app/src/main/res/layout/call_inactive_row.xml
index a5be416fc..7ac04d473 100644
--- a/app/src/main/res/layout/call_inactive_row.xml
+++ b/app/src/main/res/layout/call_inactive_row.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="50dp"
     android:alpha="0.5"
-    android:background="@color/colorA"
+    android:background="?attr/accentColor"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="5dp">
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/contact_name"
-        style="@style/font14"
+        style="@style/call_contact_name_paused_font"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/app/src/main/res/layout/call_incoming.xml b/app/src/main/res/layout/call_incoming.xml
index cfcc3b1e7..cd657f670 100644
--- a/app/src/main/res/layout/call_incoming.xml
+++ b/app/src/main/res/layout/call_incoming.xml
@@ -4,7 +4,7 @@
     android:id="@+id/topLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <fragment
         android:id="@+id/status"
@@ -18,10 +18,10 @@
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_below="@id/status"
-        android:background="@color/colorF">
+        android:background="?attr/lighToolbarBackgroundColor">
 
         <TextView
-            style="@style/font1"
+            style="@style/toolbar_title_font"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
@@ -39,7 +39,7 @@
 
         <TextView
             android:id="@+id/contact_name"
-            style="@style/font5"
+            style="@style/big_contact_name_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:adjustViewBounds="true"
-                android:src="@drawable/avatar_mask_border" />
+                android:src="@drawable/avatar_mask_border"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call_outgoing.xml b/app/src/main/res/layout/call_outgoing.xml
index fd2a3655b..ca4535ec7 100644
--- a/app/src/main/res/layout/call_outgoing.xml
+++ b/app/src/main/res/layout/call_outgoing.xml
@@ -4,7 +4,7 @@
     android:id="@+id/topLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <fragment
         android:id="@+id/status"
@@ -18,10 +18,10 @@
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_below="@id/status"
-        android:background="@color/colorF">
+        android:background="?attr/lighToolbarBackgroundColor">
 
         <TextView
-            style="@style/font1"
+            style="@style/toolbar_title_font"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
@@ -40,7 +40,7 @@
 
         <TextView
             android:id="@+id/contact_name"
-            style="@style/font5"
+            style="@style/big_contact_name_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
index 0a2c4b3d0..bad50e162 100644
--- a/app/src/main/res/layout/chat.xml
+++ b/app/src/main/res/layout/chat.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/top"
@@ -13,7 +13,7 @@
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:id="@+id/subject"
-                    style="@style/font6"
+                    style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -45,11 +45,11 @@
 
                 <TextView
                     android:id="@+id/participants"
+                    style="@style/toolbar_small_title_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="@color/colorC" />
+                    android:maxLines="1" />
 
             </LinearLayout>
 
@@ -104,13 +104,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@color/colorF"
+        android:background="?attr/lighToolbarBackgroundColor"
         android:orientation="vertical">
 
         <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorC"
+            android:background="?attr/darkToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml
index b3993dced..7c862a693 100644
--- a/app/src/main/res/layout/chat_bubble.xml
+++ b/app/src/main/res/layout/chat_bubble.xml
@@ -37,10 +37,10 @@
             android:id="@+id/event_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/colorH"
+            android:background="?attr/backgroundColor"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:textAppearance="@style/font_group_chat_event" />
+            android:textAppearance="@style/group_chat_event_font" />
 
     </LinearLayout>
 
@@ -60,10 +60,10 @@
             android:id="@+id/security_event_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/colorH"
+            android:background="?attr/backgroundColor"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:textAppearance="@style/font_group_chat_security_event" />
+            android:textAppearance="@style/group_chat_security_event_font" />
 
     </LinearLayout>
 
@@ -127,7 +127,7 @@
             android:layout_height="10dp"
             android:layout_toRightOf="@id/background"
             android:layout_alignBottom="@id/background"
-            android:indeterminateTint="@color/colorA" />
+            android:indeterminateTint="?attr/accentColor" />
 
         <RelativeLayout
             android:id="@+id/message_sender_avatar"
@@ -169,7 +169,7 @@
             android:layout_alignParentRight="true"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:indeterminateTint="@color/colorA" />
+            android:indeterminateTint="?attr/accentColor" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_bubble_content.xml b/app/src/main/res/layout/chat_bubble_content.xml
index 0616a6576..c9c7f672f 100644
--- a/app/src/main/res/layout/chat_bubble_content.xml
+++ b/app/src/main/res/layout/chat_bubble_content.xml
@@ -37,6 +37,7 @@
         android:layout_width="137dp"
         android:layout_height="40dp"
         android:layout_margin="5dp"
+        android:textColor="@drawable/assistant_button_text_color"
         android:background="@drawable/resizable_assistant_button"
         android:ellipsize="end"
         android:padding="10dp"
diff --git a/app/src/main/res/layout/chat_bubble_old.xml b/app/src/main/res/layout/chat_bubble_old.xml
index 53f443db6..fc00244fa 100644
--- a/app/src/main/res/layout/chat_bubble_old.xml
+++ b/app/src/main/res/layout/chat_bubble_old.xml
@@ -29,10 +29,10 @@
             android:id="@+id/event_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/colorH"
+            android:background="?attr/backgroundColor"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:textAppearance="@style/font_group_chat_event" />
+            android:textAppearance="@style/group_chat_event_font" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index 80791e720..d249f0352 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
+        android:background="?attr/backgroundColor"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -83,7 +82,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:layout_alignParentBottom="true"
-                    android:background="@color/colorA" />
+                    android:background="?attr/accentColor" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -107,7 +106,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:layout_alignParentBottom="true"
-                    android:background="@color/colorA"
+                    android:background="?attr/accentColor"
                     android:visibility="gone" />
             </RelativeLayout>
 
@@ -143,7 +142,7 @@
                 android:paddingRight="5dp"
                 android:queryBackground="@android:color/transparent"
                 android:queryHint="@string/chat_room_creation_filter_hint"
-                android:textColor="@android:color/black" />
+                android:textColor="@color/colorB" />
 
         </RelativeLayout>
 
@@ -176,7 +175,7 @@
                 android:id="@+id/contactsList"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:divider="@color/colorE"
+                android:divider="?attr/dividerColor"
                 android:dividerHeight="1dp"
                 android:fastScrollAlwaysVisible="true"
                 android:fastScrollEnabled="true" />
diff --git a/app/src/main/res/layout/chat_device_cell.xml b/app/src/main/res/layout/chat_device_cell.xml
index a05b03685..58ef6fc1d 100644
--- a/app/src/main/res/layout/chat_device_cell.xml
+++ b/app/src/main/res/layout/chat_device_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/name"
-            style="@style/font6"
+            style="@style/contact_name_list_cell_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/chat_device_group.xml b/app/src/main/res/layout/chat_device_group.xml
index 94018d6e1..83155d95b 100644
--- a/app/src/main/res/layout/chat_device_group.xml
+++ b/app/src/main/res/layout/chat_device_group.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/name"
-            style="@style/font6"
+            style="@style/contact_name_list_cell_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/chat_devices.xml b/app/src/main/res/layout/chat_devices.xml
index 4a1a9caf2..4eeca886e 100644
--- a/app/src/main/res/layout/chat_devices.xml
+++ b/app/src/main/res/layout/chat_devices.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/top"
@@ -13,7 +13,7 @@
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -28,7 +28,7 @@
 
             <TextView
                 android:id="@+id/title"
-                style="@style/font6"
+                style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.6"
@@ -54,6 +54,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/top"
+        android:divider="?attr/dividerColor"
         android:groupIndicator="@null" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/chat_imdn.xml b/app/src/main/res/layout/chat_imdn.xml
index 22bf89ce9..437efcf2d 100644
--- a/app/src/main/res/layout/chat_imdn.xml
+++ b/app/src/main/res/layout/chat_imdn.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/top"
@@ -13,7 +13,7 @@
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -27,7 +27,7 @@
                 android:src="@drawable/back" />
 
             <TextView
-                style="@style/font6"
+                style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/chat_imdn_cell.xml b/app/src/main/res/layout/chat_imdn_cell.xml
index ae108019d..a4160ea0e 100644
--- a/app/src/main/res/layout/chat_imdn_cell.xml
+++ b/app/src/main/res/layout/chat_imdn_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -16,7 +16,7 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/colorE" />
+            android:background="?attr/dividerColor" />
 
     </LinearLayout>
 
@@ -46,7 +46,7 @@
 
         <TextView
             android:id="@+id/name"
-            style="@style/font6"
+            style="@style/contact_name_list_cell_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/chat_imdn_old.xml b/app/src/main/res/layout/chat_imdn_old.xml
index 0c77c6b35..cb3726b8f 100644
--- a/app/src/main/res/layout/chat_imdn_old.xml
+++ b/app/src/main/res/layout/chat_imdn_old.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/top"
@@ -13,7 +13,7 @@
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -27,7 +27,7 @@
                 android:src="@drawable/back" />
 
             <TextView
-                style="@style/font6"
+                style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/chat_infos.xml b/app/src/main/res/layout/chat_infos.xml
index 1117b60f7..fa22299c7 100644
--- a/app/src/main/res/layout/chat_infos.xml
+++ b/app/src/main/res/layout/chat_infos.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -28,7 +28,7 @@
                 android:src="@drawable/back" />
 
             <TextView
-                style="@style/font6"
+                style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.4"
@@ -66,7 +66,7 @@
                 android:hint="@string/conversation_subject_hint"
                 android:inputType="textEmailSubject"
                 android:paddingRight="5dp"
-                android:textColor="@android:color/black"
+                android:textColor="@color/colorB"
                 android:textCursorDrawable="@null" />
 
         </RelativeLayout>
@@ -104,7 +104,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:divider="@color/colorE"
+            android:divider="?attr/dividerColor"
             android:dividerHeight="1dp">
 
         </androidx.recyclerview.widget.RecyclerView>
@@ -116,7 +116,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:background="@color/colorA"
+            android:background="?attr/accentColor"
             android:paddingLeft="20dp"
             android:paddingTop="8dp"
             android:paddingRight="20dp"
diff --git a/app/src/main/res/layout/chat_infos_cell.xml b/app/src/main/res/layout/chat_infos_cell.xml
index 7fbc835d7..943fa98cf 100644
--- a/app/src/main/res/layout/chat_infos_cell.xml
+++ b/app/src/main/res/layout/chat_infos_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:text="@string/chat_room_infos_admin"
-                    android:textColor="@color/colorB"
+                    android:textColor="?attr/primaryTextColor"
                     android:textStyle="bold" />
 
             </LinearLayout>
@@ -86,9 +86,10 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:text="@string/chat_room_infos_admin"
-                    android:textColor="@color/colorF" />
+                    android:textColor="?attr/primarySubtextLightColor" />
 
             </LinearLayout>
+
         </LinearLayout>
 
         <RelativeLayout
@@ -101,7 +102,7 @@
 
             <TextView
                 android:id="@+id/name"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/chatlist.xml b/app/src/main/res/layout/chatlist.xml
index afd2c0010..00e8522cf 100644
--- a/app/src/main/res/layout/chatlist.xml
+++ b/app/src/main/res/layout/chatlist.xml
@@ -6,14 +6,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
+        android:background="?attr/backgroundColor"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -70,14 +70,14 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:cacheColorHint="@color/transparent"
-            android:divider="@color/colorE"
+            android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
     </LinearLayout>
 
     <TextView
         android:id="@+id/noChatHistory"
-        style="@style/font6"
+        style="@style/empty_list_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout/chatlist_cell.xml b/app/src/main/res/layout/chatlist_cell.xml
index f9ee9bbbf..f4eaa29ff 100644
--- a/app/src/main/res/layout/chatlist_cell.xml
+++ b/app/src/main/res/layout/chatlist_cell.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="80dp"
-    android:background="@drawable/list_selector"
-    android:foreground="?android:attr/selectableItemBackground"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:paddingLeft="10dp"
     android:paddingTop="5dp"
@@ -53,7 +52,7 @@
 
             <TextView
                 android:id="@+id/sipUri"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="30dp"
@@ -64,7 +63,7 @@
 
             <TextView
                 android:id="@+id/unreadMessages"
-                style="@style/font18"
+                style="@style/unread_count_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_above="@+id/lastMessageLayout"
diff --git a/app/src/main/res/layout/conf_call_control_row.xml b/app/src/main/res/layout/conf_call_control_row.xml
index ef318fa7d..de9fd537f 100644
--- a/app/src/main/res/layout/conf_call_control_row.xml
+++ b/app/src/main/res/layout/conf_call_control_row.xml
@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="70dp"
     android:layout_margin="2dp"
-    android:background="@color/colorH"
-    android:divider="@color/colorE"
+    android:background="?attr/backgroundColor"
+    android:divider="?attr/dividerColor"
     android:dividerHeight="1dp"
     android:gravity="center_vertical"
     android:orientation="horizontal"
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/contactNameOrNumber"
-            style="@style/font6"
+            style="@style/contact_name_list_cell_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical|left"
diff --git a/app/src/main/res/layout/conference_header.xml b/app/src/main/res/layout/conference_header.xml
index 724d9abb0..834117046 100644
--- a/app/src/main/res/layout/conference_header.xml
+++ b/app/src/main/res/layout/conference_header.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="60dp"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical">
 
     <LinearLayout
@@ -44,6 +44,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/colorE" />
+        android:background="?attr/dividerColor" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/conference_paused_row.xml b/app/src/main/res/layout/conference_paused_row.xml
index 6a4a6ae16..7f55b68fd 100644
--- a/app/src/main/res/layout/conference_paused_row.xml
+++ b/app/src/main/res/layout/conference_paused_row.xml
@@ -4,7 +4,7 @@
     android:layout_height="50dp"
     android:layout_margin="2dp"
     android:alpha="0.5"
-    android:background="@color/colorA"
+    android:background="?attr/accentColor"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:padding="5dp">
@@ -17,7 +17,7 @@
 
     <TextView
         android:id="@+id/contact_name"
-        style="@style/font14"
+        style="@style/call_contact_name_paused_font"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/app/src/main/res/layout/contact.xml b/app/src/main/res/layout/contact.xml
index 9789df77e..23f80887d 100644
--- a/app/src/main/res/layout/contact.xml
+++ b/app/src/main/res/layout/contact.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -75,7 +75,7 @@
 
                 <TextView
                     android:id="@+id/contact_name"
-                    style="@style/font5"
+                    style="@style/big_contact_name_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -83,7 +83,7 @@
 
                 <TextView
                     android:id="@+id/contactOrganization"
-                    style="@style/font9"
+                    style="@style/contact_organization_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml
index a9177393a..79f621323 100644
--- a/app/src/main/res/layout/contact_avatar.xml
+++ b/app/src/main/res/layout/contact_avatar.xml
@@ -18,11 +18,12 @@
         android:layout_height="35dp"
         android:layout_alignParentLeft="true"
         android:adjustViewBounds="true"
+        android:tint="?attr/backgroundColor"
         android:src="@drawable/avatar_mask" />
 
     <TextView
         android:id="@+id/generated_avatar"
-        style="@style/font25"
+        style="@style/generated_contact_avatar_font"
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_alignParentLeft="true"
diff --git a/app/src/main/res/layout/contact_avatar_big.xml b/app/src/main/res/layout/contact_avatar_big.xml
index efbe0878c..93a005d96 100644
--- a/app/src/main/res/layout/contact_avatar_big.xml
+++ b/app/src/main/res/layout/contact_avatar_big.xml
@@ -18,11 +18,12 @@
         android:layout_height="100dp"
         android:layout_alignParentLeft="true"
         android:adjustViewBounds="true"
+        android:tint="?attr/backgroundColor"
         android:src="@drawable/avatar_mask" />
 
     <TextView
         android:id="@+id/generated_avatar"
-        style="@style/contact_avatar_letters_big"
+        style="@style/generated_contact_avatar_big_font"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_alignParentLeft="true"
diff --git a/app/src/main/res/layout/contact_cell.xml b/app/src/main/res/layout/contact_cell.xml
index 072abea57..a1cb61720 100644
--- a/app/src/main/res/layout/contact_cell.xml
+++ b/app/src/main/res/layout/contact_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/colorE" />
+            android:background="?attr/dividerColor" />
 
     </LinearLayout>
 
@@ -90,7 +90,7 @@
 
             <TextView
                 android:id="@+id/name"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
@@ -100,7 +100,7 @@
 
             <TextView
                 android:id="@+id/contactOrganization"
-                style="@style/font9"
+                style="@style/contact_organization_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/contact_control_row.xml b/app/src/main/res/layout/contact_control_row.xml
index af7df09c4..07c27700d 100644
--- a/app/src/main/res/layout/contact_control_row.xml
+++ b/app/src/main/res/layout/contact_control_row.xml
@@ -15,7 +15,7 @@
             android:layout_height="1dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:background="@color/colorE" />
+            android:background="?attr/dividerColor" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -28,7 +28,7 @@
                 android:layout_centerInParent="true"
                 android:layout_marginTop="10dp"
                 android:textAllCaps="true"
-                android:textColor="@color/colorE" />
+                android:textColor="?attr/primarySubtextLightColor" />
 
             <ImageView
                 android:id="@+id/friendLinphone"
@@ -57,7 +57,7 @@
 
         <TextView
             android:id="@+id/numeroOrAddress"
-            style="@style/font6"
+            style="@style/contact_name_list_cell_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fadingEdge="horizontal"
@@ -116,6 +116,7 @@
             </RelativeLayout>
 
         </LinearLayout>
+
     </LinearLayout>
 
 </TableRow>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index 53c15b54d..114d3efd9 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -2,13 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="@color/colorF"
+        android:background="?attr/lighToolbarBackgroundColor"
         android:orientation="horizontal">
 
         <ImageView
@@ -94,9 +94,8 @@
 
                 </RelativeLayout>
 
-
                 <TextView
-                    style="@style/font13"
+                    style="@style/contact_edit_form_label_font"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="10dp"
@@ -105,7 +104,7 @@
 
                 <EditText
                     android:id="@+id/contactLastName"
-                    style="@style/font6"
+                    style="@style/contact_edit_form_font"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
@@ -116,7 +115,7 @@
                     android:textCursorDrawable="@null" />
 
                 <TextView
-                    style="@style/font13"
+                    style="@style/contact_edit_form_label_font"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="10dp"
@@ -125,7 +124,7 @@
 
                 <EditText
                     android:id="@+id/contactFirstName"
-                    style="@style/font6"
+                    style="@style/contact_edit_form_font"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
@@ -137,7 +136,7 @@
 
                 <TextView
                     android:id="@+id/contactOrganizationTitle"
-                    style="@style/font13"
+                    style="@style/contact_edit_form_label_font"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="10dp"
@@ -146,7 +145,7 @@
 
                 <EditText
                     android:id="@+id/contactOrganization"
-                    style="@style/font6"
+                    style="@style/contact_edit_form_font"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
@@ -171,7 +170,7 @@
                     android:layout_gravity="center">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/contact_edit_form_label_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
@@ -212,7 +211,7 @@
                     android:layout_gravity="center">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/contact_edit_form_label_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/contact_edit_row.xml b/app/src/main/res/layout/contact_edit_row.xml
index 2452131ab..c143cdbe0 100644
--- a/app/src/main/res/layout/contact_edit_row.xml
+++ b/app/src/main/res/layout/contact_edit_row.xml
@@ -7,7 +7,7 @@
 
     <EditText
         android:id="@+id/numoraddr"
-        style="@style/font6"
+        style="@style/contact_edit_form_font"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_toStartOf="@+id/delete_field"
diff --git a/app/src/main/res/layout/contact_selected.xml b/app/src/main/res/layout/contact_selected.xml
index 5d77bff97..4825cff16 100644
--- a/app/src/main/res/layout/contact_selected.xml
+++ b/app/src/main/res/layout/contact_selected.xml
@@ -14,7 +14,7 @@
 
     <TextView
         android:id="@+id/sipUri"
-        style="@style/font6"
+        style="@style/contact_name_list_cell_font"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/contacts_list.xml b/app/src/main/res/layout/contacts_list.xml
index 132c35550..719ecd589 100644
--- a/app/src/main/res/layout/contacts_list.xml
+++ b/app/src/main/res/layout/contacts_list.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="@color/colorF"
+        android:background="?attr/lighToolbarBackgroundColor"
         android:orientation="horizontal">
 
         <RelativeLayout
@@ -31,7 +31,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA" />
+                android:background="?attr/accentColor" />
+
         </RelativeLayout>
 
         <RelativeLayout
@@ -54,7 +55,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA"
+                android:background="?attr/accentColor"
                 android:visibility="gone" />
         </RelativeLayout>
 
@@ -82,6 +83,7 @@
             android:contentDescription="@string/content_description_edit_list"
             android:padding="15dp"
             android:src="@drawable/delete" />
+
     </LinearLayout>
 
     <include layout="@layout/edit_list" />
@@ -102,7 +104,7 @@
             android:paddingRight="5dp"
             android:queryBackground="@android:color/transparent"
             android:queryHint="@string/chat_room_creation_filter_hint"
-            android:textColor="@android:color/black" />
+            android:textColor="@color/colorC" />
 
     </RelativeLayout>
 
@@ -119,8 +121,7 @@
                 android:id="@+id/contactsList"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:divider="@color/colorE"
-
+                android:divider="?attr/dividerColor"
                 android:dividerHeight="1dp" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -136,7 +137,7 @@
 
         <TextView
             android:id="@+id/noSipContact"
-            style="@style/font6"
+            style="@style/empty_list_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -146,7 +147,7 @@
 
         <TextView
             android:id="@+id/noContact"
-            style="@style/font6"
+            style="@style/empty_list_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/context_bar.xml b/app/src/main/res/layout/context_bar.xml
deleted file mode 100644
index 34a11ec34..000000000
--- a/app/src/main/res/layout/context_bar.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/context_bar"
-    android:layout_width="match_parent"
-    android:layout_height="100dp"
-    android:background="@color/colorA"
-    android:orientation="horizontal">
-
-    <!--<RelativeLayout-->
-    <!--android:id="@+id/status_bar"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:layout_alignParentTop="true">-->
-
-    <!--<ImageView-->
-    <!--android:id="@+id/side_menu_button"-->
-    <!--android:src="@drawable/menu_burger"-->
-    <!--android:contentDescription="@string/content_description_menu"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:padding="10dp"-->
-    <!--android:layout_centerInParent="true"-->
-    <!--android:layout_alignParentLeft="true"/>-->
-
-    <!--<ImageView-->
-    <!--android:id="@+id/call_quality"-->
-    <!--android:src="@drawable/call_quality_indicator_0"-->
-    <!--android:contentDescription="@string/content_description_call_quality"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:padding="10dp"-->
-    <!--android:layout_centerInParent="true"-->
-    <!--android:layout_alignParentLeft="true"-->
-    <!--android:visibility="invisible" />-->
-
-    <!--<ImageView-->
-    <!--android:id="@+id/status_led"-->
-    <!--android:src="@drawable/led_disconnected"-->
-    <!--android:paddingLeft="5dp"-->
-    <!--android:adjustViewBounds="true"-->
-    <!--android:layout_width="20dp"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_centerInParent="true"-->
-    <!--android:layout_toRightOf="@id/side_menu_button"/>-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/status_text"-->
-    <!--android:text="@string/status_not_connected"-->
-    <!--style="@style/font16"-->
-    <!--android:paddingLeft="5dp"-->
-    <!--android:layout_centerVertical="true"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:gravity="center_vertical"-->
-    <!--android:layout_toRightOf="@id/status_led" />-->
-
-    <!--<ImageView-->
-    <!--android:id="@+id/voicemail"-->
-    <!--android:src="@drawable/voicemail"-->
-    <!--android:layout_centerVertical="true"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:gravity="center_vertical"-->
-    <!--android:visibility="gone" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/voicemail_count"-->
-    <!--style="@style/font16"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:paddingLeft="5dp"-->
-    <!--android:paddingRight="10dp"-->
-    <!--android:layout_centerVertical="true"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:visibility="gone" />-->
-
-    <!--<ImageView-->
-    <!--android:id="@+id/encryption"-->
-    <!--android:src="@drawable/security_ko"-->
-    <!--android:contentDescription="@string/content_description_encryption"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:adjustViewBounds="true"-->
-    <!--android:padding="5dp"-->
-    <!--android:layout_centerInParent="true"-->
-    <!--android:visibility="gone"-->
-    <!--android:layout_alignParentRight="true" />-->
-    <!--</RelativeLayout>-->
-    <LinearLayout
-        android:id="@+id/top_bar"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:layout_alignParentBottom="true"
-        android:background="@color/colorF"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/new_discussion"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_new_discussion"
-            android:padding="15dp"
-            android:src="@drawable/chat_add" />
-
-        <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:contentDescription="@string/content_description_back_call"
-            android:padding="15dp"
-            android:src="@drawable/call_back"
-            android:visibility="invisible" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4" />
-
-        <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:contentDescription="@string/content_description_edit_list"
-            android:padding="15dp"
-            android:src="@drawable/edit_list" />
-
-        <include layout="@layout/edit_list" />
-    </LinearLayout>
-</androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialer.xml b/app/src/main/res/layout/dialer.xml
index 0bf7dff2d..f48e99dab 100644
--- a/app/src/main/res/layout/dialer.xml
+++ b/app/src/main/res/layout/dialer.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:id="@+id/dialer"
@@ -11,7 +11,6 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="50dp"
-        android:background="@color/colorH"
         android:visibility="gone"/>
 
     <RelativeLayout
@@ -19,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_alignParentTop="true"
-        android:background="@color/colorF">
+        android:background="?attr/lighToolbarBackgroundColor">
 
         <org.linphone.views.EraseButton
             android:id="@+id/erase"
@@ -34,7 +33,7 @@
 
         <org.linphone.views.AddressText
             android:id="@+id/address"
-            style="@style/font5"
+            style="@style/numpad_composed_number_font"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index c02c4728e..dd325f58e 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -26,7 +26,7 @@
 
     <TextView
         android:id="@+id/dialog_message"
-        style="@style/font14"
+        style="@style/dialog_message_font"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="15dp"
@@ -116,11 +116,11 @@
             android:id="@+id/doNotAskAgain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:button="@drawable/checkbox" />
+            android:buttonTint="?attr/accentColor" />
 
         <TextView
             android:id="@+id/doNotAskAgainLabel"
-            style="@style/font14"
+            style="@style/dialog_message_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -143,6 +143,7 @@
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
+            android:textColor="@drawable/assistant_button_text_color"
             android:ellipsize="end"
             android:padding="10dp"
             android:text="@string/cancel" />
@@ -154,6 +155,7 @@
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
+            android:textColor="@drawable/assistant_button_text_color"
             android:backgroundTint="@color/colorI"
             android:ellipsize="end"
             android:padding="10dp"
@@ -166,6 +168,7 @@
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
+            android:textColor="@drawable/assistant_button_text_color"
             android:backgroundTint="@color/colorL"
             android:ellipsize="end"
             android:padding="10dp"
diff --git a/app/src/main/res/layout/edit_list.xml b/app/src/main/res/layout/edit_list.xml
index 5d6b2513f..75e94e6aa 100644
--- a/app/src/main/res/layout/edit_list.xml
+++ b/app/src/main/res/layout/edit_list.xml
@@ -3,7 +3,7 @@
     android:id="@+id/edit_list"
     android:layout_width="match_parent"
     android:layout_height="60dp"
-    android:background="@color/colorF"
+    android:background="?attr/lighToolbarBackgroundColor"
     android:orientation="horizontal"
     android:visibility="gone">
 
@@ -53,5 +53,4 @@
         android:padding="15dp"
         android:src="@drawable/delete" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/empty_fragment.xml b/app/src/main/res/layout/empty_fragment.xml
index 36e3e6e31..ab5beddaf 100644
--- a/app/src/main/res/layout/empty_fragment.xml
+++ b/app/src/main/res/layout/empty_fragment.xml
@@ -2,13 +2,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="@color/colorF"
+        android:background="?attr/lighToolbarBackgroundColor"
         android:orientation="horizontal" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/file_upload_cell.xml b/app/src/main/res/layout/file_upload_cell.xml
index 2cdad1c83..f34ca9d7f 100644
--- a/app/src/main/res/layout/file_upload_cell.xml
+++ b/app/src/main/res/layout/file_upload_cell.xml
@@ -3,7 +3,7 @@
     android:layout_width="100dp"
     android:layout_height="100dp"
     android:layout_margin="5dp"
-    android:background="@color/colorA"
+    android:background="?attr/accentColor"
     android:orientation="vertical">
 
     <TextView
diff --git a/app/src/main/res/layout/group_contact_cell.xml b/app/src/main/res/layout/group_contact_cell.xml
deleted file mode 100644
index 40fd65968..000000000
--- a/app/src/main/res/layout/group_contact_cell.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="25dp"
-    android:layout_height="60dp"
-    android:background="@drawable/list_selector"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:padding="5dp">
-
-    <RelativeLayout
-        android:id="@+id/avatar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/contact_picture"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            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="35dp"
-            android:layout_height="35dp"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="5dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/avatar_mask" />
-
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/sip_uri"
-        style="@style/font6"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="10dp"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:lines="1"
-        android:maxLines="1" />
-
-    <ImageView
-        android:id="@+id/remove"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_centerVertical="true"
-        android:layout_gravity="right"
-        android:layout_toRightOf="@+id/layout_admin"
-        android:paddingRight="10dp"
-        android:src="@drawable/chat_group_delete" />
-
-    <LinearLayout
-        android:id="@id/layout_admin"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@id/remove"
-        android:background="@drawable/list_selector"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/contact_is_select"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="right"
-            android:paddingRight="20dp"
-            android:src="@drawable/check_selected"
-            android:visibility="invisible" />
-
-        <TextView
-            android:id="@+id/admin"
-            style="@style/font6"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            android:background="@drawable/toolbar_button"
-            android:gravity="center"
-            android:text="@string/administrator" />
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/hello_world.xml b/app/src/main/res/layout/hello_world.xml
deleted file mode 100644
index baba1e8a5..000000000
--- a/app/src/main/res/layout/hello_world.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:id="@+id/AddressId"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="sip:user@host:port"
-            android:text="sip:[user@]host[:port]"/>
-
-        <Button
-            android:id="@+id/CallButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Call"/>
-
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/MyAddressId"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="enter my sip identity (sip:[user@]host)"
-        android:text=""
-        android:visibility="gone"/>
-
-    <EditText
-        android:id="@+id/Password"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="my password"
-        android:visibility="gone"/>
-
-
-    <TextView
-        android:id="@+id/OutputText"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:text="Debug"/>
-
-    <Button
-        android:id="@+id/ButtonStop"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="STOP"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/hidden.xml b/app/src/main/res/layout/hidden.xml
index 6bf2573db..0bb2d440f 100644
--- a/app/src/main/res/layout/hidden.xml
+++ b/app/src/main/res/layout/hidden.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:visibility="gone"/>
diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
index 533dd52fe..15b455906 100644
--- a/app/src/main/res/layout/history.xml
+++ b/app/src/main/res/layout/history.xml
@@ -2,19 +2,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH">
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <RelativeLayout
@@ -36,7 +35,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:layout_alignParentBottom="true"
-                    android:background="@color/colorA" />
+                    android:background="?attr/accentColor" />
+
             </RelativeLayout>
 
             <RelativeLayout
@@ -59,7 +59,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:layout_alignParentBottom="true"
-                    android:background="@color/colorA"
+                    android:background="?attr/accentColor"
                     android:visibility="gone" />
             </RelativeLayout>
 
@@ -87,14 +87,14 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:cacheColorHint="@color/transparent"
-            android:divider="@color/colorE"
+            android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
     </LinearLayout>
 
     <TextView
         android:id="@+id/no_call_history"
-        style="@style/font6"
+        style="@style/empty_list_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
@@ -103,7 +103,7 @@
 
     <TextView
         android:id="@+id/no_missed_call_history"
-        style="@style/font6"
+        style="@style/empty_list_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout/history_cell.xml b/app/src/main/res/layout/history_cell.xml
index b40ff88f5..61993cef7 100644
--- a/app/src/main/res/layout/history_cell.xml
+++ b/app/src/main/res/layout/history_cell.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -22,7 +22,7 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/colorE" />
+            android:background="?attr/dividerColor" />
 
     </LinearLayout>
 
@@ -87,7 +87,7 @@
 
             <TextView
                 android:id="@+id/sip_uri"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="10dp"
@@ -96,6 +96,7 @@
                 android:gravity="center_vertical"
                 android:lines="1"
                 android:maxLines="1" />
+
         </RelativeLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index ec9e8b6ff..64b7bfb90 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/backgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorH"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/colorF"
+            android:background="?attr/lighToolbarBackgroundColor"
             android:orientation="horizontal">
 
             <ImageView
@@ -51,6 +51,7 @@
                 android:padding="15dp"
                 android:src="@drawable/contact"
                 android:visibility="gone" />
+
         </LinearLayout>
 
         <ScrollView
@@ -76,7 +77,7 @@
 
                 <TextView
                     android:id="@+id/contact_name"
-                    style="@style/font5"
+                    style="@style/big_contact_name_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal" />
@@ -122,7 +123,7 @@
                     <View
                         android:layout_width="wrap_content"
                         android:layout_height="1dp"
-                        android:background="@color/colorE" />
+                        android:background="?attr/dividerColor" />
 
                     <TextView
                         style="@style/font13"
diff --git a/app/src/main/res/layout/in_app.xml b/app/src/main/res/layout/in_app.xml
index 78f937b03..20985ca96 100644
--- a/app/src/main/res/layout/in_app.xml
+++ b/app/src/main/res/layout/in_app.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <fragment
diff --git a/app/src/main/res/layout/in_app_store.xml b/app/src/main/res/layout/in_app_store.xml
index aeed49f85..c66108b48 100644
--- a/app/src/main/res/layout/in_app_store.xml
+++ b/app/src/main/res/layout/in_app_store.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/incall_stats.xml b/app/src/main/res/layout/incall_stats.xml
index bb37daa48..24f59753d 100644
--- a/app/src/main/res/layout/incall_stats.xml
+++ b/app/src/main/res/layout/incall_stats.xml
@@ -11,13 +11,11 @@
 
         <TextView
             android:id="@+id/call_stats_audio"
+            style="@style/call_stats_title_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical|center"
             android:text="@string/call_stats_audio"
-            android:textColor="@color/colorB"
-            android:textSize="18sp"
-            android:textStyle="bold"
             tools:gravity="center" />
 
         <TableLayout
@@ -31,119 +29,107 @@
 
             <TextView
                 android:id="@+id/codec_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_codec"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_codec" />
 
             <TextView
                 android:id="@+id/encoder_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_encoder_name"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_encoder_name" />
 
 
             <TextView
                 android:id="@+id/decoder_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_decoder_name"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_decoder_name" />
 
 
             <TextView
                 android:id="@+id/uploadBandwith_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_upload"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_upload" />
 
             <TextView
                 android:id="@+id/downloadBandwith_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_download"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_download" />
 
 
             <TextView
                 android:id="@+id/ice_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_ice"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_ice" />
 
             <TextView
                 android:id="@+id/ip_audio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_ip"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_ip" />
 
             <TextView
                 android:id="@+id/senderLossRateAudio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_sender_loss_rate"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_sender_loss_rate" />
 
 
             <TextView
                 android:id="@+id/receiverLossRateAudio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_receiver_loss_rate"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_receiver_loss_rate" />
 
             <TextView
                 android:id="@+id/jitterBufferAudio"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_jitter_buffer"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_jitter_buffer" />
 
         </TableLayout>
 
         <TextView
             android:id="@+id/call_stats_video"
+            style="@style/call_stats_title_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical|center"
             android:text="@string/call_stats_video"
-            android:textColor="@color/colorB"
-            android:textSize="18sp"
-            android:textStyle="bold"
             tools:gravity="center" />
 
         <TableLayout
@@ -158,156 +144,141 @@
 
             <TextView
                 android:id="@+id/codec_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_codec"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_codec" />
 
 
             <TextView
                 android:id="@+id/encoder_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_encoder_name"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_encoder_name" />
 
             <TextView
                 android:id="@+id/decoder_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_decoder_name"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_decoder_name" />
 
             <TextView
                 android:id="@+id/display_filter"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_decoder_name"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_decoder_name" />
 
             <TextView
                 android:id="@+id/uploadBandwith_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_upload"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_upload" />
 
 
             <TextView
                 android:id="@+id/downloadBandwith_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_download"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_download" />
 
             <TextView
                 android:id="@+id/estimatedDownloadBandwidth_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_estimated_download"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_estimated_download" />
 
             <TextView
                 android:id="@+id/ice_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_ice"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_ice" />
 
             <TextView
                 android:id="@+id/ip_video"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_ip"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_ip" />
 
             <TextView
                 android:id="@+id/senderLossRateVideo"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_sender_loss_rate"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_sender_loss_rate" />
 
 
             <TextView
                 android:id="@+id/receiverLossRateVideo"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_receiver_loss_rate"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_receiver_loss_rate" />
 
             <TextView
                 android:id="@+id/video_resolution_sent"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_video_resolution_sent"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_video_resolution_sent" />
 
             <TextView
                 android:id="@+id/video_resolution_received"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_video_resolution_received"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_video_resolution_received" />
 
             <TextView
                 android:id="@+id/video_fps_sent"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_video_fps_sent"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_video_fps_sent" />
 
             <TextView
                 android:id="@+id/video_fps_received"
+                style="@style/call_stats_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:paddingLeft="5dp"
-                android:text="@string/call_stats_video_fps_received"
-                android:textColor="@color/colorB"
-                android:textSize="12sp" />
+                android:text="@string/call_stats_video_fps_received" />
 
         </TableLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/launch_screen.xml b/app/src/main/res/layout/launch_screen.xml
index 37a53fdff..e81d8461d 100644
--- a/app/src/main/res/layout/launch_screen.xml
+++ b/app/src/main/res/layout/launch_screen.xml
@@ -17,7 +17,7 @@
             android:src="@drawable/splashscreen" />
 
         <TextView
-            style="@style/font21"
+            style="@style/splash_screen_app_name_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -26,12 +26,11 @@
             android:visibility="gone" />
 
         <TextView
+            style="@style/splash_screen_subtitle_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/app_description"
-            android:textColor="@color/colorA"
-            android:textSize="28sp" />
+            android:text="@string/app_description" />
 
     </LinearLayout>
 
@@ -39,6 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
+        android:indeterminateTint="@color/colorA"
         android:layout_marginBottom="20dp" />
 
     <View
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index c28e20851..9acaf7dd1 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -25,7 +25,7 @@
                 android:id="@+id/top_bar"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
-                android:background="@color/colorF"
+                android:background="?attr/lighToolbarBackgroundColor"
                 android:orientation="horizontal"
                 android:visibility="gone">
 
@@ -41,7 +41,7 @@
 
                 <TextView
                     android:id="@+id/top_bar_title"
-                    style="@style/font1"
+                    style="@style/toolbar_title_font"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
@@ -104,12 +104,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_calls"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="15dp"
@@ -139,7 +139,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
                 </RelativeLayout>
 
@@ -163,7 +163,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA" />
+                        android:background="?attr/accentColor" />
 
                 </RelativeLayout>
 
@@ -187,12 +187,12 @@
                         android:layout_width="match_parent"
                         android:layout_height="5dp"
                         android:layout_alignParentBottom="true"
-                        android:background="@color/colorA"
+                        android:background="?attr/accentColor"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/missed_chats"
-                        style="@style/font18"
+                        style="@style/unread_count_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="15dp"
@@ -227,7 +227,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_alignParentBottom="true"
-                android:background="@color/colorA"
+                android:background="?attr/accentColor"
                 android:gravity="bottom">
 
                 <ImageView
@@ -241,7 +241,7 @@
 
                 <TextView
                     android:id="@+id/quit"
-                    style="@style/font14"
+                    style="@style/quit_button_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
@@ -254,7 +254,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@id/side_menu_quit"
-                android:background="@color/colorH"
+                android:background="?attr/backgroundColor"
                 android:orientation="vertical">
 
                 <include layout="@layout/side_menu_main_account" />
@@ -263,7 +263,6 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorH"
                     android:cacheColorHint="@color/transparent"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
@@ -273,17 +272,10 @@
                     android:id="@+id/item_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorH"
                     android:choiceMode="singleChoice"
-                    android:divider="@color/colorE"
+                    android:divider="?dividerColor"
                     android:dividerHeight="1dp"
-                    android:footerDividersEnabled="true"
-                    android:listSelector="@color/colorH" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/colorE" />
+                    android:footerDividersEnabled="true" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/numpad.xml b/app/src/main/res/layout/numpad.xml
index 73c56ce87..2654b0d61 100644
--- a/app/src/main/res/layout/numpad.xml
+++ b/app/src/main/res/layout/numpad.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/progress_dialog.xml b/app/src/main/res/layout/progress_dialog.xml
deleted file mode 100644
index 009b84654..000000000
--- a/app/src/main/res/layout/progress_dialog.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:indeterminateTint="@color/colorA" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recording_cell.xml b/app/src/main/res/layout/recording_cell.xml
index d7be862b8..eac9dbabc 100644
--- a/app/src/main/res/layout/recording_cell.xml
+++ b/app/src/main/res/layout/recording_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/colorE" />
+            android:background="?attr/dividerColor" />
 
     </LinearLayout>
 
@@ -66,7 +66,7 @@
 
             <LinearLayout
                 android:id="@+id/record_description"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
@@ -130,8 +130,8 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
-                android:progressTint="@color/colorA"
-                android:thumbTint="@color/colorA" />
+                android:progressTint="?attr/accentColor"
+                android:thumbTint="?attr/accentColor" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index 63589d32b..9375bc5bb 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="@color/colorF"
+        android:background="?attr/lighToolbarBackgroundColor"
         android:orientation="horizontal">
 
         <ImageView
@@ -55,7 +55,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:cacheColorHint="@color/transparent"
-            android:divider="@color/colorE"
+            android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
         <ProgressBar
@@ -69,7 +69,7 @@
 
         <TextView
             android:id="@+id/no_recordings"
-            style="@style/font6"
+            style="@style/empty_list_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/remote_provisioning.xml b/app/src/main/res/layout/remote_provisioning.xml
index 28473eb8b..e2e8cd60d 100644
--- a/app/src/main/res/layout/remote_provisioning.xml
+++ b/app/src/main/res/layout/remote_provisioning.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <ImageView
diff --git a/app/src/main/res/layout/search_contact_cell.xml b/app/src/main/res/layout/search_contact_cell.xml
index 9d0233529..0b0ce2b05 100644
--- a/app/src/main/res/layout/search_contact_cell.xml
+++ b/app/src/main/res/layout/search_contact_cell.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="60dp">
+    android:layout_height="60dp"
+    android:background="?attr/backgroundColor">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/list_selector"
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:padding="5dp">
@@ -30,13 +30,12 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="70dp"
             android:layout_toRightOf="@id/avatar"
-            android:background="@drawable/list_selector"
             android:gravity="center_vertical"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/contact_name"
-                style="@style/font6"
+                style="@style/contact_name_list_cell_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="top|left"
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 d01d94027..c06be0ae5 100644
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ b/app/src/main/res/layout/side_menu_account_cell.xml
@@ -25,5 +25,5 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/colorH" />
+        android:background="?attr/backgroundColor" />
 </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 a0a927934..2e7331389 100644
--- a/app/src/main/res/layout/side_menu_item_cell.xml
+++ b/app/src/main/res/layout/side_menu_item_cell.xml
@@ -9,6 +9,7 @@
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:padding="10dp"
+        android:tint="?attr/drawableDarkModeTintColor"
         android:src="@drawable/menu_about" />
 
     <TextView
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 d1a7f76b3..0ed0c7e08 100644
--- a/app/src/main/res/layout/side_menu_main_account.xml
+++ b/app/src/main/res/layout/side_menu_main_account.xml
@@ -3,7 +3,7 @@
     android:id="@+id/default_account"
     android:layout_width="match_parent"
     android:layout_height="70dp"
-    android:background="@color/colorF"
+    android:background="?attr/lighToolbarBackgroundColor"
     android:contentDescription="@string/content_description_default_account">
 
     <ImageView
@@ -25,7 +25,7 @@
 
         <TextView
             android:id="@+id/main_account_display_name"
-            style="@style/font7"
+            style="@style/main_account_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/status.xml b/app/src/main/res/layout/status.xml
index 6efb7a620..ffefcb6a8 100644
--- a/app/src/main/res/layout/status.xml
+++ b/app/src/main/res/layout/status.xml
@@ -3,7 +3,7 @@
     android:id="@+id/status"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:background="@color/colorA"
+    android:background="?attr/accentColor"
     android:orientation="horizontal">
 
     <RelativeLayout
@@ -44,7 +44,7 @@
 
         <TextView
             android:id="@+id/status_text"
-            style="@style/font16"
+            style="@style/status_bar_font"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
@@ -64,7 +64,7 @@
 
         <TextView
             android:id="@+id/voicemail_count"
-            style="@style/font16"
+            style="@style/status_bar_font"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
@@ -84,5 +84,7 @@
             android:padding="5dp"
             android:src="@drawable/security_ko"
             android:visibility="gone" />
+
     </RelativeLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
index 09a425d4b..6f5ef8c72 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/app/src/main/res/layout/toast.xml
@@ -3,7 +3,7 @@
     android:id="@+id/toastRoot"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/colorB"
+    android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
     <TextView
@@ -12,6 +12,6 @@
         android:layout_height="wrap_content"
         android:padding="5dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@android:color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/wait_layout.xml b/app/src/main/res/layout/wait_layout.xml
index cba8dbd88..4c7dab114 100644
--- a/app/src/main/res/layout/wait_layout.xml
+++ b/app/src/main/res/layout/wait_layout.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:indeterminate="true"
-        android:indeterminateTint="@color/colorA">
+        android:indeterminateTint="?attr/accentColor">
 
     </ProgressBar>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..dda4b954b
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="LinphoneAppTheme">
+        <attr name="accentColor" format="color"/>
+        <attr name="accentTextColor" format="color"/>
+        <attr name="primaryTextColor" format="color"/>
+        <attr name="secondaryTextColor" format="color"/>
+        <attr name="primarySubtextDarkColor" format="color"/>
+        <attr name="primarySubtextLightColor" format="color"/>
+        <attr name="backgroundColor" format="color"/>
+        <attr name="dividerColor" format="color"/>
+        <attr name="drawableTintColor" format="color"/>
+        <attr name="drawableTintDisabledColor" format="color"/>
+        <attr name="drawableTintOverColor" format="color"/>
+        <attr name="drawableDarkModeTintColor" format="color"/>
+        <attr name="lighToolbarBackgroundColor" format="color"/>
+        <attr name="lighToolbarBackgroundDisabledColor" format="color"/>
+        <attr name="lighToolbarTextColor" format="color"/>
+        <attr name="darkToolbarBackgroundColor" format="color"/>
+        <attr name="darkToolbarTextColor" format="color"/>
+    </declare-styleable>
+</resources>
\ 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 001aafa32..084f5db29 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -21,7 +21,8 @@
     <color name="security_gray">#c2c2c2</color>
     <color name="security_thumb">#ffffff</color>
     <color name="chat_bubble_incoming">#f3f3f3</color>
-    <color name="chat_bubble_outgoing">#19ff5e00</color>
+    <color name="chat_bubble_outgoing">#ffeee5</color>
+    <color name="colorDisabled">#464646</color>
 
     <color name="transparent">#00000000</color>
     <color name="linphone_launcher_icon_background">@color/colorA</color>
diff --git a/app/src/main/res/values/non_localizable_strings.xml b/app/src/main/res/values/non_localizable_strings.xml
index bb767ba6a..0bd366991 100644
--- a/app/src/main/res/values/non_localizable_strings.xml
+++ b/app/src/main/res/values/non_localizable_strings.xml
@@ -5,6 +5,8 @@
 
     <string name="dummy_group_chat_subject">dummy subject</string>
 
+    <string name="pref_dark_mode_key">pref_dark_mode_key</string>
+
     <item name="contact_search_name" type="id" />
     <string name="pref_disable_account_key">pref_disable_account_key</string>
     <string name="pref_extra_accounts">pref_nb_accounts_extra</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 534faaefd..7a47b2170 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -469,6 +469,7 @@
 
     <!-- Advanced settings -->
     <string name="pref_advanced_title">Advanced</string>
+    <string name="pref_dark_mode">Dark Mode</string>
     <string name="pref_debug_title">Debug</string>
     <string name="pref_debug">Debug</string>
     <string name="pref_java_debug">Use Java logger</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b1533b46..1b0eb5b31 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,60 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Default" parent="android:Theme.Holo.Light" />
+    <style name="LinphoneStyleLight" parent="Theme.AppCompat.NoActionBar">
+        <item name="accentColor">@color/colorA</item>
+        <item name="accentTextColor">@color/colorH</item>
+        <item name="primaryTextColor">@color/colorC</item>
+        <item name="secondaryTextColor">@color/colorH</item>
+        <item name="primarySubtextDarkColor">@color/colorD</item>
+        <item name="primarySubtextLightColor">@color/colorE</item>
+        <item name="backgroundColor">@color/colorH</item>
+        <item name="dividerColor">@color/colorE</item>
+        <item name="drawableTintColor">@color/colorC</item>
+        <item name="drawableTintDisabledColor">@color/colorDisabled</item>
+        <item name="drawableTintOverColor">@color/colorA</item>
+        <item name="drawableDarkModeTintColor">@color/colorC</item>
+        <item name="lighToolbarBackgroundColor">@color/colorF</item>
+        <item name="lighToolbarBackgroundDisabledColor">@color/colorE</item>
+        <item name="lighToolbarTextColor">@color/colorC</item>
+        <item name="darkToolbarBackgroundColor">@color/colorC</item>
+        <item name="darkToolbarTextColor">@color/colorH</item>
+    </style>
 
-    <style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar" />
+    <style name="LinphoneStyleDark" parent="Theme.AppCompat.NoActionBar">
+        <item name="accentColor">@color/colorA</item>
+        <item name="accentTextColor">@color/colorH</item>
+        <item name="primaryTextColor">@color/colorH</item>
+        <item name="secondaryTextColor">@color/colorC</item>
+        <item name="primarySubtextDarkColor">@color/colorG</item>
+        <item name="primarySubtextLightColor">@color/colorF</item>
+        <item name="backgroundColor">@color/colorC</item>
+        <item name="drawableDarkModeTintColor">@color/colorH</item>
 
-    <style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar" />
+        <!-- Same value for now -->
+        <item name="dividerColor">@color/colorE</item>
+        <item name="drawableTintColor">@color/colorC</item>
+        <item name="drawableTintDisabledColor">@color/colorDisabled</item>
+        <item name="drawableTintOverColor">@color/colorA</item>
+        <item name="lighToolbarBackgroundColor">@color/colorF</item>
+        <item name="lighToolbarBackgroundDisabledColor">@color/colorE</item>
+        <item name="lighToolbarTextColor">@color/colorC</item>
+        <item name="darkToolbarBackgroundColor">@color/colorC</item>
+        <item name="darkToolbarTextColor">@color/colorH</item>
+    </style>
+
+    <style name="main_account_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/lighToolbarTextColor</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="toolbar_title_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/accentColor</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">24sp</item>
+    </style>
 
     <style name="font1" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorA</item>
+        <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">24sp</item>
     </style>
 
     <style name="font2" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorA</item>
+        <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="font3" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorA</item>
+        <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="font4" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorB</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">21sp</item>
-    </style>
-
-    <style name="font5" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+    <style name="big_contact_name_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">30sp</item>
     </style>
 
-    <style name="font6" parent="@android:style/TextAppearance.Medium">
+    <style name="font5" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">30sp</item>
+    </style>
+
+    <style name="toolbar_small_title_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/colorC</item>
         <item name="android:textSize">18sp</item>
     </style>
 
+    <style name="contact_name_list_cell_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="empty_list_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="contact_edit_form_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="font6" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
     <style name="font7" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">18sp</item>
     </style>
 
     <style name="font8" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="font9" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorC</item>
+    <style name="contact_organization_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">13sp</item>
     </style>
 
@@ -64,7 +131,7 @@
     </style>
 
     <style name="font11" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
+        <item name="android:textColor">?attr/primarySubtextDarkColor</item>
         <item name="android:textSize">15sp</item>
     </style>
 
@@ -73,35 +140,45 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="contact_edit_form_label_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/colorE</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
     <style name="font13" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/colorE</item>
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="font14" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+    <style name="call_contact_name_paused_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">21sp</item>
     </style>
 
     <style name="font15" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="font16" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">15sp</item>
     </style>
 
     <style name="font17" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">13sp</item>
     </style>
 
+    <style name="unread_count_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
+        <item name="android:textSize">10sp</item>
+    </style>
+
     <style name="font18" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">10sp</item>
     </style>
 
@@ -117,14 +194,19 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="font21" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/colorH</item>
+    <style name="splash_screen_app_name_font" parent="@android:style/TextAppearance.Large">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">50sp</item>
     </style>
 
+    <style name="splash_screen_subtitle_font" parent="@android:style/TextAppearance.Large">
+        <item name="android:textColor">?attr/accentColor</item>
+        <item name="android:textSize">28sp</item>
+    </style>
+
     <style name="font22" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">25sp</item>
@@ -137,18 +219,24 @@
     </style>
 
     <style name="font24" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorB</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="font25" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+    <style name="generated_contact_avatar_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">21sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="contact_avatar_letters_big" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">@color/colorH</item>
+    <style name="font25" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
+        <item name="android:textSize">21sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="generated_contact_avatar_big_font" parent="@android:style/TextAppearance.Large">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">70sp</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -188,27 +276,32 @@
     </style>
 
     <style name="chat_bubble_file_name_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">11.7sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="contact_invite_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorA</item>
+        <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textSize">16.7sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">16.7sp</item>
     </style>
 
     <style name="dialog_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">21.7sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">6.7sp</item>
     </style>
 
+    <style name="dialog_message_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/subtitleTextColor</item>
+        <item name="android:textSize">21sp</item>
+    </style>
+
     <style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/colorL</item>
         <item name="android:textSize">20sp</item>
@@ -218,21 +311,21 @@
     </style>
 
     <style name="dialog_zrtp_white_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">8.3sp</item>
     </style>
 
-    <style name="font_group_chat_event" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorE</item>
+    <style name="group_chat_event_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primarySubtextLightColor</item>
         <item name="android:textSize">13sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">0sp</item>
         <item name="android:textStyle">italic</item>
     </style>
 
-    <style name="font_group_chat_security_event" parent="@android:style/TextAppearance.Medium">
+    <style name="group_chat_security_event_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">@color/colorI</item>
         <item name="android:textSize">13sp</item>
         <item name="android:fontFamily">sans-serif</item>
@@ -240,4 +333,29 @@
         <item name="android:textStyle">italic</item>
     </style>
 
+    <style name="status_bar_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/accentTextColor</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="quit_button_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/accentTextColor</item>
+        <item name="android:textSize">21sp</item>
+    </style>
+
+    <style name="numpad_composed_number_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/lighToolbarTextColor</item>
+        <item name="android:textSize">30sp</item>
+    </style>
+
+    <style name="call_stats_title_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="call_stats_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e8cfb0d53..ccae5f882 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -379,6 +379,11 @@
             android:key="@string/pref_advanced_key"
             android:title="@string/pref_advanced_title">
 
+            <CheckBoxPreference
+                android:key="@string/pref_dark_mode_key"
+                android:persistent="false"
+                android:title="@string/pref_dark_mode" />
+
             <PreferenceCategory android:title="@string/pref_debug_title">
 
                 <CheckBoxPreference