diff --git a/app/build.gradle b/app/build.gradle
index ef6ccbc6..26c2c7b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:8663595392'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:6cc19172f0'
     implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c888ed58..111dad78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,21 +60,11 @@
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
-        <activity
-            android:name="com.simplemobiletools.commons.activities.LicenseActivity"
-            android:label="@string/third_party_licences"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
-
         <activity
             android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
             android:label="@string/customize_colors"
             android:parentActivityName=".activities.SettingsActivity" />
 
-        <activity
-            android:name="com.simplemobiletools.commons.activities.FAQActivity"
-            android:label="@string/frequently_asked_questions"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
-
         <activity
             android:name="com.simplemobiletools.commons.activities.ManageBlockedNumbersActivity"
             android:label="@string/blocked_numbers"
@@ -92,16 +82,16 @@
 
         <activity
             android:name=".activities.CallActivity"
-            android:label="@string/ongoing_call"
             android:excludeFromRecents="true"
+            android:label="@string/ongoing_call"
             android:screenOrientation="portrait"
             android:showOnLockScreen="true" />
 
         <activity
             android:name=".activities.DialpadActivity"
             android:label="@string/dialpad"
-            android:windowSoftInputMode="stateHidden"
-            android:parentActivityName=".activities.MainActivity">
+            android:parentActivityName=".activities.MainActivity"
+            android:windowSoftInputMode="stateHidden">
 
             <intent-filter>
                 <action android:name="android.intent.action.DIAL" />
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
index 7820c0c2..5bf6f75c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -292,7 +292,7 @@ class MainActivity : SimpleActivity() {
     private fun getTabIcon(position: Int): Drawable {
         val drawableId = when (position) {
             0 -> R.drawable.ic_person_vector
-            1 -> R.drawable.ic_star_on_vector
+            1 -> R.drawable.ic_star_vector
             else -> R.drawable.ic_clock_vector
         }
 
diff --git a/app/src/main/res/drawable/ic_backspace_vector.xml b/app/src/main/res/drawable/ic_backspace_vector.xml
index a5553c2a..27a88337 100644
--- a/app/src/main/res/drawable/ic_backspace_vector.xml
+++ b/app/src/main/res/drawable/ic_backspace_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M22 3H7C6.31 3 5.77 3.35 5.41 3.88l-5.04 7.57c-0.22 0.34-0.22 0.77 0 1.11l5.04 7.56C5.77 20.64 6.31 21 7 21h15c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-3.7 13.3c-0.39 0.39-1.02 0.39-1.41 0L14 13.41l-2.89 2.89c-0.39 0.39-1.02 0.39-1.41 0-0.39-0.39-0.39-1.02 0-1.41L12.59 12 9.7 9.11c-0.39-0.39-0.39-1.02 0-1.41 0.39-0.39 1.02-0.39 1.41 0L14 10.59l2.89-2.89c0.39-0.39 1.02-0.39 1.41 0 0.39 0.39 0.39 1.02 0 1.41L15.41 12l2.89 2.89c0.38 0.38 0.38 1.02 0 1.41z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_call_accept.xml b/app/src/main/res/drawable/ic_call_accept.xml
index 546b3ac0..fa13df76 100644
--- a/app/src/main/res/drawable/ic_call_accept.xml
+++ b/app/src/main/res/drawable/ic_call_accept.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_foreground">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/ripple_foreground">
     <item android:id="@+id/shortcut_dialpad_background">
         <shape android:shape="oval">
-            <solid android:color="@color/md_green_700" />
+            <solid android:color="@color/md_green_700"/>
         </shape>
     </item>
-
-    <item
-        android:bottom="@dimen/medium_margin"
-        android:drawable="@drawable/ic_phone_vector"
-        android:left="@dimen/medium_margin"
-        android:right="@dimen/medium_margin"
-        android:top="@dimen/medium_margin" />
+    <item android:bottom="@dimen/medium_margin" android:drawable="@drawable/ic_phone_vector" android:left="@dimen/medium_margin" android:right="@dimen/medium_margin" android:top="@dimen/medium_margin"/>
 </ripple>
diff --git a/app/src/main/res/drawable/ic_call_decline.xml b/app/src/main/res/drawable/ic_call_decline.xml
index 5754ba70..e755ba89 100644
--- a/app/src/main/res/drawable/ic_call_decline.xml
+++ b/app/src/main/res/drawable/ic_call_decline.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_foreground">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/ripple_foreground">
     <item android:id="@+id/shortcut_dialpad_background">
         <shape android:shape="oval">
-            <solid android:color="@color/md_red_700" />
+            <solid android:color="@color/md_red_700"/>
         </shape>
     </item>
-
-    <item
-        android:bottom="@dimen/medium_margin"
-        android:drawable="@drawable/ic_phone_down_vector"
-        android:left="@dimen/medium_margin"
-        android:right="@dimen/medium_margin"
-        android:top="@dimen/medium_margin" />
+    <item android:bottom="@dimen/medium_margin" android:drawable="@drawable/ic_phone_down_vector" android:left="@dimen/medium_margin" android:right="@dimen/medium_margin" android:top="@dimen/medium_margin"/>
 </ripple>
diff --git a/app/src/main/res/drawable/ic_incoming_call_vector.xml b/app/src/main/res/drawable/ic_incoming_call_vector.xml
index 4c09ba11..193643af 100644
--- a/app/src/main/res/drawable/ic_incoming_call_vector.xml
+++ b/app/src/main/res/drawable/ic_incoming_call_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="m4.9875,10.4243c1.877,3.6888 4.901,6.6997 8.5897,8.5897l2.8676,-2.8676c0.3519,-0.3519 0.8733,-0.4692 1.3295,-0.3128 1.4599,0.4823 3.037,0.743 4.6533,0.743 0.7169,0 1.3034,0.5866 1.3034,1.3034l0,4.549c0,0.7169 -0.5866,1.3034 -1.3034,1.3034 -12.2394,0 -22.1586,-9.9192 -22.1586,-22.1586 0,-0.7169 0.5866,-1.3034 1.3034,-1.3034l4.5621,0c0.7169,0 1.3034,0.5866 1.3034,1.3034 0,1.6293 0.2607,3.1934 0.743,4.6533 0.1434,0.4562 0.0391,0.9646 -0.3259,1.3295L4.9875,10.4243ZM22.6361,1.1699 L21.7107,0.2575 13.3034,8.4692l0,-5.5918 -1.3034,0 0,7.8207 7.8207,0 0,-1.3034 -5.4093,0z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19.23 15.26l-2.54-0.29c-0.61-0.07-1.21 0.14-1.64 0.57l-1.84 1.84c-2.83-1.44-5.15-3.75-6.59-6.59l1.85-1.85C8.9 8.51 9.11 7.91 9.04 7.3L8.75 4.78C8.63 3.77 7.78 3.01 6.76 3.01H5.03c-1.13 0-2.07 0.94-2 2.07 0.53 8.54 7.36 15.36 15.89 15.89 1.13 0.07 2.07-0.87 2.07-2v-1.73c0.01-1.01-0.75-1.86-1.76-1.98zM13 11h4c0.55 0 1-0.45 1-1s-0.45-1-1-1h-1.59l4.31-4.31c0.39-0.39 0.39-1.02 0-1.41s-1.02-0.39-1.41 0L14 7.59V6c0-0.55-0.45-1-1-1s-1 0.45-1 1v4c0 0.55 0.45 1 1 1z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9c..7e75e545 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:fillColor="#3DDC84" android:pathData="M0 0h108v108H0z"/>
+    <path android:pathData="M9 0v108M19 0v108M29 0v108M39 0v108M49 0v108M59 0v108M69 0v108M79 0v108M89 0v108M99 0v108M0 9h108M0 19h108M0 29h108M0 39h108M0 49h108M0 59h108M0 69h108M0 79h108M0 89h108M0 99h108M19 29h70M19 39h70M19 49h70M19 59h70M19 69h70M19 79h70M29 19v70m10-70v70m10-70v70m10-70v70m10-70v70m10-70v70" android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_microphone_off_vector.xml b/app/src/main/res/drawable/ic_microphone_off_vector.xml
index c05115e4..64a7001f 100644
--- a/app/src/main/res/drawable/ic_microphone_off_vector.xml
+++ b/app/src/main/res/drawable/ic_microphone_off_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,11C19,11 19.0088,9.8569 18.1571,9.8714 17.362,9.885 17.3,11 17.3,11c0,0.74 -0.16,1.43 -0.43,2.05l1.23,1.23C18.66,13.3 19,12.19 19,11ZM14.98,11.17C14.98,11.11 15,11.06 15,11L15,5C15,3.34 13.66,2 12,2 10.34,2 9,3.34 9,5L9,5.18ZM4.27,3 L3,4.27l6.01,6.01 0,0.72c0,1.66 1.33,3 2.99,3 0.22,0 0.44,-0.03 0.65,-0.08l1.66,1.66C13.6,15.91 12.81,16.1 12,16.1 9.24,16.1 6.7,14 6.7,11 6.7,11 6.6686,9.9807 5.8435,9.992 5.0185,10.0033 5,11 5,11c0,3.41 2.72,6.23 6,6.72L11,21c0,0 -0.0013,1.036 1.0127,1.0169C12.9886,21.9987 13,21 13,21l0,-3.28c0.91,-0.13 1.77,-0.45 2.54,-0.9L19.73,21 21,19.73Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M15 10.6V5c0-1.66-1.34-3-3-3-1.54 0-2.79 1.16-2.96 2.65L15 10.6zm3.08 0.4c-0.41 0-0.77 0.3-0.83 0.71-0.05 0.32-0.12 0.64-0.22 0.93l1.27 1.27c0.3-0.6 0.52-1.25 0.63-1.94C19 11.46 18.6 11 18.08 11zM3.71 3.56c-0.39 0.39-0.39 1.02 0 1.41L9 10.27v0.43c0 1.19 0.6 2.32 1.63 2.91 0.75 0.43 1.41 0.44 2.02 0.31l1.66 1.66c-0.71 0.33-1.5 0.52-2.31 0.52-2.54 0-4.88-1.77-5.25-4.39C6.69 11.3 6.33 11 5.92 11 5.4 11 5 11.46 5.07 11.97c0.46 2.96 2.96 5.3 5.93 5.75V20c0 0.55 0.45 1 1 1s1-0.45 1-1v-2.28c0.91-0.13 1.77-0.45 2.55-0.9l3.49 3.49c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39-1.02 0-1.41L5.12 3.56c-0.39-0.39-1.02-0.39-1.41 0z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outgoing_call_vector.xml b/app/src/main/res/drawable/ic_outgoing_call_vector.xml
index c132392a..798111a8 100644
--- a/app/src/main/res/drawable/ic_outgoing_call_vector.xml
+++ b/app/src/main/res/drawable/ic_outgoing_call_vector.xml
@@ -1,9 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="m12,9.7857 l0.9254,0.9124 8.4072,-8.2117 0,5.5918 1.3034,0 0,-7.8207 -7.8207,0 0,1.3034 5.4093,0zM4.9875,10.4243c1.877,3.6888 4.901,6.6997 8.5897,8.5897l2.8676,-2.8676c0.3519,-0.3519 0.8733,-0.4692 1.3295,-0.3128 1.4599,0.4823 3.037,0.743 4.6533,0.743 0.7169,0 1.3034,0.5866 1.3034,1.3034l0,4.549c0,0.7169 -0.5866,1.3034 -1.3034,1.3034 -12.2394,0 -22.1586,-9.9192 -22.1586,-22.1586 0,-0.7169 0.5866,-1.3034 1.3034,-1.3034l4.5621,0c0.7169,0 1.3034,0.5866 1.3034,1.3034 0,1.6293 0.2607,3.1934 0.743,4.6533 0.1434,0.4562 0.0391,0.9646 -0.3259,1.3295L4.9875,10.4243Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M19.23 15.26l-2.54-0.29c-0.61-0.07-1.21 0.14-1.64 0.57l-1.84 1.84c-2.83-1.44-5.15-3.75-6.59-6.59l1.85-1.85C8.9 8.51 9.11 7.91 9.04 7.3L8.75 4.78C8.63 3.77 7.78 3.01 6.76 3.01H5.03c-1.13 0-2.07 0.94-2 2.07 0.53 8.54 7.36 15.36 15.89 15.89 1.13 0.07 2.07-0.87 2.07-2v-1.73c0.01-1.01-0.75-1.86-1.76-1.98z" android:fillColor="#FFFFFF"/>
+    <path android:pathData="M19.012 2.987h-4c-0.55 0-1 0.45-1 1s0.45 1 1 1h1.59l-4.31 4.31c-0.39 0.39-0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0l4.31-4.31v1.59c0 0.55 0.45 1 1 1s1-0.45 1-1v-4c0-0.55-0.45-1-1-1z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_phone_down_red_vector.xml b/app/src/main/res/drawable/ic_phone_down_red_vector.xml
index 763a320e..0441923e 100644
--- a/app/src/main/res/drawable/ic_phone_down_red_vector.xml
+++ b/app/src/main/res/drawable/ic_phone_down_red_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/md_red_700"
-        android:pathData="M23.4267,12.2343C20.4492,9.413 16.4272,7.6753 11.9951,7.6753c-4.4321,0 -8.4541,1.7377 -11.4316,4.559 -0.1757,0.1757 -0.2831,0.4198 -0.2831,0.6931 0,0.2733 0.1074,0.5174 0.2831,0.6931l2.421,2.421c0.1757,0.1757 0.4198,0.2831 0.6931,0.2831 0.2636,0 0.5076,-0.1074 0.6834,-0.2733 0.7712,-0.7224 1.6498,-1.3277 2.5968,-1.806 0.3222,-0.1562 0.5467,-0.4881 0.5467,-0.8786l0,-3.0263C8.92,9.8718 10.4332,9.6278 11.9951,9.6278c1.562,0 3.0751,0.2441 4.4906,0.7029l0,3.0263c0,0.3807 0.2245,0.7224 0.5467,0.8786 0.9567,0.4783 1.8255,1.0934 2.6065,1.806 0.1757,0.1757 0.4198,0.2733 0.6834,0.2733 0.2733,0 0.5174,-0.1074 0.6931,-0.2831l2.421,-2.421c0.1757,-0.1757 0.2831,-0.4198 0.2831,-0.6931 0,-0.2733 -0.1171,-0.5076 -0.2929,-0.6834z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/md_red_700" android:pathData="M23.427 12.234c-2.978-2.821-7-4.559-11.432-4.559s-8.454 1.738-11.431 4.56c-0.176 0.175-0.284 0.42-0.284 0.692 0 0.274 0.108 0.518 0.284 0.694l2.42 2.42c0.176 0.176 0.42 0.284 0.694 0.284 0.263 0 0.507-0.108 0.683-0.274 0.771-0.722 1.65-1.327 2.597-1.806 0.322-0.156 0.547-0.488 0.547-0.878V10.34c1.415-0.468 2.928-0.712 4.49-0.712 1.562 0 3.075 0.244 4.49 0.703v3.026c0 0.38 0.225 0.722 0.547 0.879 0.957 0.478 1.826 1.093 2.607 1.806 0.176 0.175 0.42 0.273 0.683 0.273 0.274 0 0.518-0.108 0.693-0.283l2.421-2.421c0.176-0.176 0.284-0.42 0.284-0.693 0-0.274-0.118-0.508-0.293-0.684z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_phone_down_vector.xml b/app/src/main/res/drawable/ic_phone_down_vector.xml
index 6487b6a6..0bd7cb06 100644
--- a/app/src/main/res/drawable/ic_phone_down_vector.xml
+++ b/app/src/main/res/drawable/ic_phone_down_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M23.4267,12.2343C20.4492,9.413 16.4272,7.6753 11.9951,7.6753c-4.4321,0 -8.4541,1.7377 -11.4316,4.559 -0.1757,0.1757 -0.2831,0.4198 -0.2831,0.6931 0,0.2733 0.1074,0.5174 0.2831,0.6931l2.421,2.421c0.1757,0.1757 0.4198,0.2831 0.6931,0.2831 0.2636,0 0.5076,-0.1074 0.6834,-0.2733 0.7712,-0.7224 1.6498,-1.3277 2.5968,-1.806 0.3222,-0.1562 0.5467,-0.4881 0.5467,-0.8786l0,-3.0263C8.92,9.8718 10.4332,9.6278 11.9951,9.6278c1.562,0 3.0751,0.2441 4.4906,0.7029l0,3.0263c0,0.3807 0.2245,0.7224 0.5467,0.8786 0.9567,0.4783 1.8255,1.0934 2.6065,1.806 0.1757,0.1757 0.4198,0.2733 0.6834,0.2733 0.2733,0 0.5174,-0.1074 0.6931,-0.2831l2.421,-2.421c0.1757,-0.1757 0.2831,-0.4198 0.2831,-0.6931 0,-0.2733 -0.1171,-0.5076 -0.2929,-0.6834z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M23.427 12.234c-2.978-2.821-7-4.559-11.432-4.559s-8.454 1.738-11.431 4.56c-0.176 0.175-0.284 0.42-0.284 0.692 0 0.274 0.108 0.518 0.284 0.694l2.42 2.42c0.176 0.176 0.42 0.284 0.694 0.284 0.263 0 0.507-0.108 0.683-0.274 0.771-0.722 1.65-1.327 2.597-1.806 0.322-0.156 0.547-0.488 0.547-0.878V10.34c1.415-0.468 2.928-0.712 4.49-0.712 1.562 0 3.075 0.244 4.49 0.703v3.026c0 0.38 0.225 0.722 0.547 0.879 0.957 0.478 1.826 1.093 2.607 1.806 0.176 0.175 0.42 0.273 0.683 0.273 0.274 0 0.518-0.108 0.693-0.283l2.421-2.421c0.176-0.176 0.284-0.42 0.284-0.693 0-0.274-0.118-0.508-0.293-0.684z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_phone_green_vector.xml b/app/src/main/res/drawable/ic_phone_green_vector.xml
index 312e1562..cc8f5b03 100644
--- a/app/src/main/res/drawable/ic_phone_green_vector.xml
+++ b/app/src/main/res/drawable/ic_phone_green_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/md_green_700"
-        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/md_green_700" android:pathData="M6.62 10.79c1.44 2.83 3.76 5.14 6.59 6.59l2.2-2.2c0.27-0.27 0.67-0.36 1.02-0.24 1.12 0.37 2.33 0.57 3.57 0.57 0.55 0 1 0.45 1 1V20c0 0.55-0.45 1-1 1-9.39 0-17-7.61-17-17 0-0.55 0.45-1 1-1h3.5c0.55 0 1 0.45 1 1 0 1.25 0.2 2.45 0.57 3.57 0.11 0.35 0.03 0.74-0.25 1.02l-2.2 2.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_speaker_off_vector.xml b/app/src/main/res/drawable/ic_speaker_off_vector.xml
index 17adb3f9..4a1da552 100644
--- a/app/src/main/res/drawable/ic_speaker_off_vector.xml
+++ b/app/src/main/res/drawable/ic_speaker_off_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v2.21l2.45,2.45c0.03,-0.2 0.05,-0.41 0.05,-0.63zM19,12c0,0.94 -0.2,1.82 -0.54,2.64l1.51,1.51C20.63,14.91 21,13.5 21,12c0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM4.27,3L3,4.27 7.73,9L3,9v6h4l5,5v-6.73l4.25,4.25c-0.67,0.52 -1.42,0.93 -2.25,1.18v2.06c1.38,-0.31 2.63,-0.95 3.69,-1.81L19.73,21 21,19.73l-9,-9L4.27,3zM12,4L9.91,6.09 12,8.18L12,4z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3.63 3.63c-0.39 0.39-0.39 1.02 0 1.41L7.29 8.7 7 9H4c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71v-4.17l4.18 4.18c-0.49 0.37-1.02 0.68-1.6 0.91-0.36 0.15-0.58 0.53-0.58 0.92 0 0.72 0.73 1.18 1.39 0.91 0.8-0.33 1.55-0.77 2.22-1.31l1.34 1.34c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39-1.02 0-1.41L5.05 3.63c-0.39-0.39-1.02-0.39-1.42 0zM19 12c0 0.82-0.15 1.61-0.41 2.34l1.53 1.53C20.68 14.7 21 13.39 21 12c0-3.83-2.4-7.11-5.78-8.4C14.63 3.37 14 3.83 14 4.46v0.19c0 0.38 0.25 0.71 0.61 0.85C17.18 6.54 19 9.06 19 12zm-8.71-6.29l-0.17 0.17L12 7.76V6.41c0-0.89-1.08-1.33-1.71-0.7zM16.5 12c0-1.77-1.02-3.29-2.5-4.03v1.79l2.48 2.48c0.01-0.08 0.02-0.16 0.02-0.24z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_speaker_on_vector.xml b/app/src/main/res/drawable/ic_speaker_on_vector.xml
index bc7422fc..25ec67e4 100644
--- a/app/src/main/res/drawable/ic_speaker_on_vector.xml
+++ b/app/src/main/res/drawable/ic_speaker_on_vector.xml
@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3 10v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L7 9H4c-0.55 0-1 0.45-1 1zm13.5 2c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM14 4.45v0.2c0 0.38 0.25 0.71 0.6 0.85C17.18 6.53 19 9.06 19 12s-1.82 5.47-4.4 6.5c-0.36 0.14-0.6 0.47-0.6 0.85v0.2c0 0.63 0.63 1.07 1.21 0.85C18.6 19.11 21 15.84 21 12s-2.4-7.11-5.79-8.4C14.63 3.37 14 3.82 14 4.45z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ripple_background.xml b/app/src/main/res/drawable/ripple_background.xml
deleted file mode 100644
index 783c769d..00000000
--- a/app/src/main/res/drawable/ripple_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/md_grey">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
-</ripple>
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index d3699d67..0045494b 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -14,10 +14,12 @@
         app:showAsAction="collapseActionView|ifRoom" />
     <item
         android:id="@+id/settings"
+        android:icon="@drawable/ic_settings_cog_vector"
         android:title="@string/settings"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/about"
+        android:icon="@drawable/ic_info_vector"
         android:title="@string/about"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
 </menu>