diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
index 254d34978d..e985ba6d4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
@@ -9,20 +9,15 @@ import androidx.preference.PreferenceViewHolder
 
 class BlockedContactsPreference @JvmOverloads constructor(
     context: Context,
-    attributeSet: AttributeSet? = null) : PreferenceCategory(context, attributeSet), View.OnClickListener {
-
-    override fun onClick(v: View?) {
-        if (v is BlockedContactsLayout) {
-            val intent = Intent(context, BlockedContactsActivity::class.java)
-            context.startActivity(intent)
-        }
-    }
+    attributeSet: AttributeSet? = null
+) : PreferenceCategory(context, attributeSet) {
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
 
-        val itemView = holder.itemView
-        itemView.setOnClickListener(this)
+        holder.itemView.setOnClickListener {
+            val intent = Intent(context, BlockedContactsActivity::class.java)
+            context.startActivity(intent)
+        }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/appearance/AppearanceSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/appearance/AppearanceSettingsActivity.kt
index bfeea554ee..823728c359 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/appearance/AppearanceSettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/appearance/AppearanceSettingsActivity.kt
@@ -78,8 +78,6 @@ class AppearanceSettingsActivity: PassphraseRequiredActionBarActivity(), View.On
                     viewModel.setNewAccent(R.style.PrimaryGreen)
                 }
             }
-        } else if (v == binding.systemSettingsSwitch) {
-            viewModel.setNewFollowSystemSettings((v as SwitchCompat).isChecked)
         }
     }
 
@@ -115,12 +113,8 @@ class AppearanceSettingsActivity: PassphraseRequiredActionBarActivity(), View.On
         super.onCreate(savedInstanceState, ready)
         binding = ActivityAppearanceSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        savedInstanceState?.let { bundle ->
-            val scrollStateParcel = bundle.getSparseParcelableArray<Parcelable>(SCROLL_PARCEL)
-            if (scrollStateParcel != null) {
-                binding.scrollView.restoreHierarchyState(scrollStateParcel)
-            }
-        }
+        savedInstanceState?.getSparseParcelableArray<Parcelable>(SCROLL_PARCEL)
+            ?.let(binding.scrollView::restoreHierarchyState)
         supportActionBar!!.title = getString(R.string.activity_settings_message_appearance_button_title)
         with (binding) {
             // accent toggles
@@ -132,7 +126,8 @@ class AppearanceSettingsActivity: PassphraseRequiredActionBarActivity(), View.On
                 it.setOnClickListener(this@AppearanceSettingsActivity)
             }
             // system settings toggle
-            systemSettingsSwitch.setOnClickListener(this@AppearanceSettingsActivity)
+            systemSettingsSwitch.setOnCheckedChangeListener { _, isChecked -> viewModel.setNewFollowSystemSettings(isChecked) }
+            systemSettingsSwitchHolder.setOnClickListener { systemSettingsSwitch.toggle() }
         }
 
         lifecycleScope.launchWhenResumed {
@@ -148,6 +143,5 @@ class AppearanceSettingsActivity: PassphraseRequiredActionBarActivity(), View.On
                 }
             }
         }
-
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/color/prominent_button_color.xml b/app/src/main/res/color/prominent_button_color.xml
new file mode 100644
index 0000000000..8f2e692fda
--- /dev/null
+++ b/app/src/main/res/color/prominent_button_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/grey"/>
+    <item android:color="?prominentButtonColor"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/borderless_button_medium_background.xml b/app/src/main/res/drawable/borderless_button_medium_background.xml
new file mode 100644
index 0000000000..6c72f9e72b
--- /dev/null
+++ b/app/src/main/res/drawable/borderless_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
+    <item android:id="@id/mask">
+        <shape>
+            <solid android:color="?colorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
index 1eff84a69b..f3e13c8000 100644
--- a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/transparent" />
-
-    <corners android:radius="@dimen/dialog_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="@color/transparent" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:textColorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/filled_button_medium_background.xml b/app/src/main/res/drawable/filled_button_medium_background.xml
new file mode 100644
index 0000000000..10eb6de679
--- /dev/null
+++ b/app/src/main/res/drawable/filled_button_medium_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:textColorPrimary">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?colorDividerBackground"/>
+            <corners android:radius="16dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/preference_bottom.xml b/app/src/main/res/drawable/preference_bottom.xml
index d751c7841b..b6c5f506fd 100644
--- a/app/src/main/res/drawable/preference_bottom.xml
+++ b/app/src/main/res/drawable/preference_bottom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
     <item android:left="@dimen/medium_spacing"
         android:right="@dimen/medium_spacing"
         android:bottom="@dimen/small_spacing"
