diff --git a/app/src/main/res/drawable-xhdpi/camera_switch_default.png b/app/src/main/res/drawable-xhdpi/camera_switch_default.png
index 640a61896..532cf3187 100644
Binary files a/app/src/main/res/drawable-xhdpi/camera_switch_default.png and b/app/src/main/res/drawable-xhdpi/camera_switch_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/camera_switch_over.png b/app/src/main/res/drawable-xhdpi/camera_switch_over.png
deleted file mode 100644
index addecb1ca..000000000
Binary files a/app/src/main/res/drawable-xhdpi/camera_switch_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/download_disabled.png b/app/src/main/res/drawable-xhdpi/download_disabled.png
deleted file mode 100644
index 26835cec4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/download_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/pause_default.png b/app/src/main/res/drawable-xhdpi/pause_default.png
index 6b92420c4..78841141d 100644
Binary files a/app/src/main/res/drawable-xhdpi/pause_default.png and b/app/src/main/res/drawable-xhdpi/pause_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pause_disabled.png b/app/src/main/res/drawable-xhdpi/pause_disabled.png
deleted file mode 100644
index a9759e3b7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/pause_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/pause_over_selected.png b/app/src/main/res/drawable-xhdpi/pause_over_selected.png
deleted file mode 100644
index d4f16fa34..000000000
Binary files a/app/src/main/res/drawable-xhdpi/pause_over_selected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/screenshot_default.png b/app/src/main/res/drawable-xhdpi/screenshot_default.png
index a322b072b..1808d9f3e 100644
Binary files a/app/src/main/res/drawable-xhdpi/screenshot_default.png and b/app/src/main/res/drawable-xhdpi/screenshot_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/screenshot_disabled.png b/app/src/main/res/drawable-xhdpi/screenshot_disabled.png
deleted file mode 100644
index 9b75d575b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/screenshot_disabled.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/screenshot_over.png b/app/src/main/res/drawable-xhdpi/screenshot_over.png
deleted file mode 100644
index d94c0929d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/screenshot_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_advanced_default.png b/app/src/main/res/drawable-xhdpi/settings_advanced_default.png
new file mode 100644
index 000000000..099a7770e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_advanced_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_audio_default.png b/app/src/main/res/drawable-xhdpi/settings_audio_default.png
new file mode 100644
index 000000000..4072d173f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_audio_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_call_default.png b/app/src/main/res/drawable-xhdpi/settings_call_default.png
new file mode 100644
index 000000000..951452780
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_call_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_chat_default.png b/app/src/main/res/drawable-xhdpi/settings_chat_default.png
new file mode 100644
index 000000000..8a3f155ee
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_chat_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_contacts_default.png b/app/src/main/res/drawable-xhdpi/settings_contacts_default.png
new file mode 100644
index 000000000..3f034f8e3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_contacts_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_network_default.png b/app/src/main/res/drawable-xhdpi/settings_network_default.png
new file mode 100644
index 000000000..dbafc78d7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_network_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/settings_video_default.png b/app/src/main/res/drawable-xhdpi/settings_video_default.png
new file mode 100644
index 000000000..876270d33
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/settings_video_default.png differ
diff --git a/app/src/main/res/drawable/call_pause.xml b/app/src/main/res/drawable/call_pause.xml
index debf5030c..6cc693d86 100644
--- a/app/src/main/res/drawable/call_pause.xml
+++ b/app/src/main/res/drawable/call_pause.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/pause_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/pause_over_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/pause_over_selected" android:state_pressed="true" />
-    <item android:drawable="@drawable/pause_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/pause_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/pause_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/pause_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/pause_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/call_screenshot.xml b/app/src/main/res/drawable/call_screenshot.xml
index 2d24a03e3..638610ae3 100644
--- a/app/src/main/res/drawable/call_screenshot.xml
+++ b/app/src/main/res/drawable/call_screenshot.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/screenshot_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/screenshot_over" android:state_selected="true" />
-    <item android:drawable="@drawable/screenshot_over" android:state_pressed="true" />
-    <item android:drawable="@drawable/screenshot_default" />
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/screenshot_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/screenshot_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/screenshot_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/screenshot_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
 
