diff --git a/app/src/main/res/values-notnight-v21/colors.xml b/app/src/main/res/values-notnight-v21/colors.xml
index ef91e51099..a7c8d9b163 100644
--- a/app/src/main/res/values-notnight-v21/colors.xml
+++ b/app/src/main/res/values-notnight-v21/colors.xml
@@ -1,52 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="default_background_start">#ffffff</color>
-    <color name="default_background_end">#fcfcfc</color>
     <color name="action_bar_background">#fcfcfc</color>
 
     <color name="app_icon_background">#333132</color>
-    <color name="progress_bar_background">#0A000000</color>
-    <color name="quote_not_found_background">#8000E97B</color>
-
 
     <color name="inverse_primary">@color/core_black</color>
 
-    <color name="background_dialog">@color/core_white</color>
-
-    <color name="reactions_pill_text_color">@color/core_grey_60</color>
-    <color name="reactions_pill_selected_text_color">@color/core_grey_75</color>
     <color name="reactions_screen_dark_shade_color">@color/transparent_black_70</color>
     <color name="reactions_screen_light_shade_color">@color/transparent_white_87</color>
 
     <color name="signal_background_primary">@color/core_white</color>
-    <color name="signal_background_secondary">@color/core_grey_05</color>
-    <color name="signal_background_tertiary">@color/core_grey_02</color>
-    <color name="signal_background_dialog">@color/core_white</color>
-    <color name="signal_background_dialog_secondary">@color/signal_background_secondary</color>
 
-    <color name="signal_text_primary">@color/core_grey_90</color>
     <color name="text_primary_disabled">@color/core_grey_25</color>
-    <color name="signal_text_primary_dialog">@color/core_grey_65</color>
-
-    <color name="signal_inverse_transparent">@color/transparent_black</color>
-    <color name="signal_inverse_transparent_40">@color/transparent_black_40</color>
-
 
     <color name="signal_icon_tint_tab_selected">@color/core_grey_75</color>
-    <color name="signal_icon_tint_tab_unselected">@color/core_grey_45</color>
-
 
     <color name="signal_text_secondary">@color/core_grey_60</color>
-    <color name="signal_text_selected">@color/core_black</color>
 
-    <color name="signal_text_hint">@color/core_grey_45</color>
-
-    <color name="signal_button_primary_ripple">@color/transparent_black_15</color>
-    <color name="signal_button_primary_text">@color/core_white</color>
-    <color name="signal_button_primary_text_disabled">@color/transparent_white_20</color>
-
-    <color name="signal_button_secondary">@color/core_grey_05</color>
     <color name="signal_button_secondary_text_disabled">@color/core_grey_25</color>
-    <color name="signal_button_secondary_stroke">@color/core_grey_15</color>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8d0d714e49..4cc6ac015f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -119,46 +119,6 @@
       <item>vi</item>
   </string-array>
 
-  <string-array name="pref_led_color_values" translatable="false">
-      <item>@color/accent_green</item>
-      <item>@color/accent_blue</item>
-      <item>@color/accent_yellow</item>
-      <item>@color/accent_pink</item>
-      <item>@color/accent_purple</item>
-      <item>@color/accent_orange</item>
-      <item>@color/accent_red</item>
-  </string-array>
-
-  <string-array name="pref_led_blink_pattern_entries">
-    <item>@string/preferences__fast</item>
-    <item>@string/preferences__normal</item>
-    <item>@string/preferences__slow</item>
-  </string-array>
-
-  <string-array name="pref_led_blink_pattern_values" translatable="false">
-    <item>300,300</item>
-    <item>500,2000</item>
-    <item>3000,3000</item>
-  </string-array>
-
-  <string-array name="pref_repeat_alerts_entries">
-      <item>@string/preferences__never</item>
-      <item>@string/preferences__one_time</item>
-      <item>@string/preferences__two_times</item>
-      <item>@string/preferences__three_times</item>
-      <item>@string/preferences__five_times</item>
-      <item>@string/preferences__ten_times</item>
-  </string-array>
-
-  <string-array name="pref_repeat_alerts_values" translatable="false">
-      <item>0</item>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>5</item>
-      <item>10</item>
-  </string-array>
-
   <string-array name="default_or_custom_values" translatable="false">
       <item>default</item>
       <item>custom</item>
