diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index b2faeb657..67274d4ef 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -300,10 +300,10 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
         }
 
         iconResource.value = when (proxyConfig.state) {
-            RegistrationState.Ok -> R.drawable.led_connected
+            RegistrationState.Ok -> R.drawable.led_registered
             RegistrationState.Failed -> R.drawable.led_error
-            RegistrationState.Progress -> R.drawable.led_inprogress
-            else -> R.drawable.led_disconnected
+            RegistrationState.Progress -> R.drawable.led_registration_in_progress
+            else -> R.drawable.led_not_registered
         }
         iconContentDescription.value = when (proxyConfig.state) {
             RegistrationState.Ok -> R.string.status_connected
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
index 55ab82a5b..9122b548b 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
@@ -103,10 +103,10 @@ open class StatusViewModel : ViewModel() {
 
     private fun getStatusIconResource(state: RegistrationState): Int {
         return when (state) {
-            RegistrationState.Ok -> R.drawable.led_connected
-            RegistrationState.Progress -> R.drawable.led_inprogress
+            RegistrationState.Ok -> R.drawable.led_registered
+            RegistrationState.Progress -> R.drawable.led_registration_in_progress
             RegistrationState.Failed -> R.drawable.led_error
-            else -> R.drawable.led_disconnected
+            else -> R.drawable.led_not_registered
         }
     }
 }
diff --git a/app/src/main/res/drawable-xhdpi/clean_field_default.png b/app/src/main/res/drawable-xhdpi/clean_field_default.png
deleted file mode 100644
index 3fae16b48..000000000
Binary files a/app/src/main/res/drawable-xhdpi/clean_field_default.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/clean_field_over.png b/app/src/main/res/drawable-xhdpi/clean_field_over.png
deleted file mode 100644
index a9580ff23..000000000
Binary files a/app/src/main/res/drawable-xhdpi/clean_field_over.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/field_add.png b/app/src/main/res/drawable-xhdpi/field_add.png
deleted file mode 100644
index d447eee25..000000000
Binary files a/app/src/main/res/drawable-xhdpi/field_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/field_remove.png b/app/src/main/res/drawable-xhdpi/field_remove.png
deleted file mode 100644
index b4ec88f48..000000000
Binary files a/app/src/main/res/drawable-xhdpi/field_remove.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/led_connected.png b/app/src/main/res/drawable-xhdpi/led_connected.png
deleted file mode 100644
index d0cc8fc84..000000000
Binary files a/app/src/main/res/drawable-xhdpi/led_connected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/led_disconnected.png b/app/src/main/res/drawable-xhdpi/led_disconnected.png
deleted file mode 100644
index 20c814333..000000000
Binary files a/app/src/main/res/drawable-xhdpi/led_disconnected.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/led_error.png b/app/src/main/res/drawable-xhdpi/led_error.png
deleted file mode 100644
index 67418cc43..000000000
Binary files a/app/src/main/res/drawable-xhdpi/led_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/led_inprogress.png b/app/src/main/res/drawable-xhdpi/led_inprogress.png
deleted file mode 100644
index cf7263481..000000000
Binary files a/app/src/main/res/drawable-xhdpi/led_inprogress.png and /dev/null differ
diff --git a/app/src/main/res/drawable/field_add.xml b/app/src/main/res/drawable/field_add.xml
new file mode 100644
index 000000000..d5ab69493
--- /dev/null
+++ b/app/src/main/res/drawable/field_add.xml
@@ -0,0 +1,10 @@
+<?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/field_add_over" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/field_add_disabled" />
+    <item
+        android:drawable="@drawable/field_add_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/field_add_default.xml b/app/src/main/res/drawable/field_add_default.xml
new file mode 100644
index 000000000..29cf8f588
--- /dev/null
+++ b/app/src/main/res/drawable/field_add_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/primary_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_add_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_disabled.xml b/app/src/main/res/drawable/field_add_disabled.xml
new file mode 100644
index 000000000..4421590c7
--- /dev/null
+++ b/app/src/main/res/drawable/field_add_disabled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/grey_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_add_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_over.xml b/app/src/main/res/drawable/field_add_over.xml
new file mode 100644
index 000000000..496327588
--- /dev/null
+++ b/app/src/main/res/drawable/field_add_over.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/green_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_add_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_add_shape.xml b/app/src/main/res/drawable/field_add_shape.xml
new file mode 100644
index 000000000..a335e3ba3
--- /dev/null
+++ b/app/src/main/res/drawable/field_add_shape.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="@dimen/field_shape_margin"
+        android:top="@dimen/field_shape_margin"
+        android:end="@dimen/field_shape_margin"
+        android:start="@dimen/field_shape_margin">
+        <shape android:shape="line">
+            <stroke android:width="2dp" android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/field_shape_margin"
+        android:top="@dimen/field_shape_margin"
+        android:end="@dimen/field_shape_margin"
+        android:start="@dimen/field_shape_margin">
+        <rotate
+            android:fromDegrees="90"
+            android:pivotX="50%"
+            android:pivotY="50%">
+            <shape android:shape="line">
+                <stroke android:width="2dp" android:color="@android:color/white" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/clean_field.xml b/app/src/main/res/drawable/field_clean.xml
similarity index 59%
rename from app/src/main/res/drawable/clean_field.xml
rename to app/src/main/res/drawable/field_clean.xml
index dd9843324..0400c9278 100644
--- a/app/src/main/res/drawable/clean_field.xml
+++ b/app/src/main/res/drawable/field_clean.xml
@@ -1,8 +1,8 @@
 <?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/field_clean_over" />
     <item
-        android:drawable="@drawable/clean_field_default" />
+        android:drawable="@drawable/field_clean_default" />
 </selector>
 
diff --git a/app/src/main/res/drawable/field_clean_default.xml b/app/src/main/res/drawable/field_clean_default.xml
new file mode 100644
index 000000000..b29f380c1
--- /dev/null
+++ b/app/src/main/res/drawable/field_clean_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/black_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_clean_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_clean_over.xml b/app/src/main/res/drawable/field_clean_over.xml
new file mode 100644
index 000000000..a5c707556
--- /dev/null
+++ b/app/src/main/res/drawable/field_clean_over.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/red_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_clean_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_clean_shape.xml b/app/src/main/res/drawable/field_clean_shape.xml
new file mode 100644
index 000000000..1c9e1349b
--- /dev/null
+++ b/app/src/main/res/drawable/field_clean_shape.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="@dimen/field_shape_margin"
+        android:top="@dimen/field_shape_margin"
+        android:end="@dimen/field_shape_margin"
+        android:start="@dimen/field_shape_margin">
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="50%"
+            android:pivotY="50%">
+            <shape android:shape="line">
+                <stroke android:width="2dp" android:color="@android:color/white" />
+            </shape>
+        </rotate>
+    </item>
+    <item
+        android:bottom="@dimen/field_shape_margin"
+        android:top="@dimen/field_shape_margin"
+        android:end="@dimen/field_shape_margin"
+        android:start="@dimen/field_shape_margin">
+        <rotate
+            android:fromDegrees="135"
+            android:pivotX="50%"
+            android:pivotY="50%">
+            <shape android:shape="line">
+                <stroke android:width="2dp" android:color="@android:color/white" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove.xml b/app/src/main/res/drawable/field_remove.xml
new file mode 100644
index 000000000..3fc616dd3
--- /dev/null
+++ b/app/src/main/res/drawable/field_remove.xml
@@ -0,0 +1,10 @@
+<?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/field_remove_over" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/field_remove_disabled" />
+    <item
+        android:drawable="@drawable/field_remove_default" />
+</selector>
+
diff --git a/app/src/main/res/drawable/field_remove_default.xml b/app/src/main/res/drawable/field_remove_default.xml
new file mode 100644
index 000000000..214b742f1
--- /dev/null
+++ b/app/src/main/res/drawable/field_remove_default.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/black_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_remove_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_disabled.xml b/app/src/main/res/drawable/field_remove_disabled.xml
new file mode 100644
index 000000000..5c582da40
--- /dev/null
+++ b/app/src/main/res/drawable/field_remove_disabled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/grey_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_remove_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_over.xml b/app/src/main/res/drawable/field_remove_over.xml
new file mode 100644
index 000000000..b8a988b7d
--- /dev/null
+++ b/app/src/main/res/drawable/field_remove_over.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/red_color"/>
+			<size android:width="@dimen/field_button_size" android:height="@dimen/field_button_size"/>
+		</shape>
+	</item>
+	<item android:drawable="@drawable/field_remove_shape" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/field_remove_shape.xml b/app/src/main/res/drawable/field_remove_shape.xml
new file mode 100644
index 000000000..75f5c4f69
--- /dev/null
+++ b/app/src/main/res/drawable/field_remove_shape.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="@dimen/field_shape_margin"
+        android:top="@dimen/field_shape_margin"
+        android:end="@dimen/field_shape_margin"
+        android:start="@dimen/field_shape_margin">
+        <shape android:shape="line">
+            <stroke android:width="2dp" android:color="@android:color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/led_background.xml b/app/src/main/res/drawable/led_background.xml
new file mode 100644
index 000000000..7147daf3c
--- /dev/null
+++ b/app/src/main/res/drawable/led_background.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/white_color"/>
+    <size android:width="20dp" android:height="20dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/led_error.xml b/app/src/main/res/drawable/led_error.xml
new file mode 100644
index 000000000..e2ce8ac4b
--- /dev/null
+++ b/app/src/main/res/drawable/led_error.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/led_error"/>
+    <size android:width="15dp" android:height="15dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/led_not_registered.xml b/app/src/main/res/drawable/led_not_registered.xml
new file mode 100644
index 000000000..f95c698ac
--- /dev/null
+++ b/app/src/main/res/drawable/led_not_registered.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/led_not_registered"/>
+    <size android:width="15dp" android:height="15dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/led_registered.xml b/app/src/main/res/drawable/led_registered.xml
new file mode 100644
index 000000000..7c701e958
--- /dev/null
+++ b/app/src/main/res/drawable/led_registered.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/led_registered"/>
+    <size android:width="15dp" android:height="15dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/led_registration_in_progress.xml b/app/src/main/res/drawable/led_registration_in_progress.xml
new file mode 100644
index 000000000..53b2810ea
--- /dev/null
+++ b/app/src/main/res/drawable/led_registration_in_progress.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/led_registration_in_progress"/>
+    <size android:width="15dp" android:height="15dp"/>
+</shape>
diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml
index c2d54958e..1af44f6fb 100644
--- a/app/src/main/res/layout/assistant_country_picker_fragment.xml
+++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml
@@ -61,7 +61,7 @@
                 android:layout_centerVertical="true"
                 android:paddingLeft="5dp"
                 android:paddingRight="5dp"
-                android:src="@drawable/clean_field" />
+                android:src="@drawable/field_clean" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call_status_fragment.xml b/app/src/main/res/layout/call_status_fragment.xml
index b5a2b1527..501a0fb58 100644
--- a/app/src/main/res/layout/call_status_fragment.xml
+++ b/app/src/main/res/layout/call_status_fragment.xml
@@ -33,7 +33,8 @@
 
         <ImageView
             android:id="@+id/status_led"
-            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_disconnected}"
+            android:background="@drawable/led_background"
+            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
             android:onClick="@{refreshClickListener}"
             android:contentDescription="@{viewModel.registrationStatusText}"
             android:layout_width="20dp"