diff --git a/app/src/main/res/drawable/camera_switch.xml b/app/src/main/res/drawable/camera_switch.xml
new file mode 100644
index 000000000..a79f649b7
--- /dev/null
+++ b/app/src/main/res/drawable/camera_switch.xml
@@ -0,0 +1,20 @@
+<?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/camera_switch_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/camera_switch_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/camera_switch_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/camera_switch_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>
+
diff --git a/app/src/main/res/drawable/download.xml b/app/src/main/res/drawable/download.xml
index 4a957a6d5..1304c34b0 100644
--- a/app/src/main/res/drawable/download.xml
+++ b/app/src/main/res/drawable/download.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/download_disabled" android:state_enabled="false" />
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/download_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
     <item android:drawable="@drawable/download_default" />
 </selector>
 
diff --git a/app/src/main/res/drawable/round_button_background.xml b/app/src/main/res/drawable/round_button_background.xml
new file mode 100644
index 000000000..5a67aa4b6
--- /dev/null
+++ b/app/src/main/res/drawable/round_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:drawable="@drawable/round_button_background_default" />
+</selector>
diff --git a/app/src/main/res/drawable/round_button_background_default.xml b/app/src/main/res/drawable/round_button_background_default.xml
new file mode 100644
index 000000000..0de013568
--- /dev/null
+++ b/app/src/main/res/drawable/round_button_background_default.xml
@@ -0,0 +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/light_grey_color"/>
+    <size android:width="30dp" android:height="30dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/settings_advanced.xml b/app/src/main/res/drawable/settings_advanced.xml
new file mode 100644
index 000000000..1fe8d2c57
--- /dev/null
+++ b/app/src/main/res/drawable/settings_advanced.xml
@@ -0,0 +1,9 @@
+<?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/settings_advanced_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_advanced_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_audio.xml b/app/src/main/res/drawable/settings_audio.xml
new file mode 100644
index 000000000..26323db18
--- /dev/null
+++ b/app/src/main/res/drawable/settings_audio.xml
@@ -0,0 +1,9 @@
+<?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/settings_audio_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_audio_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_call.xml b/app/src/main/res/drawable/settings_call.xml
new file mode 100644
index 000000000..04ed1f4a7
--- /dev/null
+++ b/app/src/main/res/drawable/settings_call.xml
@@ -0,0 +1,9 @@
+<?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/settings_call_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_call_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_chat.xml b/app/src/main/res/drawable/settings_chat.xml
new file mode 100644
index 000000000..3e0a9c439
--- /dev/null
+++ b/app/src/main/res/drawable/settings_chat.xml
@@ -0,0 +1,9 @@
+<?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/settings_chat_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_chat_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_contacts.xml b/app/src/main/res/drawable/settings_contacts.xml
new file mode 100644
index 000000000..a7800cd8a
--- /dev/null
+++ b/app/src/main/res/drawable/settings_contacts.xml
@@ -0,0 +1,9 @@
+<?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/settings_contacts_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_contacts_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_network.xml b/app/src/main/res/drawable/settings_network.xml
new file mode 100644
index 000000000..6a71d0f77
--- /dev/null
+++ b/app/src/main/res/drawable/settings_network.xml
@@ -0,0 +1,9 @@
+<?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/settings_network_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_network_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/settings_video.xml b/app/src/main/res/drawable/settings_video.xml
new file mode 100644
index 000000000..011d8cbd0
--- /dev/null
+++ b/app/src/main/res/drawable/settings_video.xml
@@ -0,0 +1,9 @@
+<?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/settings_video_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item android:drawable="@drawable/settings_video_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/switch_camera.xml b/app/src/main/res/drawable/switch_camera.xml
deleted file mode 100644
index 5a4dc9418..000000000
--- a/app/src/main/res/drawable/switch_camera.xml
+++ /dev/null
@@ -1,7 +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="@drawable/camera_switch_over" />
-    <item
-        android:drawable="@drawable/camera_switch_default" />
-</selector>
diff --git a/app/src/main/res/layout-land/call_controls_fragment.xml b/app/src/main/res/layout-land/call_controls_fragment.xml
index 9165b6774..79e5f9ef3 100644
--- a/app/src/main/res/layout-land/call_controls_fragment.xml
+++ b/app/src/main/res/layout-land/call_controls_fragment.xml
@@ -112,9 +112,12 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentRight="true"
             android:layout_margin="20dp"
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
             android:src="@drawable/call_pause" />
 
         <ImageView