@@ -185,21 +145,6 @@
 
     <!-- RedPhone -->
 
-    <integer-array name="expiration_times">
-        <item>0</item>
-        <item>5</item>
-        <item>10</item>
-        <item>30</item>
-        <item>60</item>
-        <item>300</item>
-        <item>1800</item>
-        <item>3600</item>
-        <item>21600</item>
-        <item>43200</item>
-        <item>86400</item>
-        <item>604800</item>
-    </integer-array>
-
     <array name="scribble_colors">
         <item>#ffffff</item>
         <item>#ff0000</item>
@@ -212,17 +157,6 @@
         <item>#000000</item>
     </array>
 
-    <string-array name="pref_notification_priority_entries">
-        <item>@string/arrays__default</item>
-        <item>@string/arrays__high</item>
-        <item>@string/arrays__max</item>
-    </string-array>
-
-    <string-array name="pref_notification_priority_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
     <string-array name="notify_types">
         <item>@string/notify_type_all</item>
         <item>@string/notify_type_mentions</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4325748b8f..c0ce8bb6a8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -149,8 +149,6 @@
     <attr name="conversation_tint_non_main" format="color|reference"/>
     <attr name="conversation_shadow_non_main" format="color|reference"/>
     <attr name="conversation_shadow_main" format="color|reference"/>
-    <attr name="default_background_start" format="color|reference"/>
-    <attr name="default_background_end" format="color|reference"/>
     <attr name="colorCellBackground" format="color|reference" />
     <attr name="colorDividerBackground" format="color|reference" />
     <attr name="outlineButtonBorder" format="color|reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ff73134643..660c5cff0c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,26 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="unimportant">#D8D8D8</color>
     <color name="profile_picture_background">#353535</color>
     <color name="action_bar_background">#161616</color>
     <color name="separator">#36383C</color>
-    <color name="unimportant_button_background">#323232</color>
-    <color name="dialog_background">#101011</color>
-    <color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
     <color name="app_icon_background">#333132</color>
-    <color name="progress_bar_background">#0AFFFFFF</color>
     <color name="compose_view_background">#1B1B1B</color>
     <color name="compose_text_view_background">#141414</color>
-    <color name="quote_not_found_background">#80FFFFFF</color>
-    <color name="pn_option_border">#212121</color>
     <color name="paths_building">#FFCE3A</color>
-    <color name="open_group_chip_color">#0DFFFFFF</color>
 
     <color name="call_action_button">#DD353535</color>
     <color name="call_action_button_highlighted">#FFFFFF</color>
     <color name="call_action_foreground">#D8D8D8</color>
     <color name="call_action_foreground_highlighted">#171717</color>
-    <color name="call_background">#171717</color>
 
     <array name="profile_picture_placeholder_colors">
         <item>@color/accent_green</item>
@@ -36,9 +27,7 @@
 
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
-    <color name="gray12">#ffe0e0e0</color>
     <color name="gray13">#ffababab</color>
-    <color name="gray20">#ffcccccc</color>
     <color name="gray27">#ffbbbbbb</color>
     <color name="gray50">#ff808080</color>
     <color name="gray65">#ff595959</color>
@@ -46,13 +35,11 @@
     <color name="transparent_black_6">#0f000000</color>
     <color name="transparent_black_15">#26000000</color>
     <color name="transparent_black_30">#30000000</color>
-    <color name="transparent_black_40">#40000000</color>
     <color name="transparent_black_70">#70000000</color>
     <color name="transparent_white_87">#dfffffff</color>
     <color name="transparent_black_90">#90000000</color>
 
     <color name="transparent_white_15">#26ffffff</color>