@@ -41,7 +42,7 @@
             android:layout_centerInParent="true"
             android:layout_toRightOf="@id/stats_button"
             android:adjustViewBounds="true"
-            android:paddingLeft="5dp" />
+            android:padding="2dp" />
 
         <TextView
             android:text="@{viewModel.registrationStatusText, default=@string/status_not_connected}"
diff --git a/app/src/main/res/layout/chat_message_attachment_cell.xml b/app/src/main/res/layout/chat_message_attachment_cell.xml
index 826d85cbb..bbed191ba 100644
--- a/app/src/main/res/layout/chat_message_attachment_cell.xml
+++ b/app/src/main/res/layout/chat_message_attachment_cell.xml
@@ -32,7 +32,7 @@
             android:layout_height="20dp"
             android:layout_alignTop="@id/pendingImageForUpload"
             android:layout_alignRight="@id/pendingImageForUpload"
-            android:src="@drawable/clean_field" />
+            android:src="@drawable/field_clean" />
 
         <ImageView
             android:id="@+id/pendingVideoForUpload"
@@ -59,7 +59,7 @@
             android:layout_height="20dp"
             android:layout_alignTop="@id/pendingVideoForUpload"
             android:layout_alignRight="@id/pendingVideoForUpload"
-            android:src="@drawable/clean_field" />
+            android:src="@drawable/field_clean" />
 
         <TextView
             android:id="@+id/pendingFileForUpload"