+            android:id="@+id/switch_camera"
             android:onClick="@{() -> controlsViewModel.switchCamera()}"
             android:enabled="@{!viewModel.callPausedByRemote}"
             android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.showSwitchCamera &amp;&amp; (viewModel.conferenceCalls.size() == 0 || viewModel.isConferencePaused) ? View.VISIBLE : View.GONE, default=gone}"
@@ -124,7 +127,23 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentLeft="true"
             android:layout_margin="20dp"
-            android:src="@drawable/switch_camera" />
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
+            android:src="@drawable/camera_switch" />
+
+        <ImageView
+            android:onClick="@{() -> viewModel.takeScreenshot()}"
+            android:enabled="@{!viewModel.callPausedByRemote}"
+            android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.takeScreenshotEnabled &amp;&amp; (viewModel.conferenceCalls.size() == 0 || viewModel.isConferencePaused) ? View.VISIBLE : View.GONE, default=gone}"
+            android:contentDescription="@string/content_description_take_screenshot"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_below="@id/active_call_header"
+            android:layout_toRightOf="@id/switch_camera"
+            android:layout_margin="20dp"
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
+            android:src="@drawable/call_screenshot" />
 
         <ImageView
             android:onClick="@{() -> controlsViewModel.toggleRecording(false)}"
diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
index 1cf595a29..635f6579a 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
@@ -46,7 +46,9 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_margin="20dp"
-            android:src="@drawable/switch_camera" />
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
+            android:src="@drawable/camera_switch" />
 
         <RelativeLayout
             android:id="@+id/ui_layout"
diff --git a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
index cbda9530d..48de5e1e0 100644
--- a/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/settings_fragment.xml
@@ -108,43 +108,50 @@
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.audioSettingsListener}"
                         android:visibility="@{viewModel.showAudioSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_audio_title}" />
+                        linphone:title="@{@string/settings_audio_title}"
+                        linphone:icon="@{@drawable/settings_audio}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.videoSettingsListener}"
                         android:visibility="@{viewModel.showVideoSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_video_title}" />
+                        linphone:title="@{@string/settings_video_title}"
+                        linphone:icon="@{@drawable/settings_video}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.callSettingsListener}"
                         android:visibility="@{viewModel.showCallSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_call_title}" />
+                        linphone:title="@{@string/settings_call_title}"
+                        linphone:icon="@{@drawable/settings_call}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.chatSettingsListener}"
                         android:visibility="@{viewModel.showChatSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_chat_title}" />
+                        linphone:title="@{@string/settings_chat_title}"
+                        linphone:icon="@{@drawable/settings_chat}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.networkSettingsListener}"
                         android:visibility="@{viewModel.showNetworkSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_network_title}" />
+                        linphone:title="@{@string/settings_network_title}"
+                        linphone:icon="@{@drawable/settings_network}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.contactsSettingsListener}"
                         android:visibility="@{viewModel.showContactsSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_contacts_title}" />
+                        linphone:title="@{@string/settings_contacts_title}"
+                        linphone:icon="@{@drawable/settings_contacts}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.advancedSettingsListener}"
                         android:visibility="@{viewModel.showAdvancedSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_advanced_title}" />