-    <color name="transparent_white_20">#33ffffff</color>
     <color name="transparent_white_30">#30ffffff</color>
     <color name="transparent_white_40">#40ffffff</color>
     <color name="transparent_white_aa">#aaffffff</color>
@@ -61,9 +48,7 @@
     <color name="classic_light_navigation_bar">@color/navigation_bar</color>
     <color name="ocean_light_navigation_bar">@color/navigation_bar</color>
     <color name="action_mode_status_bar">@color/gray65</color>
-    <color name="touch_highlight">#22000000</color>
 
-    <color name="device_link_item_background_light">#ffffffff</color>
     <color name="device_link_item_background_dark">#ff333333</color>
 
     <color name="transparent">#00FFFFFF</color>
@@ -73,53 +58,24 @@
 
     <color name="avatar_background">@color/transparent_black_90</color>
 
-    <color name="default_background_start">#121212</color>
-    <color name="default_background_end">#171717</color>
-
-
     <color name="inverse_primary">@color/core_white</color>
 
     <color name="button_primary_ripple">@color/transparent_black_15</color>
 
-    <color name="background_dialog">@color/core_grey_75</color>
-
-    <color name="reactions_pill_text_color">@color/core_grey_35</color>
-    <color name="reactions_pill_selected_text_color">@color/core_grey_15</color>
     <color name="reactions_screen_dark_shade_color">@color/transparent_black_70</color>
     <color name="reactions_screen_light_shade_color">#df5e5e5e</color>
 
     <color name="signal_background_primary">@color/core_grey_95</color>
-    <color name="signal_background_secondary">@color/core_grey_75</color>
-    <color name="signal_background_tertiary">@color/core_grey_90</color>
-    <color name="signal_background_dialog">@color/core_grey_75</color>
-    <color name="signal_background_dialog_secondary">@color/core_grey_65</color>
 
-    <color name="signal_text_primary">@color/core_grey_05</color>
     <color name="text_primary_disabled">@color/core_grey_60</color>
-    <color name="signal_text_primary_dialog">@color/core_grey_25</color>
 
     <color name="react_with_any_background">?colorPrimary</color>
 
-
-    <color name="signal_inverse_transparent">@color/transparent</color>
-    <color name="signal_inverse_transparent_40">@color/transparent_white_40</color>
-
-
     <color name="signal_icon_tint_tab_selected">@color/core_white</color>
-    <color name="signal_icon_tint_tab_unselected">@color/core_grey_25</color>
 
     <color name="signal_text_secondary">@color/core_grey_25</color>
-    <color name="signal_text_selected">@color/core_white</color>
 
-    <color name="signal_text_hint">@color/core_grey_15</color>
-
-    <color name="signal_button_primary_ripple">@color/transparent_black_15</color>
-    <color name="signal_button_primary_text">@color/core_white</color>
-    <color name="signal_button_primary_text_disabled">@color/transparent_white_20</color>
-
-    <color name="signal_button_secondary">@color/core_grey_75</color>
     <color name="signal_button_secondary_text_disabled">@color/core_grey_45</color>
-    <color name="signal_button_secondary_stroke">@color/core_grey_45</color>
 
     <color name="classic_accent">#31F196</color>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f43d643b9e..3ec6cd1990 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="medium_font_size">17sp</dimen>
     <dimen name="large_font_size">20sp</dimen>
     <dimen name="very_large_font_size">26sp</dimen>
-    <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
     <dimen name="dialog_button_height">60dp</dimen>
@@ -23,17 +22,12 @@
     <dimen name="large_profile_picture_size">80dp</dimen>
     <dimen name="conversation_view_status_indicator_size">14dp</dimen>
     <dimen name="border_thickness">1dp</dimen>
-    <dimen name="new_conversation_button_collapsed_size">60dp</dimen>
-    <dimen name="new_conversation_button_expanded_size">72dp</dimen>
     <dimen name="tab_bar_height">36dp</dimen>
     <dimen name="text_view_corner_radius">8dp</dimen>