@@ -10,4 +11,4 @@
                 android:bottomRightRadius="?preferenceCornerRadius"/>
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_middle.xml b/app/src/main/res/drawable/preference_middle.xml
index 0f7229cb7f..bf27aacc72 100644
--- a/app/src/main/res/drawable/preference_middle.xml
+++ b/app/src/main/res/drawable/preference_middle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
     <item android:left="@dimen/medium_spacing"
         android:right="@dimen/medium_spacing">
         <shape android:shape="rectangle">
@@ -14,4 +15,4 @@
             <solid android:color="@color/transparent_white_15"/>
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_single.xml b/app/src/main/res/drawable/preference_single.xml
index da856fcd18..7caf24a084 100644
--- a/app/src/main/res/drawable/preference_single.xml
+++ b/app/src/main/res/drawable/preference_single.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
     <item android:left="@dimen/medium_spacing"
         android:top="@dimen/small_spacing"
         android:right="@dimen/medium_spacing"
@@ -9,4 +10,4 @@
             <corners android:radius="?preferenceCornerRadius"/>
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_top.xml b/app/src/main/res/drawable/preference_top.xml
index a997713e23..8f56ddc870 100644
--- a/app/src/main/res/drawable/preference_top.xml
+++ b/app/src/main/res/drawable/preference_top.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
     <item android:left="@dimen/medium_spacing"
         android:right="@dimen/medium_spacing"
         android:top="@dimen/small_spacing"
@@ -18,4 +19,4 @@
             <solid android:color="@color/transparent_white_15"/>
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable/prominent_filled_button_medium_background.xml b/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
index a06a0d11e5..698a67c0a9 100644
--- a/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
+++ b/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="?colorAccent" />
-
-    <corners android:radius="@dimen/medium_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorPrimary">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?colorAccent"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/radial_select.xml b/app/src/main/res/drawable/radial_select.xml
index a56519ed6e..e09c778d0c 100644
--- a/app/src/main/res/drawable/radial_select.xml
+++ b/app/src/main/res/drawable/radial_select.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?colorControlHighlight">
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <shape android:shape="oval">
+                    <stroke android:width="1dp" android:color="?android:textColorPrimary"/>
+                </shape>
+            </item>
+            <item android:state_selected="false">
+                <shape android:shape="oval">
+                </shape>
+            </item>
+        </selector>
+    </item>
+    <item android:id="@android:id/mask">
         <shape android:shape="oval">
-            <stroke android:width="1dp" android:color="?android:textColorPrimary"/>
+            <solid android:color="@color/black"/>
         </shape>
     </item>
-    <item android:state_selected="false">
-        <shape android:shape="oval">
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
+</ripple>
diff --git a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
index 1eff84a69b..f3e13c8000 100644
--- a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/transparent" />
-
-    <corners android:radius="@dimen/dialog_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="@color/transparent" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:textColorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml b/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
index 6e0de35a5b..d12f7408d9 100644
--- a/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/transparent" />
-
-    <corners android:radius="@dimen/medium_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="?android:textColorPrimary" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:textColorPrimary">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?colorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+            <stroke
+                android:color="?android:textColorPrimary"
+                android:width="@dimen/border_thickness" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout-sw400dp/activity_landing.xml b/app/src/main/res/layout-sw400dp/activity_landing.xml
index 1e89cd967d..5e5a36704a 100644
--- a/app/src/main/res/layout-sw400dp/activity_landing.xml
+++ b/app/src/main/res/layout-sw400dp/activity_landing.xml
@@ -52,6 +52,7 @@
         android:text="@string/activity_landing_restore_button_title" />
 
     <Button
+        style="@style/Widget.Session.Button.Common.Borderless"
         android:id="@+id/linkButton"
         android:contentDescription="@string/AccessibilityId_link_a_device"
         android:layout_width="match_parent"
@@ -59,7 +60,6 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
         android:gravity="center"
-        android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
         android:text="@string/activity_link_device_link_device" />