+                        linphone:title="@{@string/settings_advanced_title}"
+                        linphone:icon="@{@drawable/settings_advanced}" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw533dp/dialer_fragment.xml b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
index 5b56fe573..b26e4ba61 100644
--- a/app/src/main/res/layout-sw533dp/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
@@ -46,7 +46,9 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_margin="20dp"
-            android:src="@drawable/switch_camera" />
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
+            android:src="@drawable/camera_switch" />
 
         <RelativeLayout
             android:id="@+id/ui_layout"
diff --git a/app/src/main/res/layout-sw533dp/settings_fragment.xml b/app/src/main/res/layout-sw533dp/settings_fragment.xml
index cbda9530d..48de5e1e0 100644
--- a/app/src/main/res/layout-sw533dp/settings_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/settings_fragment.xml
@@ -108,43 +108,50 @@
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.audioSettingsListener}"
                         android:visibility="@{viewModel.showAudioSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_audio_title}" />
+                        linphone:title="@{@string/settings_audio_title}"
+                        linphone:icon="@{@drawable/settings_audio}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.videoSettingsListener}"
                         android:visibility="@{viewModel.showVideoSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_video_title}" />
+                        linphone:title="@{@string/settings_video_title}"
+                        linphone:icon="@{@drawable/settings_video}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.callSettingsListener}"
                         android:visibility="@{viewModel.showCallSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_call_title}" />
+                        linphone:title="@{@string/settings_call_title}"
+                        linphone:icon="@{@drawable/settings_call}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.chatSettingsListener}"
                         android:visibility="@{viewModel.showChatSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_chat_title}" />
+                        linphone:title="@{@string/settings_chat_title}"
+                        linphone:icon="@{@drawable/settings_chat}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.networkSettingsListener}"
                         android:visibility="@{viewModel.showNetworkSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_network_title}" />
+                        linphone:title="@{@string/settings_network_title}"
+                        linphone:icon="@{@drawable/settings_network}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.contactsSettingsListener}"
                         android:visibility="@{viewModel.showContactsSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_contacts_title}" />
+                        linphone:title="@{@string/settings_contacts_title}"
+                        linphone:icon="@{@drawable/settings_contacts}" />
 
                     <include
                         layout="@layout/settings_widget_basic"
                         linphone:listener="@{viewModel.advancedSettingsListener}"
                         android:visibility="@{viewModel.showAdvancedSettings ? View.VISIBLE : View.GONE}"
-                        linphone:title="@{@string/settings_advanced_title}" />
+                        linphone:title="@{@string/settings_advanced_title}"
+                        linphone:icon="@{@drawable/settings_advanced}" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/assistant_qr_code_fragment.xml b/app/src/main/res/layout/assistant_qr_code_fragment.xml
index 83c243d76..ff0946e12 100644
--- a/app/src/main/res/layout/assistant_qr_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_qr_code_fragment.xml
@@ -40,7 +40,9 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_margin="5dp"
-                android:src="@drawable/switch_camera"/>
+                android:background="@drawable/round_button_background"
+                android:padding="10dp"
+                android:src="@drawable/camera_switch"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call_controls_fragment.xml b/app/src/main/res/layout/call_controls_fragment.xml
index 31ead2a59..66d23062d 100644
--- a/app/src/main/res/layout/call_controls_fragment.xml
+++ b/app/src/main/res/layout/call_controls_fragment.xml
@@ -86,7 +86,8 @@
                     android:adjustViewBounds="true"
                     android:padding="10dp"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/switch_camera" />
+                    android:background="@drawable/round_button_background"
+                    android:src="@drawable/camera_switch" />
 
                 <ImageView
                     android:id="@+id/pause_conference"
@@ -99,6 +100,7 @@
                     android:adjustViewBounds="true"
                     android:padding="10dp"
                     android:scaleType="fitCenter"
