diff --git a/app/src/main/res/drawable/message_bubble_background_received_end.xml b/app/src/main/res/drawable/message_bubble_background_received_end.xml
deleted file mode 100644
index 09f5d7d6df..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_received_end.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_collapse_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/message_bubble_background_received_middle.xml b/app/src/main/res/drawable/message_bubble_background_received_middle.xml
deleted file mode 100644
index 78da45378e..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_received_middle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_collapse_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_collapse_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/message_bubble_background_received_start.xml b/app/src/main/res/drawable/message_bubble_background_received_start.xml
deleted file mode 100644
index 6908d244e6..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_received_start.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_collapse_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_alone.xml b/app/src/main/res/drawable/message_bubble_background_sent_alone.xml
deleted file mode 100644
index 7ae0cae493..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_sent_alone.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/message_corner_radius"/>
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_end.xml b/app/src/main/res/drawable/message_bubble_background_sent_end.xml
deleted file mode 100644
index 81325f1ad2..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_sent_end.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomRightRadius="@dimen/message_corner_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_middle.xml b/app/src/main/res/drawable/message_bubble_background_sent_middle.xml
deleted file mode 100644
index e8fa38aab8..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_sent_middle.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_start.xml b/app/src/main/res/drawable/message_bubble_background_sent_start.xml
deleted file mode 100644
index 03f90a31f7..0000000000
--- a/app/src/main/res/drawable/message_bubble_background_sent_start.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <corners
-                android:topLeftRadius="@dimen/message_corner_radius"
-                android:topRightRadius="@dimen/message_corner_radius"
-                android:bottomRightRadius="@dimen/message_corner_collapse_radius"
-                android:bottomLeftRadius="@dimen/message_corner_radius" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/pause_icon.xml b/app/src/main/res/drawable/pause_icon.xml
deleted file mode 100644
index e7f9fce53e..0000000000
--- a/app/src/main/res/drawable/pause_icon.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <group
-        android:name="@string/play_icon_group_parts"
-        android:rotation="90"
-        android:pivotX="64"
-        android:pivotY="64"
-        android:scaleX="1.5"
-        android:scaleY="1.5">
-
-        <group android:name="@string/play_icon_group_top">
-            <path
-                android:name="@string/play_icon_top_path_name"
-                android:pathData="@string/pause_icon_upper_path_data"
-                android:fillColor="@android:color/white"
-                android:strokeLineCap="butt"
-                android:strokeLineJoin="miter"
-                android:strokeMiterLimit="10"/>
-        </group>
-        <group android:name="@string/play_icon_group_bottom">
-            <path
-                android:name="@string/play_icon_bottom_path_name"
-                android:pathData="@string/pause_icon_bottom_path_data"
-                android:fillColor="@android:color/white"
-                android:strokeLineCap="butt"
-                android:strokeLineJoin="miter"
-                android:strokeMiterLimit="10"/>
-        </group>
-
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/play_icon.xml b/app/src/main/res/drawable/play_icon.xml
deleted file mode 100644
index 7472ac7de0..0000000000
--- a/app/src/main/res/drawable/play_icon.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <group
-        android:name="@string/play_icon_group_parts"
-        android:pivotX="64"
-        android:pivotY="64"
-        android:scaleX="1.5"
-        android:scaleY="1.5">
-
-        <group android:name="@string/play_icon_group_top">
-            <path
-                android:name="@string/play_icon_top_path_name"
-                android:pathData="@string/play_icon_upper_path_data"
-                android:fillColor="@android:color/white"
-                android:strokeLineCap="butt"
-                android:strokeLineJoin="miter"
-                android:strokeMiterLimit="10"/>
-        </group>
-        <group android:name="@string/play_icon_group_bottom">
-            <path
-                android:name="@string/play_icon_bottom_path_name"
-                android:pathData="@string/play_icon_bottom_path_data"
-                android:fillColor="@android:color/white"
-                android:strokeLineCap="butt"
-                android:strokeLineJoin="miter"
-                android:strokeMiterLimit="10"/>
-        </group>
-
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pn_option_background.xml b/app/src/main/res/drawable/pn_option_background.xml
deleted file mode 100644
index f84067c640..0000000000
--- a/app/src/main/res/drawable/pn_option_background.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid
-        android:color="?colorPrimary" />
-
-    <stroke
-        android:color="@color/pn_option_border"
-        android:width="@dimen/border_thickness" />
-
-    <corners android:radius="@dimen/pn_option_corner_radius" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pn_option_background_deselect_transition.xml b/app/src/main/res/drawable/pn_option_background_deselect_transition.xml
deleted file mode 100644
index 7fcb8e1160..0000000000
--- a/app/src/main/res/drawable/pn_option_background_deselect_transition.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/pn_option_background_selected" />
-    <item android:drawable="@drawable/pn_option_background" />
-</transition>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pn_option_background_select_transition.xml b/app/src/main/res/drawable/pn_option_background_select_transition.xml
deleted file mode 100644
index 21c58cf71d..0000000000
--- a/app/src/main/res/drawable/pn_option_background_select_transition.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/pn_option_background" />
-    <item android:drawable="@drawable/pn_option_background_selected" />
-</transition>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pn_option_background_selected.xml b/app/src/main/res/drawable/pn_option_background_selected.xml
deleted file mode 100644
index d94a5cfae7..0000000000
--- a/app/src/main/res/drawable/pn_option_background_selected.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid
-        android:color="?colorPrimary" />
-
-    <stroke
-        android:color="?colorAccent"
-        android:width="@dimen/border_thickness" />
-
-    <corners android:radius="@dimen/pn_option_corner_radius" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preference_single_no_padding.xml b/app/src/main/res/drawable/preference_single_no_padding.xml
deleted file mode 100644
index 483894fcc2..0000000000
--- a/app/src/main/res/drawable/preference_single_no_padding.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="?backgroundSecondary"/>
-            <corners android:radius="?preferenceCornerRadius"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/prominent_outline_button_medium_background_accent.xml b/app/src/main/res/drawable/prominent_outline_button_medium_background_accent.xml
deleted file mode 100644
index 5f0a51ec40..0000000000
--- a/app/src/main/res/drawable/prominent_outline_button_medium_background_accent.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="?outlineButtonBorder" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/setting_button_background.xml b/app/src/main/res/drawable/setting_button_background.xml
deleted file mode 100644
index 2f177318e0..0000000000
--- a/app/src/main/res/drawable/setting_button_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-
-    <item>
-        <color android:color="?colorCellBackground" />
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sticker_button_light.xml b/app/src/main/res/drawable/sticker_button_light.xml
deleted file mode 100644
index f20b4e89d1..0000000000
--- a/app/src/main/res/drawable/sticker_button_light.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/transparent_black_40">
-
-    <item android:id="@+id/mask">
-        <shape android:shape="oval">
-            <solid android:color="@color/transparent_black" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="oval" >
-            <solid android:color="@color/core_grey_05"/>
-        </shape>
-    </item>
-</ripple>
diff --git a/app/src/main/res/drawable/sticker_missing_background_light.xml b/app/src/main/res/drawable/sticker_missing_background_light.xml
deleted file mode 100644
index fdc4810c96..0000000000
--- a/app/src/main/res/drawable/sticker_missing_background_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="8dp" />
-    <solid android:color="@color/core_grey_45" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sticky_date_header_background_light.xml b/app/src/main/res/drawable/sticky_date_header_background_light.xml
deleted file mode 100644
index 3a92469278..0000000000
--- a/app/src/main/res/drawable/sticky_date_header_background_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="4dp" />
-    <solid android:color="@color/core_grey_02" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unimportant_dialog_button_background.xml b/app/src/main/res/drawable/unimportant_dialog_button_background.xml
deleted file mode 100644
index c517c1a135..0000000000
--- a/app/src/main/res/drawable/unimportant_dialog_button_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="?colorPrimary" />
-
-    <corners android:radius="@dimen/dialog_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="?android:textColorPrimary" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unimportant_filled_button_medium_background.xml b/app/src/main/res/drawable/unimportant_filled_button_medium_background.xml
deleted file mode 100644
index dc3b8df238..0000000000
--- a/app/src/main/res/drawable/unimportant_filled_button_medium_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/unimportant_button_background" />
-
-    <corners android:radius="@dimen/medium_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_button_background" />
-</shape>
\ No newline at end of file
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
deleted file mode 100644
index d12f7408d9..0000000000
--- a/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="?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/drawable/unread_count_background_light.xml b/app/src/main/res/drawable/unread_count_background_light.xml
deleted file mode 100644
index e87f516098..0000000000
--- a/app/src/main/res/drawable/unread_count_background_light.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="@dimen/unread_count_bubble_radius" />
-
-    <solid android:color="@color/core_blue" />
-
-    <stroke
-        android:color="@color/core_white"
-        android:width="1dp"/>
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_join_public_chat.xml b/app/src/main/res/layout/activity_join_public_chat.xml
deleted file mode 100644
index e4d5fb433b..0000000000
--- a/app/src/main/res/layout/activity_join_public_chat.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_bar_height" />
-
-    </androidx.viewpager.widget.ViewPager>
-
-    <RelativeLayout
-        android:id="@+id/loader"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#A4000000"
-        android:visibility="gone"
-        android:alpha="0">
-
-        <com.github.ybq.android.spinkit.SpinKitView
-            style="@style/SpinKitView.Large.ThreeBounce"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_centerInParent="true"
-            app:SpinKit_Color="@android:color/white" />
-
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_link_device.xml b/app/src/main/res/layout/activity_link_device.xml
deleted file mode 100644
index 5c93e251c9..0000000000
--- a/app/src/main/res/layout/activity_link_device.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/containerLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_bar_height" />
-
-    </androidx.viewpager.widget.ViewPager>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_message_detail.xml b/app/src/main/res/layout/activity_message_detail.xml
deleted file mode 100644
index 49c1af54e3..0000000000
--- a/app/src/main/res/layout/activity_message_detail.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="@color/transparent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/medium_spacing"
-        android:paddingTop="@dimen/very_large_spacing"
-        android:paddingEnd="@dimen/medium_spacing">
-
-        <TableLayout
-            android:id="@+id/metadata_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:shrinkColumns="1">
-
-            <TableRow
-                android:id="@+id/sent_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/message_details_header__sent"
-                    android:gravity="end"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/sent_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/expires_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing"
-                android:layout_marginTop="@dimen/medium_spacing"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/message_details_header__disappears"
-                    android:gravity="end"
-                    android:textStyle="bold"/>
-
-                <TextView
-                    android:id="@+id/expires_in"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    tools:text="1 week"/>
-
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/error_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="@dimen/small_spacing"
-                android:layout_marginTop="@dimen/medium_spacing">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/message_details_header__error"
-                    android:gravity="end"
-                    android:textStyle="bold"/>
-
-                <TextView
-                    android:id="@+id/error_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:textIsSelectable="true"
-                    tools:text="Send Failed"/>
-
-            </TableRow>
-
-        </TableLayout>
-
-        <LinearLayout
-            android:id="@+id/resend_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:gravity="start">
-
-            <Button
-                android:id="@+id/resend_button"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/medium_button_height"
-                style="@style/Widget.Session.Button.Common.ProminentOutline"
-                android:text="@string/message_recipients_list_item__resend" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/backup_enable_dialog.xml b/app/src/main/res/layout/backup_enable_dialog.xml
deleted file mode 100644
index b514d015e0..0000000000
--- a/app/src/main/res/layout/backup_enable_dialog.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="16dp"
-              android:paddingStart="23dp"
-              android:paddingEnd="23dp">
-
-    <TextView android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textSize="12sp"
-              android:text="@string/backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup"/>
-
-    <TableLayout android:id="@+id/number_table"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginTop="16dp"
-                 android:layout_gravity="center_horizontal"
-                 android:clickable="true"
-                 android:focusable="true">
-
-        <TableRow android:gravity="center_horizontal"
-                  android:clickable="false"
-                  android:focusable="false">
-
-            <TextView android:id="@+id/code_first"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/BackupPassphrase"
-                      tools:text="22934"/>
-
-            <TextView android:id="@+id/code_second"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="56944" />
-
-            <TextView android:id="@+id/code_third"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="42738" />
-        </TableRow>
-
-        <TableRow android:gravity="center_horizontal">
-            <TextView android:id="@+id/code_fourth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/BackupPassphrase"
-                      tools:text="34431"/>
-
-            <TextView android:id="@+id/code_fifth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="24922" />
-
-            <TextView android:id="@+id/code_sixth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="58594" />
-        </TableRow>
-    </TableLayout>
-
-    <LinearLayout android:layout_marginTop="20dp"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-            android:gravity="center">
-
-        <CheckBox android:id="@+id/confirmation_check"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginEnd="10dp"/>
-
-        <TextView android:id="@+id/confirmation_text"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="12sp"
-                  android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 01304ee9c7..df6c163ea0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -94,11 +94,6 @@
         <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>
-    </style>
-
     <style name="Widget.Session.Button.Common.Borderless">
         <item name="android:background">@drawable/borderless_button_medium_background</item>
         <item name="android:textColor">?android:textColorPrimary</item>