diff --git a/app/src/main/res/layout-sw400dp/activity_seed.xml b/app/src/main/res/layout-sw400dp/activity_seed.xml
index 09927d1685..97b63ede5e 100644
--- a/app/src/main/res/layout-sw400dp/activity_seed.xml
+++ b/app/src/main/res/layout-sw400dp/activity_seed.xml
@@ -50,15 +50,14 @@
         android:textAlignment="center"
         tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
-    <TextView
+    <Button
         android:id="@+id/revealButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
         android:textAlignment="center"
         android:textSize="16sp"
-        android:textColor="?android:textColorPrimary"
         android:alpha="0.6"
+        style="@style/Widget.Session.Button.Common.Borderless"
         android:text="@string/activity_seed_reveal_button_title" />
 
     <View
diff --git a/app/src/main/res/layout/activity_appearance_settings.xml b/app/src/main/res/layout/activity_appearance_settings.xml
index fbafa632d5..ce33af82f1 100644
--- a/app/src/main/res/layout/activity_appearance_settings.xml
+++ b/app/src/main/res/layout/activity_appearance_settings.xml
@@ -11,6 +11,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <TextView
             android:textColor="?android:textColorTertiary"
             android:textSize="@dimen/medium_font_size"
@@ -20,127 +21,170 @@
             android:layout_height="wrap_content"
             android:text="@string/activity_appearance_themes_category"/>
 
-        <LinearLayout
-            android:id="@+id/theme_option_classic_dark"
-            android:background="@drawable/preference_top"
+        <androidx.cardview.widget.CardView
+            app:cardElevation="0dp"
+            app:cardCornerRadius="@dimen/dialog_corner_radius"
+            android:layout_marginHorizontal="@dimen/medium_spacing"
+            app:cardBackgroundColor="?colorSettingsBackground"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:paddingVertical="@dimen/medium_spacing"
-            android:orientation="horizontal">
-            <ImageView
-                android:theme="@style/Classic.Dark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_themepreview"/>
-            <TextView
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-                android:lines="1"
-                android:textSize="16sp"
-                android:text="@string/classic_dark_theme_name"
-                android:padding="@dimen/medium_spacing"
-                android:layout_gravity="center"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-            <RadioButton
-                android:id="@+id/theme_radio_classic_dark"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/small_spacing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/theme_option_classic_light"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/preference_middle"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:paddingVertical="@dimen/small_spacing"
-            android:orientation="horizontal">
-            <ImageView
-                android:theme="@style/Classic.Light"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_themepreview"/>
-            <TextView
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-                android:textSize="16sp"
-                android:lines="1"
-                android:text="@string/classic_light_theme_name"
-                android:padding="@dimen/medium_spacing"
-                android:layout_gravity="center"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-            <RadioButton
-                android:id="@+id/theme_radio_classic_light"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/small_spacing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/theme_option_ocean_dark"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/preference_middle"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:paddingVertical="@dimen/medium_spacing"
-            android:orientation="horizontal">
-            <ImageView
-                android:theme="@style/Ocean.Dark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_themepreview"/>
-            <TextView
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-                android:textSize="16sp"
-                android:lines="1"
-                android:text="@string/ocean_dark_theme_name"
-                android:padding="@dimen/medium_spacing"
-                android:layout_gravity="center"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-            <RadioButton
-                android:id="@+id/theme_radio_ocean_dark"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/small_spacing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/theme_option_ocean_light"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/preference_bottom"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:paddingTop="@dimen/medium_spacing"
-            android:paddingBottom="@dimen/large_spacing"
-            android:orientation="horizontal">
-            <ImageView
-                android:theme="@style/Ocean.Light"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_themepreview"/>
-            <TextView
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-                android:textSize="16sp"
-                android:lines="1"
-                android:text="@string/ocean_light_theme_name"
-                android:padding="@dimen/medium_spacing"
-                android:layout_gravity="center"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"/>
-            <RadioButton
-                android:id="@+id/theme_radio_ocean_light"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/small_spacing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:id="@+id/theme_option_classic_dark"
+                    android:addStatesFromChildren="true"
+                    android:background="?selectableItemBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/small_spacing"
+                    android:paddingVertical="@dimen/small_spacing"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:theme="@style/Classic.Dark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_themepreview"/>
+                    <TextView
+                        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+                        android:lines="1"
+                        android:textSize="16sp"
+                        android:text="@string/classic_dark_theme_name"
+                        android:padding="@dimen/medium_spacing"
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"/>
+                    <RadioButton
+                        android:id="@+id/theme_radio_classic_dark"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/small_spacing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
+                <View
+                    android:alpha="0.15"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?android:textColorPrimary"/>
+
+                <LinearLayout
+                    android:id="@+id/theme_option_classic_light"
+                    android:addStatesFromChildren="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:paddingHorizontal="@dimen/small_spacing"
+                    android:paddingVertical="@dimen/small_spacing"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:theme="@style/Classic.Light"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_themepreview"/>
+                    <TextView
+                        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+                        android:textSize="16sp"
+                        android:lines="1"
+                        android:text="@string/classic_light_theme_name"
+                        android:padding="@dimen/medium_spacing"
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"/>
+                    <RadioButton
+                        android:id="@+id/theme_radio_classic_light"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/small_spacing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
+                <View
+                    android:alpha="0.15"
+                    android:layout_marginHorizontal="@dimen/medium_spacing"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?android:textColorPrimary"/>
+
+                <LinearLayout
+                    android:id="@+id/theme_option_ocean_dark"
+                    android:addStatesFromChildren="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:paddingHorizontal="@dimen/small_spacing"
+                    android:paddingVertical="@dimen/small_spacing"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:theme="@style/Ocean.Dark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_themepreview"/>
+                    <TextView
+                        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+                        android:textSize="16sp"
+                        android:lines="1"
+                        android:text="@string/ocean_dark_theme_name"
+                        android:padding="@dimen/medium_spacing"
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"/>
+                    <RadioButton
+                        android:id="@+id/theme_radio_ocean_dark"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/small_spacing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
+                <View
+                    android:alpha="0.15"
+                    android:layout_marginHorizontal="@dimen/medium_spacing"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?android:textColorPrimary"/>
+
+                <LinearLayout
+                    android:id="@+id/theme_option_ocean_light"
+                    android:addStatesFromChildren="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?selectableItemBackground"
+                    android:paddingHorizontal="@dimen/small_spacing"
+                    android:paddingVertical="@dimen/small_spacing"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:theme="@style/Ocean.Light"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/ic_themepreview"/>
+                    <TextView
+                        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+                        android:textSize="16sp"
+                        android:lines="1"
+                        android:text="@string/ocean_light_theme_name"
+                        android:padding="@dimen/medium_spacing"
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"/>
+                    <RadioButton
+                        android:id="@+id/theme_radio_ocean_light"
+                        android:layout_gravity="center"
+                        android:layout_margin="@dimen/small_spacing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+
         <TextView
             android:textColor="?android:textColorTertiary"
             android:textSize="@dimen/medium_font_size"
@@ -208,8 +252,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginVertical="@dimen/medium_spacing"
-            android:layout_marginHorizontal="@dimen/large_spacing">
+            android:layout_marginVertical="@dimen/small_spacing"
+            android:layout_marginHorizontal="@dimen/small_spacing">
             <View
                 android:id="@+id/accent_green"
                 android:background="@drawable/padded_circle_tintable"
@@ -270,29 +314,39 @@
             android:layout_height="wrap_content"
             android:text="@string/activity_appearance_follow_system_category"/>
 
-        <LinearLayout
-            android:padding="@dimen/medium_spacing"
+        <androidx.cardview.widget.CardView
+            app:cardElevation="0dp"
+            android:elevation="0dp"
+            app:cardBackgroundColor="?colorSettingsBackground"
+            app:cardCornerRadius="@dimen/dialog_corner_radius"
+            android:layout_margin="@dimen/medium_spacing"
             android:layout_marginBottom="@dimen/massive_spacing"
-            android:background="@drawable/preference_single"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center">
-            <TextView
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"
-                android:textSize="@dimen/medium_font_size"
-                android:paddingHorizontal="@dimen/large_spacing"
-                android:paddingVertical="@dimen/small_spacing"
-                android:text="@string/activity_appearance_follow_system_explanation"
-                android:layout_width="0dp"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/system_settings_switch_holder"
+                android:background="?selectableItemBackground"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"/>
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/system_settings_switch"
-                android:paddingHorizontal="@dimen/large_spacing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
+                android:addStatesFromChildren="true"
+                android:gravity="center">
+                <TextView
+                    android:textColor="?android:textColorPrimary"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/medium_font_size"
+                    android:paddingHorizontal="@dimen/large_spacing"
+                    android:paddingVertical="@dimen/small_spacing"
+                    android:text="@string/activity_appearance_follow_system_explanation"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/system_settings_switch"
+                    android:paddingHorizontal="@dimen/large_spacing"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index deb8ada4c6..131cdeda52 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -57,6 +57,7 @@
 
                 <RelativeLayout
                     android:id="@+id/searchViewContainer"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/AccessibilityId_search_icon"
                     android:layout_width="@dimen/small_profile_picture_size"
                     android:layout_height="@dimen/small_profile_picture_size"
diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
index 3b93a67089..b7c3d1d6bd 100644
--- a/app/src/main/res/layout/activity_landing.xml
+++ b/app/src/main/res/layout/activity_landing.xml
@@ -52,13 +52,13 @@
         android:text="@string/activity_landing_restore_button_title" />
 
     <Button
+        style="@style/Widget.Session.Button.Common.Borderless"
         android:contentDescription="@string/AccessibilityId_link_a_device"
         android:id="@+id/linkButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/onboarding_button_bottom_offset"
         android:layout_marginHorizontal="@dimen/massive_spacing"
         android:gravity="center"
-        android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
         android:text="@string/activity_link_device_link_device" />
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 956c8d18d1..0cdbeb992a 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -42,7 +42,7 @@
             android:layout_marginRight="@dimen/very_large_spacing"
             android:padding="12dp"
             android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
+            android:background="@color/pn_option_border">
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_seed.xml b/app/src/main/res/layout/activity_seed.xml
index 161c6ea56b..4587bc01df 100644
--- a/app/src/main/res/layout/activity_seed.xml
+++ b/app/src/main/res/layout/activity_seed.xml
@@ -50,16 +50,16 @@
         android:textAlignment="center"
         tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
 
-    <TextView
+    <Button
         android:id="@+id/revealButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginHorizontal="@dimen/massive_spacing"
         android:textAlignment="center"
         android:textSize="14sp"
-        android:textColor="?android:textColorPrimary"
         android:alpha="0.6"
         android:visibility="gone"
+        style="@style/Widget.Session.Button.Common.Borderless"
         android:text="@string/activity_seed_reveal_button_title" />
 
     <View
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 023096e4d4..fd8aa1c7a5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -121,6 +121,7 @@
                 <!-- Path -->
                 <RelativeLayout
                     android:id="@+id/pathButton"
+                    android:background="?selectableItemBackground"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:paddingHorizontal="@dimen/large_spacing"
@@ -157,6 +158,7 @@
 
                 <RelativeLayout
                     android:id="@+id/privacyButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height">
@@ -190,6 +192,7 @@
 
                 <RelativeLayout
                     android:id="@+id/notificationsButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -226,6 +229,7 @@
 
                 <RelativeLayout
                     android:id="@+id/chatsButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -261,6 +265,7 @@
 
                 <RelativeLayout
                     android:id="@+id/messageRequestsButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -295,6 +300,7 @@
 
                 <RelativeLayout
                     android:id="@+id/appearanceButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -329,6 +335,7 @@
 
                 <RelativeLayout
                     android:id="@+id/inviteFriendButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -363,6 +370,7 @@
 
                 <RelativeLayout
                     android:id="@+id/seedButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -397,6 +405,7 @@
 
                 <RelativeLayout
                     android:id="@+id/helpButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
@@ -431,6 +440,7 @@
 
                 <RelativeLayout
                     android:id="@+id/clearAllDataButton"
+                    android:background="?selectableItemBackground"
                     android:paddingHorizontal="@dimen/large_spacing"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/setting_button_height"
diff --git a/app/src/main/res/layout/blocked_contacts_preference.xml b/app/src/main/res/layout/blocked_contacts_preference.xml
index e7aed74700..83fe432cf9 100644
--- a/app/src/main/res/layout/blocked_contacts_preference.xml
+++ b/app/src/main/res/layout/blocked_contacts_preference.xml
@@ -4,14 +4,15 @@
     android:layout_marginHorizontal="@dimen/large_spacing"
     android:layout_marginVertical="@dimen/medium_spacing"
     android:layout_height="wrap_content">