+                    android:background="@drawable/round_button_background"
                     android:src="@drawable/call_pause" />
 
             </RelativeLayout>
@@ -203,6 +205,8 @@
                 android:layout_height="40dp"
                 android:gravity="center_vertical"
                 android:contentDescription="@string/content_description_resume_conference"
+                android:background="@drawable/round_button_background"
+                android:padding="10dp"
                 android:src="@drawable/call_pause" />
 
         </LinearLayout>
@@ -218,6 +222,8 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentRight="true"
             android:layout_margin="20dp"
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
             android:src="@drawable/call_pause" />
 
         <ImageView
@@ -231,7 +237,9 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentLeft="true"
             android:layout_margin="20dp"
-            android:src="@drawable/switch_camera" />
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
+            android:src="@drawable/camera_switch" />
 
         <ImageView
             android:onClick="@{() -> viewModel.takeScreenshot()}"
@@ -243,6 +251,8 @@
             android:layout_below="@id/active_call_header"
             android:layout_toRightOf="@id/switch_camera"
             android:layout_margin="20dp"
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
             android:src="@drawable/call_screenshot" />
 
         <ImageView
diff --git a/app/src/main/res/layout/call_paused.xml b/app/src/main/res/layout/call_paused.xml
index 9169c1137..21ee514a4 100644
--- a/app/src/main/res/layout/call_paused.xml
+++ b/app/src/main/res/layout/call_paused.xml
@@ -55,6 +55,8 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:gravity="center_vertical"
+            android:background="@drawable/round_button_background"
+            android:padding="10dp"
             android:src="@drawable/call_pause" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index cb963ff2d..bb3ed0996 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -102,43 +102,50 @@
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showAudioSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.audioSettingsListener}"
-                    linphone:title="@{@string/settings_audio_title}" />
+                    linphone:title="@{@string/settings_audio_title}"
+                    linphone:icon="@{@drawable/settings_audio}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showVideoSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.videoSettingsListener}"
-                    linphone:title="@{@string/settings_video_title}" />
+                    linphone:title="@{@string/settings_video_title}"
+                    linphone:icon="@{@drawable/settings_video}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showCallSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.callSettingsListener}"
-                    linphone:title="@{@string/settings_call_title}" />
+                    linphone:title="@{@string/settings_call_title}"
+                    linphone:icon="@{@drawable/settings_call}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showChatSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.chatSettingsListener}"
-                    linphone:title="@{@string/settings_chat_title}" />
+                    linphone:title="@{@string/settings_chat_title}"
+                    linphone:icon="@{@drawable/settings_chat}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showNetworkSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.networkSettingsListener}"
-                    linphone:title="@{@string/settings_network_title}" />
+                    linphone:title="@{@string/settings_network_title}"
+                    linphone:icon="@{@drawable/settings_network}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showContactsSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.contactsSettingsListener}"
-                    linphone:title="@{@string/settings_contacts_title}" />
+                    linphone:title="@{@string/settings_contacts_title}"
+                    linphone:icon="@{@drawable/settings_contacts}" />
 
                 <include
                     layout="@layout/settings_widget_basic"
                     android:visibility="@{viewModel.showAdvancedSettings ? View.VISIBLE : View.GONE}"
                     linphone:listener="@{viewModel.advancedSettingsListener}"
-                    linphone:title="@{@string/settings_advanced_title}" />
+                    linphone:title="@{@string/settings_advanced_title}"
+                    linphone:icon="@{@drawable/settings_advanced}" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/settings_widget_basic.xml b/app/src/main/res/layout/settings_widget_basic.xml
index 64f27ac66..76807991b 100644
--- a/app/src/main/res/layout/settings_widget_basic.xml
+++ b/app/src/main/res/layout/settings_widget_basic.xml
@@ -12,6 +12,9 @@
         <variable
             name="enabled"
             type="Boolean" />