-    <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
-    <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">64dp</dimen>
     <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="video_inset_radius">11dp</dimen>
-    <dimen name="dialog_button_corner_radius">4dp</dimen>
     <dimen name="pn_option_corner_radius">8dp</dimen>
     <dimen name="path_status_view_size">8dp</dimen>
     <dimen name="path_row_height">56dp</dimen>
@@ -53,14 +47,12 @@
     <dimen name="new_conversation_button_bottom_offset">56dp</dimen>
     <dimen name="onboarding_button_bottom_offset">40dp</dimen>
 
-    <dimen name="emoji_drawer_size">32sp</dimen>
     <dimen name="min_keyboard_size">50dp</dimen>
     <dimen name="default_custom_keyboard_size">220dp</dimen>
     <dimen name="min_custom_keyboard_size">110dp</dimen>
     <dimen name="min_custom_keyboard_top_margin_portrait">170dp</dimen>
     <dimen name="emoji_drawer_item_width">48dp</dimen>
     <dimen name="conversation_item_body_text_size">16sp</dimen>
-    <dimen name="conversation_item_date_text_size">12sp</dimen>
     <dimen name="contact_photo_target_size">64dp</dimen>
 
     <dimen name="album_total_width">210dp</dimen>
@@ -69,25 +61,16 @@
     <dimen name="album_3_total_height">140dp</dimen>
     <dimen name="album_3_cell_width_big">139dp</dimen>
     <dimen name="album_3_cell_size_small">69dp</dimen>
-    <dimen name="album_4_total_height">210dp</dimen>
-    <dimen name="album_4_cell_size">104dp</dimen>
-    <dimen name="album_5_total_height">175dp</dimen>
-    <dimen name="album_5_cell_size_big">104dp</dimen>
     <dimen name="album_5_cell_size_small">69dp</dimen>
 
     <dimen name="message_corner_radius">18dp</dimen>
     <dimen name="message_corner_collapse_radius">4dp</dimen>
     <dimen name="message_bubble_corner_radius">2dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
-    <dimen name="message_bubble_horizontal_padding">@dimen/medium_spacing</dimen>
-    <dimen name="message_bubble_bottom_padding">@dimen/medium_spacing</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
     <dimen name="media_bubble_default_dimens">210dp</dimen>
     <dimen name="media_bubble_min_width">150dp</dimen>
-    <dimen name="media_bubble_max_width">240dp</dimen>
-    <dimen name="media_bubble_min_height">100dp</dimen>
-    <dimen name="media_bubble_max_height">320dp</dimen>
 
     <dimen name="media_picker_folder_width">175dp</dimen>
     <dimen name="media_picker_item_width">85dp</dimen>
@@ -97,14 +80,7 @@
 
     <dimen name="mediasend_progress_dialog_size">120dp</dimen>
 
-    <dimen name="thumbnail_default_radius">4dp</dimen>
-
     <dimen name="conversation_compose_height">40dp</dimen>
-    <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
-    <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>
-
-    <dimen name="quote_corner_radius_bottom">2dp</dimen>
-    <dimen name="quote_corner_radius_preview">16dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
 
@@ -125,12 +101,9 @@
 
     <dimen name="alertview_small_icon_size">14dp</dimen>
 
-    <dimen name="recording_voice_lock_target">-96dp</dimen>
-
     <dimen name="drawable_padding">24dp</dimen>
     <dimen name="normal_padding">16dp</dimen>
     <dimen name="action_item_height">56dp</dimen>
-    <dimen name="conversation_item_quote_width">120dp</dimen>
 
     <dimen name="context_menu_corner_radius">18dp</dimen>
 
@@ -144,12 +117,8 @@
     <dimen name="reaction_scrubber_anim_end_translation_y">0dp</dimen>
     <dimen name="reaction_scrubber_width">320dp</dimen>
 
-    <dimen name="keyboard_toolbar_height">44dp</dimen>
-
-    <dimen name="react_with_any_emoji_bottom_sheet_dialog_fragment_min_height">390dp</dimen>
     <dimen name="react_with_any_emoji_bottom_sheet_dialog_fragment_tabs_height">40dp</dimen>
     <dimen name="max_text_width">200dp</dimen>
-    <dimen name="preference_corner_radius" />
     <dimen name="radial_size">34dp</dimen>
     <dimen name="small_radial_size">24dp</dimen>
 
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index cb9392f697..045e125f3d 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="holder_tag"/>
-    <item type="id" name="contact_info_tag"/>
-    <item type="id" name="motion_view_edittext"/>
 </resources>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index c61cc3c843..e4df0e1685 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="play_button_animation_duration">300</integer>
-
     <integer name="reaction_scrubber_reveal_duration">200</integer>
     <integer name="reaction_scrubber_reveal_offset">100</integer>
     <integer name="reaction_scrubber_hide_duration">150</integer>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index df6c163ea0..a01e2b69ab 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,10 +29,6 @@
         <item name="textColorAlertDialogListItem">?android:textColorPrimary</item>
     </style>
 
-    <style name="PreferenceTitleStyle" parent="@android:style/Widget.TextView">
-        <item name="android:textColorPrimary">?android:textColorSecondary</item>
-    </style>
-
     <style name="Widget.Session.BottomSheetDialog" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.6</item>
@@ -43,10 +39,6 @@
 
     </style>
 
-    <style name="Widget.Session.TabBar" parent="Widget.AppCompat.ActionBar.TabBar">
-        <item name="elevation">1dp</item>
-    </style>
-
     <style name="Widget.Session.TabLayout" parent="Widget.Design.TabLayout">
         <item name="elevation">1dp</item>
         <item name="tabIndicatorColor">@color/transparent</item>
@@ -79,11 +71,6 @@
         <item name="android:stateListAnimator">@null</item>
     </style>
 
-    <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>
-    </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>
@@ -201,15 +188,6 @@
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
-    <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary_dark</item>
-    </style>
-
-    <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/signal_primary_dark</item>
-        <item name="android:windowBackground">@drawable/dialog_background</item>
-    </style>
-
     <!-- ActionBar styles -->
 
     <!-- For Holo Light Dialog Activity Styling Emulation -->
@@ -229,14 +207,6 @@
            clear out android:textOn and android:textOff, to avoid the default
            text label behavior of the ToggleButton class.) -->
 
-    <style name="BackupPassphrase">
-        <item name="android:fontFamily">monospace</item>
-        <item name="android:typeface">monospace</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:clickable">false</item>
-        <item name="android:focusable">false</item>
-    </style>
-
     <style name="PreferenceThemeOverlay.Fix" parent="PreferenceThemeOverlay.v14.Material">
     </style>
 
@@ -251,10 +221,6 @@
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
-    <style name="PopupMenu.ConversationItem" parent="@style/Widget.AppCompat.PopupMenu">
-        <item name="android:dropDownHorizontalOffset">@dimen/medium_spacing</item>
-    </style>
-
     <style name="PopupMenu.MessageRequests" parent="@style/Widget.AppCompat.PopupMenu">
         <item name="android:background">?backgroundSecondary</item>
     </style>
diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
index 5639c60147..54bd3c0f38 100644
--- a/app/src/main/res/values/text_styles.xml
+++ b/app/src/main/res/values/text_styles.xml
@@ -22,10 +22,4 @@
         <item name="android:letterSpacing" tools:ignore="NewApi">0.03</item>
     </style>
 
-
-    <style name="Signal.Text.Caption.MessageSent">
-        <item name="android:textColor">?conversation_item_sent_text_secondary_color</item>
-        <item name="android:shadowRadius">0</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 23b7b5f5db..37f0e517ac 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -65,10 +65,6 @@
         <!-- leave empty to allow overriding -->
     </style>
 
-    <style name="ThemeOverlay.App.Toolbar" parent="">
-        <item name="colorOnPrimary">?android:textColorPrimary</item>
-    </style>
-
     <style name="Theme.Session.DayNight.NoActionBar" parent="Base.Theme.Session">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -495,8 +491,6 @@
         <item name="android:textColorHint">@color/ocean_dark_5</item>
         <item name="android:windowBackground">?colorPrimary</item>
         <item name="android:navigationBarColor">@color/navigation_bar</item>
-        <item name="default_background_end">?colorPrimary</item>
-        <item name="default_background_start">?colorPrimaryDark</item>
         <item name="colorCellBackground">@color/ocean_dark_3</item>
         <item name="colorDividerBackground">@color/ocean_dark_4</item>
         <item name="android:colorControlHighlight">@color/ocean_dark_4</item>
@@ -582,8 +576,6 @@
         <item name="android:textColorHint">@color/ocean_light_6</item>
         <item name="android:navigationBarColor">@color/ocean_light_navigation_bar</item>
         <item name="android:windowBackground">?colorPrimary</item>
-        <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="colorDividerBackground">@color/ocean_light_3</item>
         <item name="android:colorControlHighlight">@color/ocean_light_4</item>
diff --git a/libsession/src/main/res/values/arrays.xml b/libsession/src/main/res/values/arrays.xml
index 743a4dd331..957b176565 100644
--- a/libsession/src/main/res/values/arrays.xml
+++ b/libsession/src/main/res/values/arrays.xml
@@ -118,32 +118,6 @@
       <item>vi</item>
   </string-array>
 
-  <string-array name="pref_led_color_values" translatable="false">
-    <item>green</item>
-    <item>red</item>
-    <item>blue</item>
-    <item>yellow</item>
-    <item>cyan</item>
-    <item>magenta</item>
-    <item>white</item>
-    <item>none</item>
-  </string-array>
-
-  <string-array name="pref_led_blink_pattern_values" translatable="false">
-    <item>300,300</item>
-    <item>500,2000</item>
-    <item>3000,3000</item>
-  </string-array>
-
-  <string-array name="pref_repeat_alerts_values" translatable="false">
-      <item>0</item>
-      <item>1</item>
-      <item>2</item>
-      <item>3</item>
-      <item>5</item>
-      <item>10</item>
-  </string-array>
-
   <string-array name="default_or_custom_values" translatable="false">
       <item>default</item>
       <item>custom</item>
@@ -173,21 +147,6 @@
 
     <!-- RedPhone -->
 
-    <integer-array name="expiration_times">
-        <item>0</item>
-        <item>5</item>
-        <item>10</item>
-        <item>30</item>
-        <item>60</item>
-        <item>300</item>
-        <item>1800</item>
-        <item>3600</item>
-        <item>21600</item>
-        <item>43200</item>
-        <item>86400</item>
-        <item>604800</item>
-    </integer-array>
-
     <array name="scribble_colors">
         <item>#ffffff</item>
         <item>#ff0000</item>
@@ -200,10 +159,4 @@
         <item>#000000</item>
     </array>
 
-    <string-array name="pref_notification_priority_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
 </resources>
diff --git a/libsession/src/main/res/values/colors.xml b/libsession/src/main/res/values/colors.xml
index 32d64c9970..60da5a0a5f 100644
--- a/libsession/src/main/res/values/colors.xml
+++ b/libsession/src/main/res/values/colors.xml
@@ -1,19 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="unimportant">#D8D8D8</color>
     <color name="profile_picture_background">#353535</color>
-    <color name="cell_background">#1B1B1B</color>
     <color name="cell_selected">#0C0C0C</color>
     <color name="action_bar_background">#171717</color>
     <color name="separator">#36383C</color>
-    <color name="unimportant_button_background">#323232</color>
-    <color name="dialog_background">#101011</color>
-    <color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
     <color name="app_icon_background">#333132</color>
