diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt
index 4848f24b5f..4eee482348 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/filter/DeviceManagerFilterBottomSheet.kt
@@ -40,7 +40,7 @@ class DeviceManagerFilterBottomSheet : VectorBaseBottomSheetDialogFragment<Botto
     }
 
     private fun initFilterRadioGroup() {
-        views.filterOptionInactiveRadioButton.text = resources.getQuantityString(
+        views.filterOptionInactiveRadioButtonDescription.text = resources.getQuantityString(
                 R.plurals.device_manager_filter_option_inactive_description,
                 SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS,
                 SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
diff --git a/vector/src/main/res/drawable/circle_with_transparent_border.xml b/vector/src/main/res/drawable/circle_with_transparent_border.xml
index 610b8ff4e2..22b092a71e 100644
--- a/vector/src/main/res/drawable/circle_with_transparent_border.xml
+++ b/vector/src/main/res/drawable/circle_with_transparent_border.xml
@@ -9,6 +9,6 @@
 
     <stroke
         android:width="3dp"
-        android:color="?android:colorBackground" />
+        android:color="?vctr_toolbar_background" />
 
 </shape>
diff --git a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
index ca9092e70d..73e1971820 100644
--- a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
+++ b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingHorizontal="24dp">
+    android:paddingHorizontal="24dp"
+    android:paddingBottom="32dp">
 
     <View
         android:layout_width="36dp"
@@ -29,6 +30,7 @@
 
         <RadioButton
             android:id="@+id/filterOptionAllSessionsRadioButton"
+            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:checked="true"
@@ -37,6 +39,7 @@
 
         <RadioButton
             android:id="@+id/filterOptionVerifiedRadioButton"
+            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
@@ -52,6 +55,7 @@
 
         <RadioButton
             android:id="@+id/filterOptionUnverifiedRadioButton"
+            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -67,6 +71,7 @@
 
         <RadioButton
             android:id="@+id/filterOptionInactiveRadioButton"
+            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -74,6 +79,7 @@
             android:text="@string/device_manager_filter_option_inactive" />
 
         <TextView
+            android:id="@+id/filterOptionInactiveRadioButtonDescription"
             style="@style/TextAppearance.Vector.Body.DevicesManagement"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"