-    <TextView
+    <Button
         android:contentDescription="@string/AccessibilityId_blocked_contacts"
-        android:layout_width="match_parent"
+        style="@style/Widget.Session.Button.Common.Borderless"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_spacing"
+        android:paddingHorizontal="@dimen/medium_spacing"
         android:text="@string/blocked_contacts_title"
         android:textColor="@color/destructive"
         android:textSize="16sp"
         android:textStyle="bold"
         />
-</org.thoughtcrime.securesms.preferences.BlockedContactsLayout>
\ No newline at end of file
+</org.thoughtcrime.securesms.preferences.BlockedContactsLayout>
diff --git a/app/src/main/res/layout/export_logs_widget.xml b/app/src/main/res/layout/export_logs_widget.xml
index 683648154b..95c681d397 100644
--- a/app/src/main/res/layout/export_logs_widget.xml
+++ b/app/src/main/res/layout/export_logs_widget.xml
@@ -5,9 +5,7 @@
     android:layout_height="match_parent">
     <TextView
         android:layout_gravity="center"
-        android:background="@drawable/rounded_rectangle"
-        android:backgroundTint="?colorDividerBackground"
-        android:textColor="?android:textColorPrimary"
+        style="@style/Widget.Session.Button.Common.Filled"
         android:textStyle="bold"
         android:text="@string/activity_help_settings__export_logs"
         android:paddingHorizontal="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml
index 9cbb97f64b..af685fa9f6 100644
--- a/app/src/main/res/layout/fragment_create_group.xml
+++ b/app/src/main/res/layout/fragment_create_group.xml
@@ -22,9 +22,11 @@
 
     <ImageView
         android:id="@+id/backButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/medium_spacing"
+        android:layout_marginStart="@dimen/small_spacing"
         android:clickable="true"
         android:contentDescription="@string/new_conversation_dialog_back_button_content_description"
         android:focusable="true"
@@ -36,9 +38,11 @@
 
     <ImageView
         android:id="@+id/closeButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/medium_spacing"
+        android:layout_marginEnd="@dimen/small_spacing"
         android:clickable="true"
         android:contentDescription="@string/new_conversation_dialog_close_button_content_description"
         android:focusable="true"
@@ -91,12 +95,6 @@
         tools:itemCount="5"
         tools:listitem="@layout/view_user" />
 
-    <View
-        android:background="?conversation_menu_border_color"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        app:layout_constraintTop_toTopOf="@id/recyclerView"/>
-
     <Button
         android:id="@+id/createClosedGroupButton"
         style="@style/Widget.Session.Button.Common.ProminentOutline"
@@ -130,13 +128,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/titleText" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/massive_spacing"
-        app:layout_constraintBottom_toBottomOf="@+id/recyclerView"
-        android:background="@drawable/conversation_menu_gradient"
-        />
-
     <Button
         android:id="@+id/createNewPrivateChatButton"
         style="@style/Widget.Session.Button.Common.ProminentOutline"
diff --git a/app/src/main/res/layout/fragment_join_community.xml b/app/src/main/res/layout/fragment_join_community.xml
index b5d2e2db25..e8bbdc0cc1 100644
--- a/app/src/main/res/layout/fragment_join_community.xml
+++ b/app/src/main/res/layout/fragment_join_community.xml
@@ -20,6 +20,8 @@
 
     <ImageView
         android:id="@+id/backButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/medium_spacing"
@@ -34,6 +36,8 @@
 
     <ImageView
         android:id="@+id/closeButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/medium_spacing"
@@ -52,7 +56,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/titleText" />
-
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_new_conversation_home.xml b/app/src/main/res/layout/fragment_new_conversation_home.xml
index d105c78751..1e649dd968 100644
--- a/app/src/main/res/layout/fragment_new_conversation_home.xml
+++ b/app/src/main/res/layout/fragment_new_conversation_home.xml
@@ -32,11 +32,13 @@
             android:id="@+id/closeButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:padding="@dimen/small_spacing"
             android:layout_marginStart="@dimen/large_spacing"
             android:clickable="true"
             android:contentDescription="@string/new_conversation_dialog_close_button_content_description"
             android:focusable="true"
             android:src="@drawable/ic_baseline_close_24"