+        <variable
+            name="icon"
+            type="android.graphics.drawable.Drawable" />
         <variable
             name="listener"
             type="org.linphone.activities.main.settings.SettingListener" />
@@ -23,6 +26,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:layout_marginLeft="10dp"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:src="@{icon}" />
+
         <org.linphone.views.MarqueeTextView
             android:id="@+id/settings_title"
             android:layout_width="match_parent"
@@ -34,6 +47,7 @@
             android:layout_marginTop="15dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
+            android:layout_toRightOf="@id/icon"
             style="@style/settings_item_font"/>
 
         <org.linphone.views.MarqueeTextView
@@ -47,6 +61,7 @@
             android:layout_below="@id/settings_title"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
+            android:layout_toRightOf="@id/icon"
             style="@style/settings_item_subtitle_font"/>
 
         <View
diff --git a/app/src/main/res/layout/settings_widget_list.xml b/app/src/main/res/layout/settings_widget_list.xml
index 18c3a50a7..7026136cd 100644
--- a/app/src/main/res/layout/settings_widget_list.xml
+++ b/app/src/main/res/layout/settings_widget_list.xml
@@ -37,8 +37,8 @@
             android:visibility="@{title.length() > 0 ? View.VISIBLE : View.GONE}"
             android:singleLine="true"
             android:layout_marginTop="15dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             style="@style/settings_item_font"/>
 
         <org.linphone.views.MarqueeTextView
@@ -50,8 +50,8 @@
             android:visibility="@{subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
             android:singleLine="true"
             android:layout_below="@id/settings_title"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             style="@style/settings_item_subtitle_font"/>
 
         <Spinner
@@ -63,8 +63,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/settings_subtitle"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp" />
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp" />
 
         <View
             android:layout_marginTop="15dp"
diff --git a/app/src/main/res/layout/settings_widget_switch.xml b/app/src/main/res/layout/settings_widget_switch.xml
index e9c865edd..c7de72a57 100644
--- a/app/src/main/res/layout/settings_widget_switch.xml
+++ b/app/src/main/res/layout/settings_widget_switch.xml
@@ -34,7 +34,7 @@
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginRight="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -48,7 +48,7 @@
             android:singleLine="true"
             android:layout_toLeftOf="@id/setting_switch"
             android:layout_marginTop="15dp"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginRight="10dp"
             style="@style/settings_item_font"/>
 
@@ -62,7 +62,7 @@
             android:singleLine="true"
             android:layout_below="@id/settings_title"
             android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginRight="10dp"
             style="@style/settings_item_subtitle_font"/>
 
diff --git a/app/src/main/res/layout/settings_widget_switch_and_text.xml b/app/src/main/res/layout/settings_widget_switch_and_text.xml
index c5ee960c4..e78ee39cf 100644
--- a/app/src/main/res/layout/settings_widget_switch_and_text.xml
+++ b/app/src/main/res/layout/settings_widget_switch_and_text.xml
@@ -45,7 +45,7 @@
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginRight="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -59,7 +59,7 @@
             android:singleLine="true"
             android:layout_toLeftOf="@id/setting_switch"
             android:layout_marginTop="15dp"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginRight="10dp"
             style="@style/settings_item_font"/>
 
@@ -73,7 +73,7 @@
             android:singleLine="true"
             android:layout_below="@id/settings_title"
             android:layout_toLeftOf="@id/setting_switch"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginRight="10dp"
             style="@style/settings_item_subtitle_font"/>
 
@@ -85,7 +85,7 @@
             android:layout_below="@id/settings_subtitle"
             android:layout_toLeftOf="@id/setting_switch"
             android:layout_marginTop="5dp"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginRight="10dp"
             android:enabled="@{enabled ?? true}"
             android:hint="@{text_title}"
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
index ff5f15524..8351cb1de 100644
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ b/app/src/main/res/layout/settings_widget_text.xml
@@ -37,7 +37,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginRight="20dp"
             android:src="@drawable/clean_field"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />