diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt
index 3fa861fb71..c1ac53baa8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt
@@ -34,7 +34,7 @@ fun AppTheme(
 ) {
     val extraColors = LocalContext.current.run {
         ExtraColors(
-            settingsBackground = getColorFromTheme(R.attr.colorSettingsBackground),
+            settingsBackground = getColorFromTheme(R.attr.backgroundSecondary),
             prominentButtonColor = getColorFromTheme(R.attr.prominentButtonColor),
         )
     }
diff --git a/app/src/main/res/drawable/conversation_view_background.xml b/app/src/main/res/drawable/conversation_view_background.xml
index 2f177318e0..50e38698b4 100644
--- a/app/src/main/res/drawable/conversation_view_background.xml
+++ b/app/src/main/res/drawable/conversation_view_background.xml
@@ -4,6 +4,6 @@
     android:color="?android:colorControlHighlight">
 
     <item>
-        <color android:color="?colorCellBackground" />
+        <color android:color="?colorPrimary" />
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_bottom_sheet_background.xml b/app/src/main/res/drawable/default_bottom_sheet_background.xml
index 63532b0d05..19300aae39 100644
--- a/app/src/main/res/drawable/default_bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/default_bottom_sheet_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="?dialog_background_color" />
+    <solid android:color="?backgroundSecondary" />
 
     <corners
         android:topLeftRadius="@dimen/dialog_corner_radius"
diff --git a/app/src/main/res/drawable/default_dialog_background.xml b/app/src/main/res/drawable/default_dialog_background.xml
index 00953c88a4..d2e3dfbfa7 100644
--- a/app/src/main/res/drawable/default_dialog_background.xml
+++ b/app/src/main/res/drawable/default_dialog_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="?attr/dialog_background_color" />
+    <solid android:color="?backgroundSecondary" />
 
     <corners android:radius="?dialogCornerRadius" />
 
diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml
index d607bfc022..e546e1f84c 100644
--- a/app/src/main/res/drawable/dialog_background.xml
+++ b/app/src/main/res/drawable/dialog_background.xml
@@ -6,6 +6,6 @@
     android:insetBottom="16dp">
     <shape android:shape="rectangle">
         <corners android:radius="2dp" />
-        <solid android:color="?dialog_background_color" />
+        <solid android:color="?backgroundSecondary" />
     </shape>
 </inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_clear_data.xml b/app/src/main/res/drawable/ic_clear_data.xml
index 320015bb23..84465dd4cb 100644
--- a/app/src/main/res/drawable/ic_clear_data.xml
+++ b/app/src/main/res/drawable/ic_clear_data.xml
@@ -7,5 +7,5 @@
       android:pathData="M19.907,7.674H19.907H4.54H4.54C4.317,7.674 4.095,7.719 3.888,7.806L3.888,7.806C3.681,7.893 3.491,8.023 3.334,8.189C3.176,8.355 3.054,8.554 2.978,8.775L3.922,9.097L2.978,8.775C2.903,8.996 2.877,9.231 2.904,9.465L2.904,9.465L2.904,9.469L4.555,23.412C4.555,23.413 4.555,23.413 4.555,23.414C4.603,23.823 4.807,24.189 5.111,24.447C5.415,24.705 5.798,24.84 6.187,24.84H6.188H18.26H18.26C18.649,24.84 19.032,24.705 19.336,24.447C19.64,24.189 19.844,23.823 19.892,23.414C19.892,23.413 19.892,23.413 19.892,23.412L21.543,9.469L21.544,9.465C21.57,9.231 21.544,8.996 21.469,8.775L21.469,8.775C21.393,8.554 21.271,8.355 21.113,8.189C20.956,8.023 20.766,7.893 20.559,7.806L20.17,8.728L20.559,7.806C20.352,7.719 20.13,7.674 19.907,7.674ZM21.412,1.84H3.031C2.045,1.84 1.149,2.609 1.149,3.674V5.828C1.149,6.893 2.045,7.662 3.031,7.662H21.412C22.398,7.662 23.294,6.893 23.294,5.828V3.674C23.294,2.609 22.398,1.84 21.412,1.84Z"
       android:strokeWidth="2"
       android:fillColor="#FF3A3A"
-      android:strokeColor="?colorPrimaryDark"/>
+      android:strokeColor="?backgroundSecondary"/>
 </vector>
diff --git a/app/src/main/res/drawable/preference_bottom.xml b/app/src/main/res/drawable/preference_bottom.xml
index b6c5f506fd..888778b1cb 100644
--- a/app/src/main/res/drawable/preference_bottom.xml
+++ b/app/src/main/res/drawable/preference_bottom.xml
@@ -6,7 +6,7 @@
         android:bottom="@dimen/small_spacing"
         >
         <shape android:shape="rectangle">
-            <solid android:color="?colorSettingsBackground"/>
+            <solid android:color="?backgroundSecondary"/>
             <corners android:bottomLeftRadius="?preferenceCornerRadius"
                 android:bottomRightRadius="?preferenceCornerRadius"/>
         </shape>
diff --git a/app/src/main/res/drawable/preference_middle.xml b/app/src/main/res/drawable/preference_middle.xml
index bf27aacc72..287645ab83 100644
--- a/app/src/main/res/drawable/preference_middle.xml
+++ b/app/src/main/res/drawable/preference_middle.xml
@@ -4,7 +4,7 @@
     <item android:left="@dimen/medium_spacing"
         android:right="@dimen/medium_spacing">
         <shape android:shape="rectangle">
-            <solid android:color="?colorSettingsBackground"/>
+            <solid android:color="?backgroundSecondary"/>
         </shape>
     </item>
     <item android:gravity="bottom"
diff --git a/app/src/main/res/drawable/preference_single.xml b/app/src/main/res/drawable/preference_single.xml
index 7caf24a084..1123808af0 100644
--- a/app/src/main/res/drawable/preference_single.xml
+++ b/app/src/main/res/drawable/preference_single.xml
@@ -6,7 +6,7 @@
         android:right="@dimen/medium_spacing"
         android:bottom="@dimen/small_spacing">
         <shape android:shape="rectangle">
-            <solid android:color="?colorSettingsBackground"/>
+            <solid android:color="?backgroundSecondary"/>
             <corners android:radius="?preferenceCornerRadius"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/preference_single_no_padding.xml b/app/src/main/res/drawable/preference_single_no_padding.xml
index 252ab0aea3..483894fcc2 100644
--- a/app/src/main/res/drawable/preference_single_no_padding.xml
+++ b/app/src/main/res/drawable/preference_single_no_padding.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?colorSettingsBackground"/>
+            <solid android:color="?backgroundSecondary"/>
             <corners android:radius="?preferenceCornerRadius"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/preference_top.xml b/app/src/main/res/drawable/preference_top.xml
index 8f56ddc870..180aa9f73f 100644
--- a/app/src/main/res/drawable/preference_top.xml
+++ b/app/src/main/res/drawable/preference_top.xml
@@ -6,7 +6,7 @@
         android:top="@dimen/small_spacing"
         >
         <shape android:shape="rectangle">
-            <solid android:color="?colorSettingsBackground"/>
+            <solid android:color="?backgroundSecondary"/>
             <corners android:topLeftRadius="?preferenceCornerRadius"
                 android:topRightRadius="?preferenceCornerRadius"/>
         </shape>
diff --git a/app/src/main/res/layout/activity_appearance_settings.xml b/app/src/main/res/layout/activity_appearance_settings.xml
index ce33af82f1..c4886708a3 100644
--- a/app/src/main/res/layout/activity_appearance_settings.xml
+++ b/app/src/main/res/layout/activity_appearance_settings.xml
@@ -25,7 +25,7 @@
             app:cardElevation="0dp"
             app:cardCornerRadius="@dimen/dialog_corner_radius"
             android:layout_marginHorizontal="@dimen/medium_spacing"
-            app:cardBackgroundColor="?colorSettingsBackground"
+            app:cardBackgroundColor="?backgroundSecondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <LinearLayout
@@ -317,7 +317,7 @@
         <androidx.cardview.widget.CardView
             app:cardElevation="0dp"
             android:elevation="0dp"
-            app:cardBackgroundColor="?colorSettingsBackground"
+            app:cardBackgroundColor="?backgroundSecondary"
             app:cardCornerRadius="@dimen/dialog_corner_radius"
             android:layout_margin="@dimen/medium_spacing"
             android:layout_marginBottom="@dimen/massive_spacing"
diff --git a/app/src/main/res/layout/activity_blocked_contacts.xml b/app/src/main/res/layout/activity_blocked_contacts.xml
index f02ad7cb31..8d960ad231 100644
--- a/app/src/main/res/layout/activity_blocked_contacts.xml
+++ b/app/src/main/res/layout/activity_blocked_contacts.xml
@@ -10,7 +10,7 @@
         app:layout_constraintBottom_toTopOf="@+id/unblockButton"
         app:cardCornerRadius="?preferenceCornerRadius"
         app:cardElevation="0dp"
-        app:cardBackgroundColor="?colorSettingsBackground"
+        app:cardBackgroundColor="?backgroundSecondary"
         android:layout_marginHorizontal="@dimen/medium_spacing"
         android:layout_marginVertical="@dimen/large_spacing"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/default_group_chip.xml b/app/src/main/res/layout/default_group_chip.xml
index 911d67234b..905c80aa8f 100644
--- a/app/src/main/res/layout/default_group_chip.xml
+++ b/app/src/main/res/layout/default_group_chip.xml
@@ -10,7 +10,7 @@
     android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
     app:chipStrokeWidth="1dp"
     app:chipStrokeColor="?elementBorderColor"
-    app:chipBackgroundColor="?dialog_background_color"
+    app:chipBackgroundColor="?backgroundSecondary"
     app:chipMinTouchTargetSize="0dp"
     app:chipStartPadding="4dp"
     tools:ignore="TouchTargetSizeCheck"
diff --git a/app/src/main/res/layout/view_search_bottom_bar.xml b/app/src/main/res/layout/view_search_bottom_bar.xml
index 7c08377a70..51bdd881ff 100644
--- a/app/src/main/res/layout/view_search_bottom_bar.xml
+++ b/app/src/main/res/layout/view_search_bottom_bar.xml
@@ -61,7 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:background="?colorPrimaryDark"
+            android:background="?backgroundSecondary"
             app:SpinKit_Color="?android:textColorPrimary"
             android:visibility="gone"/>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ae38d0c057..aa356619fe 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -29,6 +29,7 @@
     <attr name="ic_visibility_off" format="reference" />
 
     <attr name="accentColor" format="reference|color"/>
+    <attr name="backgroundSecondary" format="reference|color"/>
     <attr name="prominentButtonColor" format="reference|color"/>
     <attr name="elementBorderColor" format="reference|color"/>
     <attr name="conversation_background" format="reference|color"/>
@@ -56,8 +57,6 @@
 
     <attr name="emoji_tab_strip_background" format="color" />
     <attr name="emoji_tab_indicator" format="color" />
-    <attr name="emoji_tab_underline" format="color" />
-    <attr name="emoji_tab_seperator" format="color" />
     <attr name="emoji_drawer_background" format="color" />
     <attr name="emoji_text_color" format="color" />
 
@@ -97,7 +96,6 @@
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
-    <attr name="dialog_background_color" format="reference|color" />
     <attr name="conversation_menu_background_color" format="reference|color" />
     <attr name="conversation_menu_cell_color" format="reference|color"/>
     <attr name="conversation_menu_border_color" format="reference|color"/>
@@ -152,7 +150,6 @@
     <attr name="default_background_start" format="color|reference"/>
     <attr name="default_background_end" format="color|reference"/>
     <attr name="colorCellBackground" format="color|reference" />
-    <attr name="colorSettingsBackground" format="color|reference" />
     <attr name="colorDividerBackground" format="color|reference" />
     <attr name="outlineButtonBorder" format="color|reference" />
     <attr name="outlineButtonText" format="color|reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index eae5a2b167..a427629180 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -43,8 +43,6 @@
     <color name="gray27">#ffbbbbbb</color>
     <color name="gray50">#ff808080</color>
     <color name="gray65">#ff595959</color>
-    <color name="gray70">#ff4d4d4d</color>
-    <color name="gray78">#ff383838</color>
 
     <color name="transparent_black_6">#0f000000</color>
     <color name="transparent_black_15">#26000000</color>
@@ -126,7 +124,7 @@
 
     <color name="classic_accent">#31F196</color>
 
-    <color name="classic_dark_0">#111111</color>
+    <color name="classic_dark_0">#000000</color>
     <color name="classic_dark_1">#1B1B1B</color>
     <color name="classic_dark_2">#2D2D2D</color>
     <color name="classic_dark_3">#414141</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 412eec96db..77140251ec 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,8 +24,7 @@
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
         <item name="android:windowBackground">@drawable/default_dialog_background</item>
-        <item name="android:colorBackground">?attr/dialog_background_color</item>
-        <item name="dialog_background_color">?colorPrimary</item>
+        <item name="android:colorBackground">?backgroundSecondary</item>
         <item name="android:colorBackgroundFloating">?colorPrimary</item>
         <item name="backgroundTint">?colorPrimary</item>
         <item name="android:backgroundDimEnabled">true</item>
@@ -288,7 +287,7 @@
     </style>
 
     <style name="PopupMenu.MessageRequests" parent="@style/Widget.AppCompat.PopupMenu">
-        <item name="android:background">?attr/colorSettingsBackground</item>
+        <item name="android:background">?backgroundSecondary</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 428d37c5ef..66865cca95 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,7 @@
    <style name="Base.Theme.Session" parent="@style/Theme.AppCompat.DayNight">
        <item name="actionModeBackground">?colorPrimary</item>
        <item name="android:colorBackground">?colorPrimary</item>
-       <item name="dialog_background_color">?colorPrimary</item>
+       <item name="backgroundSecondary">@color/classic_dark_1</item>
        <item name="theme_preview_incoming">?message_received_background_color</item>
        <item name="theme_preview_outgoing">?message_sent_background_color</item>
        <item name="theme_preview_background">?colorPrimary</item>
@@ -33,7 +33,7 @@
        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.MaterialComponents.SmallComponent</item>
        <item name="elementBorderColor">?android:textColorSecondary</item>
        <item name="colorOnSurface">?android:textColorPrimary</item>
-       <item name="colorSurface">?dialog_background_color</item>
+       <item name="colorSurface">?backgroundSecondary</item>
        <item name="media_overview_toolbar_background">@color/transparent</item>
        <item name="media_overview_header_foreground">?android:textColorPrimary</item>
        <item name="menu_accept_icon">@drawable/ic_baseline_done_24</item>
@@ -192,8 +192,6 @@
 
         <item name="emoji_tab_strip_background">@color/compose_view_background</item>
         <item name="emoji_tab_indicator">?colorAccent</item>
-        <item name="emoji_tab_underline">@color/gray78</item>
-        <item name="emoji_tab_seperator">@color/gray70</item>
         <item name="emoji_drawer_background">@color/compose_text_view_background</item>
         <item name="emoji_text_color">@color/white</item>
 
@@ -248,7 +246,7 @@
     </style>
 
     <style name="Theme.TextSecure.Dialog.MediaSendProgress" parent="@android:style/Theme.Dialog">
-        <item name="android:colorBackground">?attr/dialog_background_color</item>
+        <item name="android:colorBackground">?backgroundSecondary</item>
         <item name="android:windowNoTitle">true</item>
     </style>
 
@@ -316,6 +314,7 @@
         <item name="sessionLogoTint">@color/classic_dark_6</item>
         <item name="colorPrimary">@color/classic_dark_0</item>
         <item name="colorPrimaryDark">@color/classic_dark_0</item>
+        <item name="backgroundSecondary">@color/classic_dark_1</item>
         <item name="colorControlNormal">?android:textColorPrimary</item>
         <item name="colorControlActivated">?colorAccent</item>
         <item name="android:textColorPrimary">@color/classic_dark_6</item>
@@ -325,12 +324,10 @@
         <item name="android:textColorHint">@color/gray27</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="android:navigationBarColor">@color/navigation_bar</item>
-        <item name="dialog_background_color">@color/classic_dark_1</item>
         <item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
         <item name="actionMenuTextColor">?android:textColorPrimary</item>
         <item name="popupTheme">?actionBarPopupTheme</item>
         <item name="colorCellBackground">@color/classic_dark_1</item>
-        <item name="colorSettingsBackground">@color/classic_dark_1</item>
         <item name="colorDividerBackground">@color/classic_dark_3</item>
         <item name="android:colorControlHighlight">@color/classic_dark_3</item>
         <item name="colorControlHighlight">@color/classic_dark_3</item>
@@ -353,7 +350,7 @@
         <item name="home_gradient_start">#00000000</item>
         <item name="home_gradient_end">@color/classic_dark_1</item>
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
-        <item name="conversation_unread_background_color">@color/classic_dark_2</item>
+        <item name="conversation_unread_background_color">@color/classic_dark_1</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
         <item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
         <item name="unreadIndicatorTextColor">@color/classic_dark_6</item>
@@ -394,7 +391,7 @@
         <!-- Main styles -->
         <item name="sessionLogoTint">@color/classic_light_0</item>
         <item name="colorPrimary">@color/classic_light_6</item>
-        <item name="dialog_background_color">@color/classic_light_5</item>
+        <item name="backgroundSecondary">@color/classic_light_5</item>
         <item name="colorPrimaryDark">@color/classic_light_6</item>
         <item name="colorControlNormal">?android:textColorPrimary</item>
         <item name="colorControlActivated">?colorAccent</item>
@@ -406,7 +403,6 @@
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="android:navigationBarColor">@color/classic_light_navigation_bar</item>
         <item name="colorCellBackground">@color/classic_light_6</item>
-        <item name="colorSettingsBackground">@color/classic_light_5</item>
         <item name="colorDividerBackground">@color/classic_light_3</item>
         <item name="android:colorControlHighlight">@color/classic_light_3</item>
         <item name="colorControlHighlight">@color/classic_light_3</item>
@@ -482,6 +478,7 @@
         <item name="sessionLogoTint">@color/ocean_dark_7</item>
         <item name="colorPrimary">@color/ocean_dark_2</item>
         <item name="colorPrimaryDark">@color/ocean_dark_2</item>
+        <item name="backgroundSecondary">@color/ocean_dark_1</item>
         <item name="colorControlNormal">@color/ocean_dark_7</item>
         <item name="colorControlActivated">?colorAccent</item>
         <item name="android:textColorPrimary">@color/ocean_dark_7</item>
@@ -494,7 +491,6 @@
         <item name="default_background_end">?colorPrimary</item>
         <item name="default_background_start">?colorPrimaryDark</item>
         <item name="colorCellBackground">@color/ocean_dark_3</item>
-        <item name="colorSettingsBackground">@color/ocean_dark_1</item>
         <item name="colorDividerBackground">@color/ocean_dark_4</item>
         <item name="android:colorControlHighlight">@color/ocean_dark_4</item>
         <item name="colorControlHighlight">@color/ocean_dark_4</item>
@@ -520,7 +516,7 @@
         <item name="home_gradient_start">#00000000</item>
         <item name="home_gradient_end">@color/ocean_dark_3</item>
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
-        <item name="conversation_unread_background_color">@color/ocean_dark_4</item>
+        <item name="conversation_unread_background_color">@color/ocean_dark_3</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
         <item name="unreadIndicatorBackgroundColor">?colorAccent</item>
         <item name="unreadIndicatorTextColor">@color/ocean_dark_0</item>
@@ -565,6 +561,7 @@
         <item name="sessionLogoTint">@color/ocean_light_1</item>
         <item name="colorPrimary">@color/ocean_light_7</item>
         <item name="colorPrimaryDark">@color/ocean_light_6</item>
+        <item name="backgroundSecondary">@color/ocean_light_6</item>
         <item name="colorControlNormal">@color/ocean_light_1</item>
         <item name="colorControlActivated">?colorAccent</item>
         <item name="android:textColorPrimary">@color/ocean_light_1</item>
@@ -577,7 +574,6 @@
         <item name="default_background_end">@color/ocean_light_7</item>
         <item name="default_background_start">@color/ocean_light_6</item>
         <item name="colorCellBackground">@color/ocean_light_5</item>
-        <item name="colorSettingsBackground">@color/ocean_light_6</item>
         <item name="colorDividerBackground">@color/ocean_light_3</item>
         <item name="android:colorControlHighlight">@color/ocean_light_4</item>
         <item name="colorControlHighlight">@color/ocean_light_4</item>
@@ -641,7 +637,7 @@
         <item name="scroll_to_bottom_button_border">?input_bar_button_background_opaque_border</item>
         <item name="conversation_unread_count_indicator_background">?colorAccent</item>
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
-        <item name="conversation_unread_background_color">@color/ocean_light_6</item>
+        <item name="conversation_unread_background_color">@color/ocean_light_5</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
         <item name="message_selected">@color/ocean_light_5</item>
     </style>
@@ -655,6 +651,7 @@
         <item name="sessionLogoTint">@color/classic_dark_6</item>
         <item name="colorPrimary">@color/classic_dark_0</item>
         <item name="colorPrimaryDark">@color/classic_dark_0</item>
+        <item name="backgroundSecondary">@color/classic_dark_1</item>
         <item name="colorControlNormal">?android:textColorPrimary</item>
         <item name="colorControlActivated">?colorAccent</item>
         <item name="android:colorControlHighlight">?colorAccent</item>
@@ -665,12 +662,10 @@
         <item name="android:textColorHint">@color/gray27</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="android:navigationBarColor">@color/compose_view_background</item>
-        <item name="dialog_background_color">@color/classic_dark_1</item>
         <item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
         <item name="actionMenuTextColor">?android:textColorPrimary</item>
         <item name="popupTheme">?actionBarPopupTheme</item>
         <item name="colorCellBackground">@color/classic_dark_1</item>
-        <item name="colorSettingsBackground">@color/classic_dark_1</item>
         <item name="colorDividerBackground">@color/classic_dark_3</item>
         <item name="actionBarPopupTheme">@style/Dark.Popup</item>
         <item name="actionBarWidgetTheme">@null</item>
@@ -688,7 +683,7 @@
         <item name="home_gradient_start">#00000000</item>
         <item name="home_gradient_end">@color/classic_dark_1</item>
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
-        <item name="conversation_unread_background_color">@color/classic_dark_2</item>
+        <item name="conversation_unread_background_color">@color/classic_dark_1</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
         <item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
         <item name="unreadIndicatorTextColor">@color/classic_dark_6</item>
diff --git a/libsession/src/main/res/values/attrs.xml b/libsession/src/main/res/values/attrs.xml
index 474fe565e0..a412c13e76 100644
--- a/libsession/src/main/res/values/attrs.xml
+++ b/libsession/src/main/res/values/attrs.xml
@@ -53,8 +53,6 @@
 
     <attr name="emoji_tab_strip_background" format="color" />
     <attr name="emoji_tab_indicator" format="color" />
-    <attr name="emoji_tab_underline" format="color" />
-    <attr name="emoji_tab_seperator" format="color" />
     <attr name="emoji_drawer_background" format="color" />
     <attr name="emoji_text_color" format="color" />
 
@@ -93,7 +91,6 @@
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
-    <attr name="dialog_background_color" format="reference|color" />
 
     <attr name="conversation_icon_attach_audio" format="reference"/>
     <attr name="conversation_icon_attach_video" format="reference" />
diff --git a/libsession/src/main/res/values/colors.xml b/libsession/src/main/res/values/colors.xml
index a15aa4163a..9f94120b59 100644
--- a/libsession/src/main/res/values/colors.xml
+++ b/libsession/src/main/res/values/colors.xml
@@ -40,7 +40,6 @@
     <color name="gray27">#ffbbbbbb</color>
     <color name="gray50">#ff808080</color>
     <color name="gray65">#ff595959</color>
-    <color name="gray70">#ff4d4d4d</color>
     <color name="gray78">#ff383838</color>
 
     <color name="transparent_black_30">#30000000</color>