diff --git a/res/drawable-xhdpi/chat_file_message.png b/res/drawable-xhdpi/chat_file_message.png
deleted file mode 100644
index 624596c76..000000000
Binary files a/res/drawable-xhdpi/chat_file_message.png and /dev/null differ
diff --git a/res/drawable-xhdpi/fast_scroll_default.png b/res/drawable-xhdpi/fast_scroll_default.png
deleted file mode 100644
index 947a24d95..000000000
Binary files a/res/drawable-xhdpi/fast_scroll_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/fast_scroll_over.png b/res/drawable-xhdpi/fast_scroll_over.png
deleted file mode 100644
index 134b728f7..000000000
Binary files a/res/drawable-xhdpi/fast_scroll_over.png and /dev/null differ
diff --git a/res/drawable/chat_attachment.xml b/res/drawable/chat_attachment.xml
deleted file mode 100644
index faf13b811..000000000
--- a/res/drawable/chat_attachment.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorA"/>
-    <size android:width="120dp" android:height="120dp"/>
-</shape>
diff --git a/res/drawable/delete_field.xml b/res/drawable/delete_field.xml
new file mode 100644
index 000000000..17252aad3
--- /dev/null
+++ b/res/drawable/delete_field.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true"
+		  android:drawable="@drawable/delete_field_over" />
+	<item
+		android:drawable="@drawable/delete_field_default" />
+</selector>
diff --git a/res/drawable/fast_scroll.xml b/res/drawable/fast_scroll.xml
deleted file mode 100644
index 438a7ad42..000000000
--- a/res/drawable/fast_scroll.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/fast_scroll_over" />
-    <item android:drawable="@drawable/fast_scroll_default" />
-</selector>
-
diff --git a/res/drawable/fast_scroll_preview.xml b/res/drawable/fast_scroll_preview.xml
deleted file mode 100644
index cdf8aeccb..000000000
--- a/res/drawable/fast_scroll_preview.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">
-	        <size android:width="70dp" android:height="70dp"/>
-	        <solid android:color="@color/colorA" />
-	    </shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 27a1334ee..0a9486ac5 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -19,7 +19,7 @@
 
 		<ImageView
 			android:id="@+id/delete_field"
-			android:src="@drawable/delete_field_default"
+			android:src="@drawable/delete_field"
 			android:contentDescription="@string/content_description_add"
 			android:layout_gravity="center"
 			android:layout_width="30dp"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df3ca0266..40c8cfa9f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,25 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-	<style name="Default" parent="android:Theme.Holo.Light">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
-
-
-
-	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-
-	</style>
-	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar">
-		<item name="android:fastScrollThumbDrawable">@drawable/fast_scroll</item>
-		<item name="android:fastScrollTextColor">@android:color/white</item>
-		<item name="android:fastScrollPreviewBackgroundRight">@drawable/fast_scroll_preview</item>
-	</style>
+	<style name="Default" parent="android:Theme.Holo.Light"/>
+	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar"/>
+	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar"/>
 
 	<style name="font1" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorA</item>