-    <color name="progress_bar_background">#0AFFFFFF</color>
     <color name="compose_view_background">#1B1B1B</color>
     <color name="compose_text_view_background">#141414</color>
-    <color name="quote_not_found_background">#80FFFFFF</color>
     <color name="paths_building">#FFCE3A</color>
 
     <array name="profile_picture_placeholder_colors">
@@ -33,16 +26,12 @@
 
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
-    <color name="gray12">#ffe0e0e0</color>
     <color name="gray13">#ffababab</color>
-    <color name="gray20">#ffcccccc</color>
     <color name="gray27">#ffbbbbbb</color>
     <color name="gray50">#ff808080</color>
     <color name="gray65">#ff595959</color>
-    <color name="gray78">#ff383838</color>
 
     <color name="transparent_black_30">#30000000</color>
-    <color name="transparent_black_40">#40000000</color>
     <color name="transparent_black_70">#70000000</color>
     <color name="transparent_black_90">#90000000</color>
 
@@ -52,9 +41,7 @@
     <color name="transparent_white_bb">#bbffffff</color>
 
     <color name="action_mode_status_bar">@color/gray65</color>
-    <color name="touch_highlight">#22000000</color>
 
-    <color name="device_link_item_background_light">#ffffffff</color>
     <color name="device_link_item_background_dark">#ff333333</color>
 
     <color name="transparent">#00FFFFFF</color>
@@ -64,9 +51,6 @@
 
     <color name="avatar_background">@color/transparent_black_90</color>
 
-    <color name="default_background_start">#121212</color>
-    <color name="default_background_end">#171717</color>
-
     <color name="accent_green">#ff31F196</color>
     <color name="accent_blue">#ff57C9FA</color>
     <color name="accent_purple">#ffC993FF</color>
diff --git a/libsession/src/main/res/values/dimens.xml b/libsession/src/main/res/values/dimens.xml
index 3aed51ebfe..9967730859 100644
--- a/libsession/src/main/res/values/dimens.xml
+++ b/libsession/src/main/res/values/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="medium_font_size">17sp</dimen>
     <dimen name="large_font_size">22sp</dimen>
     <dimen name="very_large_font_size">26sp</dimen>
-    <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
     <dimen name="small_button_height">34dp</dimen>
@@ -23,16 +22,11 @@
     <dimen name="extra_large_profile_picture_size">128dp</dimen>
     <dimen name="conversation_view_status_indicator_size">14dp</dimen>
     <dimen name="border_thickness">1dp</dimen>
-    <dimen name="new_conversation_button_collapsed_size">60dp</dimen>
-    <dimen name="new_conversation_button_expanded_size">72dp</dimen>
     <dimen name="tab_bar_height">36dp</dimen>
     <dimen name="text_view_corner_radius">8dp</dimen>
-    <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
-    <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
     <dimen name="dialog_corner_radius">8dp</dimen>
-    <dimen name="dialog_button_corner_radius">4dp</dimen>
     <dimen name="pn_option_corner_radius">8dp</dimen>
     <dimen name="path_status_view_size">8dp</dimen>
     <dimen name="path_row_height">56dp</dimen>
@@ -46,18 +40,15 @@
     <dimen name="very_large_spacing">35dp</dimen>
     <dimen name="massive_spacing">64dp</dimen>
     <dimen name="new_conversation_button_bottom_offset">56dp</dimen>
-    <dimen name="onboarding_button_bottom_offset">40dp</dimen>
 
     <!-- Session -->
 
-    <dimen name="emoji_drawer_size">32sp</dimen>
     <dimen name="min_keyboard_size">50dp</dimen>
     <dimen name="default_custom_keyboard_size">220dp</dimen>
     <dimen name="min_custom_keyboard_size">110dp</dimen>
     <dimen name="min_custom_keyboard_top_margin_portrait">170dp</dimen>
     <dimen name="emoji_drawer_item_width">48dp</dimen>
     <dimen name="conversation_item_body_text_size">16sp</dimen>