@@ -81,7 +81,7 @@
             android:layout_height="20dp"
             android:layout_alignTop="@id/pendingFileForUpload"
             android:layout_alignRight="@id/pendingFileForUpload"
-            android:src="@drawable/clean_field" />
+            android:src="@drawable/field_clean" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/contact_editor_fragment.xml b/app/src/main/res/layout/contact_editor_fragment.xml
index 01530a7ca..4a4b58e0c 100644
--- a/app/src/main/res/layout/contact_editor_fragment.xml
+++ b/app/src/main/res/layout/contact_editor_fragment.xml
@@ -161,13 +161,12 @@
 
                     <ImageView
                         android:onClick="@{() -> viewModel.addEmptySipAddress()}"
+                        android:contentDescription="@string/content_description_add_sip_address_field"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/field_add"
-                        android:contentDescription="@string/content_description_add_sip_address_field"
-                        android:background="@drawable/round_orange_button_background" />
+                        android:src="@drawable/field_add" />
 
                 </RelativeLayout>
 
@@ -199,8 +198,7 @@
                         android:layout_height="30dp"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/field_add"
-                        android:background="@drawable/round_orange_button_background" />
+                        android:src="@drawable/field_add" />
 
                 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/contact_number_address_editor_cell.xml b/app/src/main/res/layout/contact_number_address_editor_cell.xml
