diff --git a/res/drawable-hdpi/baseline_account_circle_white_24.png b/res/drawable-hdpi/baseline_account_circle_white_24.png
deleted file mode 100755
index b1ff90f71..000000000
Binary files a/res/drawable-hdpi/baseline_account_circle_white_24.png and /dev/null differ
diff --git a/res/drawable-hdpi/baseline_email_white_24.png b/res/drawable-hdpi/baseline_email_white_24.png
deleted file mode 100755
index bf0403296..000000000
Binary files a/res/drawable-hdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_name.png b/res/drawable-hdpi/ic_action_name.png
deleted file mode 100644
index 798948971..000000000
Binary files a/res/drawable-hdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_add_white_original_24dp.png b/res/drawable-hdpi/ic_add_white_original_24dp.png
deleted file mode 100644
index 481643ecd..000000000
Binary files a/res/drawable-hdpi/ic_add_white_original_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_arrow_forward_dark.png b/res/drawable-hdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 03568e6a0..000000000
Binary files a/res/drawable-hdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_arrow_forward_light.png b/res/drawable-hdpi/ic_arrow_forward_light.png
deleted file mode 100644
index b55688a81..000000000
Binary files a/res/drawable-hdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/baseline_account_circle_white_24.png b/res/drawable-mdpi/baseline_account_circle_white_24.png
deleted file mode 100755
index 5971fc54c..000000000
Binary files a/res/drawable-mdpi/baseline_account_circle_white_24.png and /dev/null differ
diff --git a/res/drawable-mdpi/baseline_email_white_24.png b/res/drawable-mdpi/baseline_email_white_24.png
deleted file mode 100755
index ea25d6da8..000000000
Binary files a/res/drawable-mdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_name.png b/res/drawable-mdpi/ic_action_name.png
deleted file mode 100644
index eeefcc09d..000000000
Binary files a/res/drawable-mdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_add_white_original_24dp.png b/res/drawable-mdpi/ic_add_white_original_24dp.png
deleted file mode 100644
index 977dd3427..000000000
Binary files a/res/drawable-mdpi/ic_add_white_original_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_dark.png b/res/drawable-mdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 92b6aebec..000000000
Binary files a/res/drawable-mdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_light.png b/res/drawable-mdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 1df381e4b..000000000
Binary files a/res/drawable-mdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/baseline_account_circle_white_24.png b/res/drawable-xhdpi/baseline_account_circle_white_24.png
deleted file mode 100755
index e0d8d3b5e..000000000
Binary files a/res/drawable-xhdpi/baseline_account_circle_white_24.png and /dev/null differ
diff --git a/res/drawable-xhdpi/baseline_email_white_24.png b/res/drawable-xhdpi/baseline_email_white_24.png
deleted file mode 100755
index 9c97a103f..000000000
Binary files a/res/drawable-xhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_name.png b/res/drawable-xhdpi/ic_action_name.png
deleted file mode 100644
index 28cd18b55..000000000
Binary files a/res/drawable-xhdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_add_white_original_24dp.png b/res/drawable-xhdpi/ic_add_white_original_24dp.png
deleted file mode 100644
index 67042105d..000000000
Binary files a/res/drawable-xhdpi/ic_add_white_original_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.png b/res/drawable-xhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 70057432f..000000000
Binary files a/res/drawable-xhdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_light.png b/res/drawable-xhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index ad50cf274..000000000
Binary files a/res/drawable-xhdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/baseline_account_circle_white_24.png b/res/drawable-xxhdpi/baseline_account_circle_white_24.png
deleted file mode 100755
index 68c73c98a..000000000
Binary files a/res/drawable-xxhdpi/baseline_account_circle_white_24.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/baseline_email_white_24.png b/res/drawable-xxhdpi/baseline_email_white_24.png
deleted file mode 100755
index 928fdfb1b..000000000
Binary files a/res/drawable-xxhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_name.png b/res/drawable-xxhdpi/ic_action_name.png
deleted file mode 100644
index c60efa5ac..000000000
Binary files a/res/drawable-xxhdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_add_white_original_24dp.png b/res/drawable-xxhdpi/ic_add_white_original_24dp.png
deleted file mode 100644
index 72cedcad4..000000000
Binary files a/res/drawable-xxhdpi/ic_add_white_original_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_dark.png b/res/drawable-xxhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 67c757ae2..000000000
Binary files a/res/drawable-xxhdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.png b/res/drawable-xxhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 44956477a..000000000
Binary files a/res/drawable-xxhdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/baseline_account_circle_white_24.png b/res/drawable-xxxhdpi/baseline_account_circle_white_24.png
deleted file mode 100755
index 268736d3e..000000000
Binary files a/res/drawable-xxxhdpi/baseline_account_circle_white_24.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/baseline_email_white_24.png b/res/drawable-xxxhdpi/baseline_email_white_24.png
deleted file mode 100755
index 298c951af..000000000
Binary files a/res/drawable-xxxhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_add_white_original_24dp.png b/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
deleted file mode 100644
index 2bef05958..000000000
Binary files a/res/drawable-xxxhdpi/ic_add_white_original_24dp.png and /dev/null differ
diff --git a/res/drawable/background_pattern.png b/res/drawable/background_pattern.png
deleted file mode 100644
index 9035edeb0..000000000
Binary files a/res/drawable/background_pattern.png and /dev/null differ
diff --git a/res/drawable/background_pattern_repeat.xml b/res/drawable/background_pattern_repeat.xml
deleted file mode 100644
index 5e3165a49..000000000
--- a/res/drawable/background_pattern_repeat.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap android:src="@drawable/background_pattern" android:tileMode="repeat"
-  xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/drawable/webrtc_bluetooth_button.xml b/res/drawable/webrtc_bluetooth_button.xml
deleted file mode 100644
index 7cf5ecb36..000000000
--- a/res/drawable/webrtc_bluetooth_button.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 android:drawable="@drawable/webrtc_control_background"/>
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/ic_bluetooth_white_24dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/webrtc_camera_front_button.xml b/res/drawable/webrtc_camera_front_button.xml
deleted file mode 100644
index cda55648d..000000000
--- a/res/drawable/webrtc_camera_front_button.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/quick_camera_front"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/webrtc_camera_rear_button.xml b/res/drawable/webrtc_camera_rear_button.xml
deleted file mode 100644
index 697a1b4e5..000000000
--- a/res/drawable/webrtc_camera_rear_button.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/quick_camera_rear"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/webrtc_control_background.xml b/res/drawable/webrtc_control_background.xml
deleted file mode 100644
index 1675990f7..000000000
--- a/res/drawable/webrtc_control_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circle_alpha" android:state_checked="true"/>
-    <item android:drawable="@android:color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/webrtc_mute_button.xml b/res/drawable/webrtc_mute_button.xml
deleted file mode 100644
index 1132b7a8d..000000000
--- a/res/drawable/webrtc_mute_button.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 android:drawable="@drawable/webrtc_control_background"/>
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/ic_mic_off_white_24dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/webrtc_speaker_button.xml b/res/drawable/webrtc_speaker_button.xml
deleted file mode 100644
index e756d5c6e..000000000
--- a/res/drawable/webrtc_speaker_button.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 android:drawable="@drawable/webrtc_control_background"/>
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/ic_volume_up_white_24dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/webrtc_video_mute_button.xml b/res/drawable/webrtc_video_mute_button.xml
deleted file mode 100644
index 5cc40e123..000000000
--- a/res/drawable/webrtc_video_mute_button.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 android:drawable="@drawable/webrtc_control_background"/>
-    <item android:top="5dp"
-          android:left="5dp"
-          android:right="5dp"
-          android:bottom="5dp"
-          android:drawable="@drawable/ic_videocam_white_24dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/res/layout/backup_enable_dialog.xml b/res/layout/backup_enable_dialog.xml
deleted file mode 100644
index ccb1a29c8..000000000
--- a/res/layout/backup_enable_dialog.xml
+++ /dev/null
@@ -1,95 +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:paddingLeft="23dp"
-              android:paddingRight="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_marginLeft="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="56944"
-                      android:layout_marginStart="20dp"/>
-
-            <TextView android:id="@+id/code_third"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="42738"
-                      android:layout_marginStart="20dp"/>
-        </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_marginLeft="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="24922"
-                      android:layout_marginStart="20dp"/>
-
-            <TextView android:id="@+id/code_sixth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="58594"
-                      android:layout_marginStart="20dp"/>
-        </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_marginRight="10dp"
-                  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/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
deleted file mode 100644
index 0e35197e3..000000000
--- a/res/layout/change_passphrase_activity.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fillViewport="true">
-
-    <FrameLayout android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:gravity="center">
-        
-        <LinearLayout android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
-                      android:paddingTop="10dip"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center"
-                      android:visibility="visible"
-                      android:orientation="vertical">
-                
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText android:id="@+id/old_passphrase"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:inputType="textPassword"
-                          android:layout_marginBottom="10dip"
-                          android:hint="@string/change_passphrase_activity__old_passphrase"
-                          android:singleLine="true"/>
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText android:id="@+id/new_passphrase"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:inputType="textPassword"
-                          android:hint="@string/change_passphrase_activity__new_passphrase"
-                          android:singleLine="true"/>
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText android:id="@+id/repeat_passphrase"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:inputType="textPassword"
-                          android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
-                          android:singleLine="true" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <LinearLayout android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="30dip">
-
-                <Button android:id="@+id/cancel_button"
-                        android:text="@android:string/cancel"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="7dip"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-                
-                <Button android:id="@+id/ok_button"
-                        android:text="@android:string/ok"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
-            </LinearLayout>                        
-        </LinearLayout>
-    </FrameLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/menu/conversation_callable_insecure.xml b/res/menu/conversation_callable_insecure.xml
deleted file mode 100644
index 04be0b922..000000000
--- a/res/menu/conversation_callable_insecure.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_callable_insecure__menu_call"
-          android:id="@+id/menu_call_insecure"
-          android:icon="?menu_call_icon"
-          app:showAsAction="always" />
-
-</menu>
diff --git a/res/menu/conversation_callable_secure.xml b/res/menu/conversation_callable_secure.xml
deleted file mode 100644
index 6cf92f062..000000000
--- a/res/menu/conversation_callable_secure.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/conversation_callable_secure__menu_call"
-          android:id="@+id/menu_call_secure"
-          android:icon="@drawable/ic_call_secure_white_24dp"
-          app:showAsAction="always" />
-
-</menu>
\ No newline at end of file
diff --git a/res/values/text_styles.xml b/res/values/text_styles.xml
index 75592b3a9..29dbf0d4a 100644
--- a/res/values/text_styles.xml
+++ b/res/values/text_styles.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Signal.Text.Headline" parent="Base.TextAppearance.AppCompat.Headline">
-        <item name="android:textSize">28sp</item>
-        <item name="android:lineSpacingExtra">3sp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:letterSpacing">0</item>
-        <!-- TODO: Get proper letterSpacing -->
-    </style>
 
     <style name="Signal.Text.Body" parent="Base.TextAppearance.AppCompat.Body1">
         <item name="android:textSize">16sp</item>
