diff --git a/app/src/main/res/drawable/led_background.xml b/app/src/main/res/drawable/led_background.xml
index 7147daf3c..d46d2c20a 100644
--- a/app/src/main/res/drawable/led_background.xml
+++ b/app/src/main/res/drawable/led_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/white_color"/>
+    <solid android:color="?attr/backgroundColor"/>
     <size android:width="20dp" android:height="20dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/status_led_background.xml b/app/src/main/res/drawable/status_led_background.xml
new file mode 100644
index 000000000..7147daf3c
--- /dev/null
+++ b/app/src/main/res/drawable/status_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/layout/chat_room_devices_group_cell.xml b/app/src/main/res/layout/chat_room_devices_group_cell.xml
index 1d4099a36..71a80364d 100644
--- a/app/src/main/res/layout/chat_room_devices_group_cell.xml
+++ b/app/src/main/res/layout/chat_room_devices_group_cell.xml
@@ -47,7 +47,7 @@
                     android:layout_marginStart="25dp"
                     android:adjustViewBounds="true"
                     android:background="@drawable/led_background"
-                    android:padding="2dp"
+                    android:padding="@dimen/contact_presence_badge_padding"
                     app:presenceIcon="@{data.presenceStatus}"
                     android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml b/app/src/main/res/layout/chat_room_group_info_participant_cell.xml
index 2bf4d290d..73ab01fda 100644
--- a/app/src/main/res/layout/chat_room_group_info_participant_cell.xml
+++ b/app/src/main/res/layout/chat_room_group_info_participant_cell.xml
@@ -46,7 +46,7 @@
                 android:layout_marginStart="25dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/led_background"
-                android:padding="2dp"
+                android:padding="@dimen/contact_presence_badge_padding"
                 app:presenceIcon="@{data.presenceStatus}"
                 android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/chat_room_imdn_participant_cell.xml b/app/src/main/res/layout/chat_room_imdn_participant_cell.xml
index fec8fe4f2..e034f374c 100644
--- a/app/src/main/res/layout/chat_room_imdn_participant_cell.xml
+++ b/app/src/main/res/layout/chat_room_imdn_participant_cell.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View"/>
@@ -34,7 +35,7 @@
             android:layout_marginStart="25dp"
             android:adjustViewBounds="true"
             android:background="@drawable/led_background"
-            android:padding="2dp"
+            android:padding="@dimen/contact_presence_badge_padding"
             app:presenceIcon="@{data.presenceStatus}"
             android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index 5744babb6..1f29840d4 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -57,7 +57,7 @@
             android:layout_marginStart="25dp"
             android:adjustViewBounds="true"
             android:background="@drawable/led_background"
-            android:padding="2dp"
+            android:padding="@dimen/contact_presence_badge_padding"
             app:presenceIcon="@{data.presenceStatus}"
             android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
             app:layout_constraintStart_toStartOf="@id/avatar"
diff --git a/app/src/main/res/layout/contact_detail_fragment.xml b/app/src/main/res/layout/contact_detail_fragment.xml
index 70c4ab106..002a24103 100644
--- a/app/src/main/res/layout/contact_detail_fragment.xml
+++ b/app/src/main/res/layout/contact_detail_fragment.xml
@@ -103,7 +103,7 @@
                         android:layout_marginStart="70dp"
                         android:adjustViewBounds="true"
                         android:background="@drawable/led_background"
-                        android:padding="2dp"
+                        android:padding="@dimen/contact_presence_big_badge_padding"
                         app:presenceIcon="@{viewModel.presenceStatus}"
                         android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index e48fbfc47..302dc6586 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -52,7 +52,7 @@
             android:layout_marginStart="25dp"
             android:adjustViewBounds="true"
             android:background="@drawable/led_background"
-            android:padding="2dp"
+            android:padding="@dimen/contact_presence_badge_padding"
             app:presenceIcon="@{viewModel.presenceStatus}"
             android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/contact_selection_cell.xml b/app/src/main/res/layout/contact_selection_cell.xml
index ee38a5759..bef54f3a6 100644
--- a/app/src/main/res/layout/contact_selection_cell.xml
+++ b/app/src/main/res/layout/contact_selection_cell.xml
@@ -50,7 +50,7 @@
                     android:layout_marginStart="25dp"
                     android:adjustViewBounds="true"
                     android:background="@drawable/led_background"
-                    android:padding="2dp"
+                    android:padding="@dimen/contact_presence_badge_padding"
                     app:presenceIcon="@{data.presenceStatus}"
                     android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/history_detail_fragment.xml b/app/src/main/res/layout/history_detail_fragment.xml