+            android:background="?selectableItemBackgroundBorderless"
             app:layout_constraintBottom_toTopOf="@id/title_divider"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -68,6 +70,7 @@
             android:text="@string/dialog_new_message_title"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/medium_font_size"
+            android:background="?selectableItemBackground"
             app:drawableStartCompat="@drawable/ic_message"
             app:layout_constraintBottom_toTopOf="@+id/new_message_divider"
             app:layout_constraintEnd_toEndOf="parent"
@@ -94,6 +97,7 @@
             android:text="@string/activity_create_group_title"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/medium_font_size"
+            android:background="?selectableItemBackground"
             app:drawableStartCompat="@drawable/ic_group"
             app:layout_constraintBottom_toTopOf="@+id/create_group_divider"
             app:layout_constraintEnd_toEndOf="parent"
@@ -120,6 +124,7 @@
             android:text="@string/dialog_join_community_title"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/medium_font_size"
+            android:background="?selectableItemBackground"
             app:drawableStartCompat="@drawable/ic_globe"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 226a869eb5..8a53b01950 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -21,6 +21,8 @@
 
     <ImageView
         android:id="@+id/backButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/medium_spacing"
@@ -35,6 +37,8 @@
 
     <ImageView
         android:id="@+id/closeButton"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="@dimen/small_spacing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/medium_spacing"
diff --git a/app/src/main/res/layout/view_global_search_input.xml b/app/src/main/res/layout/view_global_search_input.xml
index 9036492ac6..d559d52aeb 100644
--- a/app/src/main/res/layout/view_global_search_input.xml
+++ b/app/src/main/res/layout/view_global_search_input.xml
@@ -39,13 +39,15 @@
             android:layout_height="wrap_content"/>
         <ImageView
             android:id="@+id/search_clear"
+            android:background="?selectableItemBackgroundBorderless"
             android:src="@drawable/ic_close_white_18dp"
             android:layout_gravity="center_vertical"
             android:layout_width="16dp"
             android:layout_height="16dp"
             app:tint="?searchIconColor" />
     </LinearLayout>
-    <TextView
+    <Button
+        style="@style/Widget.Session.Button.Common.Borderless"
         android:layout_marginStart="@dimen/small_spacing"
         android:layout_centerVertical="true"
         android:text="@string/cancel"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a9bf9f4ab2..c3ef7c2bc9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -82,38 +82,31 @@
     <style name="Widget.Session.Button.Common.ProminentFilled">
         <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:drawableTint">?android:textColorPrimary</item>
+    </style>
+
+    <style name="Widget.Session.Button.Common.Filled">
+        <item name="android:background">@drawable/filled_button_medium_background</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
     <style name="Widget.Session.Button.Common.ProminentOutline">
         <item name="android:background">@drawable/prominent_outline_button_medium_background</item>
-        <item name="android:textColor">?attr/prominentButtonColor</item>
-        <item name="android:drawableTint">?attr/prominentButtonColor</item>
-    </style>
-
-    <style name="Widget.Session.Button.Common.UnimportantFilled">
-        <item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:drawableTint">?android:textColorPrimary</item>
+        <item name="android:textColor">@color/prominent_button_color</item>
     </style>
 
     <style name="Widget.Session.Button.Common.UnimportantOutline">
         <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:drawableTint">?android:textColorPrimary</item>
     </style>
 
-    <style name="Widget.Session.Button.Common.UnimportantDestructive">
-        <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
+    <style name="Widget.Session.Button.Common.Borderless">
+        <item name="android:background">@drawable/borderless_button_medium_background</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:backgroundTint">@color/destructive</item>
-        <item name="android:drawableTint">@color/destructive</item>
     </style>
 
     <style name="Widget.Session.Button.Common.DestructiveOutline">
         <item name="android:background">@drawable/destructive_outline_button_medium_background</item>
         <item name="android:textColor">@color/button_destructive</item>
-        <item name="android:drawableTint">?android:textColorPrimary</item>
     </style>
 
     <style name="Widget.Session.Button.Dialog" parent="">
@@ -269,7 +262,7 @@
         <item name="android:padding">@dimen/normal_padding</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:selectable">true</item>
-        <item name="android:foreground">?attr/selectableItemBackground</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
     <style name="PopupMenu.ConversationItem" parent="@style/Widget.AppCompat.PopupMenu">