@@ -41,14 +34,4 @@
         <item name="android:shadowRadius">0</item>
     </style>
 
-    <style name="Signal.Text.Caption.MessageReceived">
-        <item name="android:textColor">?conversation_item_incoming_text_secondary_color</item>
-        <item name="android:shadowRadius">0</item>
-        <item name="android:alpha">0.7</item>
-    </style>
-
-    <style name="Signal.Text.Caption.MessageImageOverlay">
-        <item name="android:textColor">@color/core_white</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e21abee35..36dc1e59f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -57,43 +57,6 @@
         <item name="colorButtonNormal">@color/white</item>
     </style>
 
-    <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary</item>
-
-        <item name="android:textColorHint">#cc000000</item>
-        <item name="centered_app_title_color">#55000000</item>
-        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
-        <item name="android:windowBackground">@color/white</item>
-        <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
-        <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
-
-        <item name="login_top_background">@color/signal_primary</item>
-        <item name="login_floating_background">@drawable/rounded_rectangle_white</item>
-
-    </style>
-
-    <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="colorAccent">@color/signal_primary_dark</item>
-
-        <item name="android:textColorHint">@color/white</item>
-        <item name="centered_app_title_color">@color/gray27</item>
-        <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
-        <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
-        <item name="android:windowBackground">@color/black</item>
-        <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
-        <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
-
-        <item name="login_top_background">@color/black</item>
-        <item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
-    </style>
-
     <style name="PopupAnimation" parent="@android:style/Animation">
         <item name="android:windowEnterAnimation">@anim/slide_from_top</item>
         <item name="android:windowExitAnimation">@anim/slide_to_top</item>
diff --git a/res/xml/contactsformat.xml b/res/xml/contactsformat.xml
deleted file mode 100644
index f22102f76..000000000
--- a/res/xml/contactsformat.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <ContactsDataKind
-            android:icon="@mipmap/ic_launcher"
-            android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact"
-            android:summaryColumn="data2"
-            android:detailColumn="data3"
-            android:detailSocialSummary="true"/>
-    <ContactsDataKind
-            android:icon="@mipmap/ic_launcher"
-            android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call"
-            android:summaryColumn="data2"
-            android:detailColumn="data3"/>
-</ContactsSource>
diff --git a/res/xml/syncadapter.xml b/res/xml/syncadapter.xml
deleted file mode 100644
index 7804e4021..000000000
--- a/res/xml/syncadapter.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="com.android.contacts"
-              android:accountType="org.thoughtcrime.securesms"
-              android:userVisible="true"
-              android:supportsUploading="true"
-              android:allowParallelSyncs="false"
-              android:isAlwaysSyncable="true"/>
\ No newline at end of file