index c32cdaf62..3b2c42091 100644
--- a/app/src/main/res/layout/contact_number_address_editor_cell.xml
+++ b/app/src/main/res/layout/contact_number_address_editor_cell.xml
@@ -41,8 +41,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:src="@drawable/field_remove"
-            android:layout_marginLeft="5dp"
-            android:background="@drawable/field_button_background" />
+            android:layout_marginLeft="5dp" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/settings_account_cell.xml b/app/src/main/res/layout/settings_account_cell.xml
index 7759a300f..ccd908039 100644
--- a/app/src/main/res/layout/settings_account_cell.xml
+++ b/app/src/main/res/layout/settings_account_cell.xml
@@ -16,7 +16,9 @@
 
         <ImageView
             android:id="@+id/led"
-            android:src="@{data.iconResource}"
+            android:background="@drawable/led_background"
+            android:padding="2dp"
+            android:src="@{data.iconResource, default=@drawable/led_not_registered}"
             android:contentDescription="@{data.iconContentDescription}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
index 8351cb1de..60853621d 100644
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ b/app/src/main/res/layout/settings_widget_text.xml
@@ -38,7 +38,7 @@
             android:layout_height="20dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="20dp"
-            android:src="@drawable/clean_field"
+            android:src="@drawable/field_clean"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true" />
 
diff --git a/app/src/main/res/layout/status_fragment.xml b/app/src/main/res/layout/status_fragment.xml
index 841a45e45..907f54eb0 100644
--- a/app/src/main/res/layout/status_fragment.xml
+++ b/app/src/main/res/layout/status_fragment.xml
@@ -33,15 +33,16 @@
 
         <ImageView
             android:id="@+id/status_led"
-            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_disconnected}"
+            android:background="@drawable/led_background"
+            android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
             android:onClick="@{refreshClickListener}"
             android:contentDescription="@{viewModel.registrationStatusText}"
             android:layout_width="20dp"
             android:layout_height="wrap_content"
+            android:padding="2dp"
             android:layout_centerInParent="true"
             android:layout_toRightOf="@id/menu_button"
-            android:adjustViewBounds="true"
-            android:paddingLeft="5dp" />
+            android:adjustViewBounds="true" />
 
         <TextView
             android:text="@{viewModel.registrationStatusText, default=@string/status_not_connected}"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8b32fd4e2..a493e51c1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -30,4 +30,9 @@
 
     <color name="disabled_color">#808080</color>
     <color name="contact_disabled_color">#99ffffff</color>
+
+    <color name="led_registered">#96c11f</color>
+    <color name="led_registration_in_progress">#ffa645</color>
+    <color name="led_not_registered">#e1e1e1</color>
+    <color name="led_error">#ff0000</color>
 </resources>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 976bd186b..2104de5e7 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -15,4 +15,6 @@
     <dimen name="call_button_size">60dp</dimen>
     <dimen name="call_options_menu_translate_y">300dp</dimen>
     <dimen name="call_audio_routes_menu_translate_y">240dp</dimen>
+    <dimen name="field_button_size">20dp</dimen>
+    <dimen name="field_shape_margin">3dp</dimen>
 </resources>
\ No newline at end of file