index 240db0c0b..280854a97 100644
--- a/app/src/main/res/layout/history_detail_fragment.xml
+++ b/app/src/main/res/layout/history_detail_fragment.xml
@@ -105,7 +105,7 @@
                         android:layout_marginStart="70dp"
                         android:adjustViewBounds="true"
                         android:background="@drawable/led_background"
-                        android:padding="2dp"
+                        android:padding="@dimen/contact_presence_big_badge_padding"
                         app:presenceIcon="@{viewModel.presenceStatus}"
                         android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml
index 87fd199da..d25b0318b 100644
--- a/app/src/main/res/layout/history_list_cell.xml
+++ b/app/src/main/res/layout/history_list_cell.xml
@@ -101,7 +101,7 @@
                 android:layout_marginStart="25dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/led_background"
-                android:padding="2dp"
+                android:padding="@dimen/contact_presence_badge_padding"
                 app:presenceIcon="@{viewModel.presenceStatus}"
                 android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
diff --git a/app/src/main/res/layout/settings_account_cell.xml b/app/src/main/res/layout/settings_account_cell.xml
index ccd908039..5ae82b408 100644
--- a/app/src/main/res/layout/settings_account_cell.xml
+++ b/app/src/main/res/layout/settings_account_cell.xml
@@ -17,7 +17,7 @@
         <ImageView
             android:id="@+id/led"
             android:background="@drawable/led_background"
-            android:padding="2dp"
+            android:padding="@dimen/contact_presence_badge_padding"
             android:src="@{data.iconResource, default=@drawable/led_not_registered}"
             android:contentDescription="@{data.iconContentDescription}"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/side_menu_account_cell.xml b/app/src/main/res/layout/side_menu_account_cell.xml
index 4ef373c64..bb8d85374 100644
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ b/app/src/main/res/layout/side_menu_account_cell.xml
@@ -35,7 +35,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="@dimen/settings_margin"
-            android:padding="2dp" />
+            android:padding="@dimen/contact_presence_badge_padding" />
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/side_menu_fragment.xml b/app/src/main/res/layout/side_menu_fragment.xml
index 753b6cae5..528031725 100644
--- a/app/src/main/res/layout/side_menu_fragment.xml
+++ b/app/src/main/res/layout/side_menu_fragment.xml
@@ -79,7 +79,7 @@
                 android:layout_marginStart="45dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/led_background"
-                android:padding="2dp"
+                android:padding="@dimen/contact_presence_badge_padding"
                 app:presenceIcon="@{viewModel.presenceStatus}"
                 android:visibility="@{!viewModel.defaultAccountFound || viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
 
@@ -128,7 +128,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="10dp"
-                android:padding="2dp" />
+                android:padding="@dimen/contact_presence_badge_padding" />
 
             <View
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/status_fragment.xml b/app/src/main/res/layout/status_fragment.xml
index 907f54eb0..f41bb55c3 100644
--- a/app/src/main/res/layout/status_fragment.xml
+++ b/app/src/main/res/layout/status_fragment.xml
@@ -33,7 +33,7 @@
 
         <ImageView
             android:id="@+id/status_led"
-            android:background="@drawable/led_background"
+            android:background="@drawable/status_led_background"
             android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
             android:onClick="@{refreshClickListener}"
             android:contentDescription="@{viewModel.registrationStatusText}"
diff --git a/app/src/main/res/layout/voip_status_fragment.xml b/app/src/main/res/layout/voip_status_fragment.xml
index 76341c9de..dbc77f614 100644
--- a/app/src/main/res/layout/voip_status_fragment.xml
+++ b/app/src/main/res/layout/voip_status_fragment.xml
@@ -30,7 +30,7 @@
 
         <ImageView
             android:id="@+id/status_led"
-            android:background="@drawable/led_background"
+            android:background="@drawable/status_led_background"
             android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
             android:onClick="@{refreshClickListener}"
             android:contentDescription="@{viewModel.registrationStatusText}"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 19ba6bf14..79054ac01 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -84,4 +84,6 @@
     <dimen name="chat_message_sending_icons_margin">5dp</dimen>
     <dimen name="contact_presence_badge_size">12dp</dimen>
     <dimen name="contact_presence_big_badge_size">25dp</dimen>
+    <dimen name="contact_presence_badge_padding">1dp</dimen>
+    <dimen name="contact_presence_big_badge_padding">2dp</dimen>
 </resources>
\ No newline at end of file