-    <dimen name="conversation_item_date_text_size">12sp</dimen>
     <dimen name="contact_photo_target_size">64dp</dimen>
 
     <dimen name="album_total_width">210dp</dimen>
@@ -66,25 +57,16 @@
     <dimen name="album_3_total_height">140dp</dimen>
     <dimen name="album_3_cell_width_big">139dp</dimen>
     <dimen name="album_3_cell_size_small">69dp</dimen>
-    <dimen name="album_4_total_height">210dp</dimen>
-    <dimen name="album_4_cell_size">104dp</dimen>
-    <dimen name="album_5_total_height">175dp</dimen>
-    <dimen name="album_5_cell_size_big">104dp</dimen>
     <dimen name="album_5_cell_size_small">69dp</dimen>
 
     <dimen name="message_corner_radius">18dp</dimen>
     <dimen name="message_corner_collapse_radius">4dp</dimen>
     <dimen name="message_bubble_corner_radius">2dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
-    <dimen name="message_bubble_horizontal_padding">@dimen/medium_spacing</dimen>
-    <dimen name="message_bubble_bottom_padding">@dimen/medium_spacing</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
     <dimen name="media_bubble_default_dimens">210dp</dimen>
     <dimen name="media_bubble_min_width">150dp</dimen>
-    <dimen name="media_bubble_max_width">240dp</dimen>
-    <dimen name="media_bubble_min_height">100dp</dimen>
-    <dimen name="media_bubble_max_height">320dp</dimen>
 
     <dimen name="media_picker_folder_width">175dp</dimen>
     <dimen name="media_picker_item_width">85dp</dimen>
@@ -94,14 +76,7 @@
 
     <dimen name="mediasend_progress_dialog_size">120dp</dimen>
 
-    <dimen name="thumbnail_default_radius">4dp</dimen>
-
     <dimen name="conversation_compose_height">40dp</dimen>
-    <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
-    <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>
-
-    <dimen name="quote_corner_radius_bottom">2dp</dimen>
-    <dimen name="quote_corner_radius_preview">16dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
 
@@ -122,8 +97,6 @@
 
     <dimen name="alertview_small_icon_size">14dp</dimen>
 
-    <dimen name="recording_voice_lock_target">-96dp</dimen>
-
     <dimen name="drawable_padding">24dp</dimen>
     <dimen name="text_size">16sp</dimen>
     <dimen name="normal_padding">16dp</dimen>
diff --git a/libsession/src/main/res/values/ids.xml b/libsession/src/main/res/values/ids.xml
index cb9392f697..045e125f3d 100644
--- a/libsession/src/main/res/values/ids.xml
+++ b/libsession/src/main/res/values/ids.xml
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="holder_tag"/>
-    <item type="id" name="contact_info_tag"/>
-    <item type="id" name="motion_view_edittext"/>
 </resources>
diff --git a/libsession/src/main/res/values/integers.xml b/libsession/src/main/res/values/integers.xml
index bb4c483c99..55344e5192 100644
--- a/libsession/src/main/res/values/integers.xml
+++ b/libsession/src/main/res/values/integers.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="play_button_animation_duration">300</integer>
 </resources>
\ No newline at end of file
diff --git a/libsession/src/main/res/values/text_styles.xml b/libsession/src/main/res/values/text_styles.xml
index 5639c60147..54bd3c0f38 100644
--- a/libsession/src/main/res/values/text_styles.xml
+++ b/libsession/src/main/res/values/text_styles.xml
@@ -22,10 +22,4 @@
         <item name="android:letterSpacing" tools:ignore="NewApi">0.03</item>
     </style>
 
-
-    <style name="Signal.Text.Caption.MessageSent">
-        <item name="android:textColor">?conversation_item_sent_text_secondary_color</item>
-        <item name="android:shadowRadius">0</item>
-    </style>
-
 </resources>
\ No newline at end of file