diff --git a/orig/close_normal.svgz b/orig/close.svgz
similarity index 100%
rename from orig/close_normal.svgz
rename to orig/close.svgz
diff --git a/orig/close_focused.svgz b/orig/close_focused.svgz
deleted file mode 100644
index e58ec3d5..00000000
Binary files a/orig/close_focused.svgz and /dev/null differ
diff --git a/orig/next_normal.svgz b/orig/next.svgz
similarity index 100%
rename from orig/next_normal.svgz
rename to orig/next.svgz
diff --git a/orig/next_focused.svgz b/orig/next_focused.svgz
deleted file mode 100644
index c4d38332..00000000
Binary files a/orig/next_focused.svgz and /dev/null differ
diff --git a/orig/pause_normal.svgz b/orig/pause.svgz
similarity index 100%
rename from orig/pause_normal.svgz
rename to orig/pause.svgz
diff --git a/orig/pause_focused.svgz b/orig/pause_focused.svgz
deleted file mode 100644
index 8011dd6b..00000000
Binary files a/orig/pause_focused.svgz and /dev/null differ
diff --git a/orig/play_normal.svgz b/orig/play.svgz
similarity index 100%
rename from orig/play_normal.svgz
rename to orig/play.svgz
diff --git a/orig/play_focused.svgz b/orig/play_focused.svgz
deleted file mode 100644
index ca1d6985..00000000
Binary files a/orig/play_focused.svgz and /dev/null differ
diff --git a/orig/previous_normal.svgz b/orig/previous.svgz
similarity index 100%
rename from orig/previous_normal.svgz
rename to orig/previous.svgz
diff --git a/orig/previous_focused.svgz b/orig/previous_focused.svgz
deleted file mode 100644
index b87370b0..00000000
Binary files a/orig/previous_focused.svgz and /dev/null differ
diff --git a/res/drawable-hdpi/close_normal.png b/res/drawable-hdpi/close.png
similarity index 100%
rename from res/drawable-hdpi/close_normal.png
rename to res/drawable-hdpi/close.png
diff --git a/res/drawable-hdpi/close_focused.png b/res/drawable-hdpi/close_focused.png
deleted file mode 100644
index a9dd0572..00000000
Binary files a/res/drawable-hdpi/close_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png
new file mode 100644
index 00000000..55527084
Binary files /dev/null and b/res/drawable-hdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-hdpi/list_longpressed_holo.9.png b/res/drawable-hdpi/list_longpressed_holo.9.png
new file mode 100644
index 00000000..4ea7afa0
Binary files /dev/null and b/res/drawable-hdpi/list_longpressed_holo.9.png differ
diff --git a/res/drawable-hdpi/list_pressed_holo_dark.9.png b/res/drawable-hdpi/list_pressed_holo_dark.9.png
new file mode 100644
index 00000000..5654cd69
Binary files /dev/null and b/res/drawable-hdpi/list_pressed_holo_dark.9.png differ
diff --git a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 00000000..f6fd30dc
Binary files /dev/null and b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable-hdpi/next_normal.png b/res/drawable-hdpi/next.png
similarity index 100%
rename from res/drawable-hdpi/next_normal.png
rename to res/drawable-hdpi/next.png
diff --git a/res/drawable-hdpi/next_focused.png b/res/drawable-hdpi/next_focused.png
deleted file mode 100644
index 4d760528..00000000
Binary files a/res/drawable-hdpi/next_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/pause_normal.png b/res/drawable-hdpi/pause.png
similarity index 100%
rename from res/drawable-hdpi/pause_normal.png
rename to res/drawable-hdpi/pause.png
diff --git a/res/drawable-hdpi/pause_focused.png b/res/drawable-hdpi/pause_focused.png
deleted file mode 100644
index a455f612..00000000
Binary files a/res/drawable-hdpi/pause_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/play_normal.png b/res/drawable-hdpi/play.png
similarity index 100%
rename from res/drawable-hdpi/play_normal.png
rename to res/drawable-hdpi/play.png
diff --git a/res/drawable-hdpi/play_focused.png b/res/drawable-hdpi/play_focused.png
deleted file mode 100644
index 6f016459..00000000
Binary files a/res/drawable-hdpi/play_focused.png and /dev/null differ
diff --git a/res/drawable-hdpi/previous_normal.png b/res/drawable-hdpi/previous.png
similarity index 100%
rename from res/drawable-hdpi/previous_normal.png
rename to res/drawable-hdpi/previous.png
diff --git a/res/drawable-hdpi/previous_focused.png b/res/drawable-hdpi/previous_focused.png
deleted file mode 100644
index 612af76c..00000000
Binary files a/res/drawable-hdpi/previous_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/close_normal.png b/res/drawable-mdpi/close.png
similarity index 100%
rename from res/drawable-mdpi/close_normal.png
rename to res/drawable-mdpi/close.png
diff --git a/res/drawable-mdpi/close_focused.png b/res/drawable-mdpi/close_focused.png
deleted file mode 100644
index d9d65289..00000000
Binary files a/res/drawable-mdpi/close_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png
new file mode 100644
index 00000000..00f05d8c
Binary files /dev/null and b/res/drawable-mdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-mdpi/list_longpressed_holo.9.png b/res/drawable-mdpi/list_longpressed_holo.9.png
new file mode 100644
index 00000000..3bf8e036
Binary files /dev/null and b/res/drawable-mdpi/list_longpressed_holo.9.png differ
diff --git a/res/drawable-mdpi/list_pressed_holo_dark.9.png b/res/drawable-mdpi/list_pressed_holo_dark.9.png
new file mode 100644
index 00000000..6e77525d
Binary files /dev/null and b/res/drawable-mdpi/list_pressed_holo_dark.9.png differ
diff --git a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 00000000..92da2f0d
Binary files /dev/null and b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable-mdpi/next_normal.png b/res/drawable-mdpi/next.png
similarity index 100%
rename from res/drawable-mdpi/next_normal.png
rename to res/drawable-mdpi/next.png
diff --git a/res/drawable-mdpi/next_focused.png b/res/drawable-mdpi/next_focused.png
deleted file mode 100644
index 808b3c4d..00000000
Binary files a/res/drawable-mdpi/next_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/pause_normal.png b/res/drawable-mdpi/pause.png
similarity index 100%
rename from res/drawable-mdpi/pause_normal.png
rename to res/drawable-mdpi/pause.png
diff --git a/res/drawable-mdpi/pause_focused.png b/res/drawable-mdpi/pause_focused.png
deleted file mode 100644
index a3607884..00000000
Binary files a/res/drawable-mdpi/pause_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/play_normal.png b/res/drawable-mdpi/play.png
similarity index 100%
rename from res/drawable-mdpi/play_normal.png
rename to res/drawable-mdpi/play.png
diff --git a/res/drawable-mdpi/play_focused.png b/res/drawable-mdpi/play_focused.png
deleted file mode 100644
index 5c2b54b4..00000000
Binary files a/res/drawable-mdpi/play_focused.png and /dev/null differ
diff --git a/res/drawable-mdpi/previous_normal.png b/res/drawable-mdpi/previous.png
similarity index 100%
rename from res/drawable-mdpi/previous_normal.png
rename to res/drawable-mdpi/previous.png
diff --git a/res/drawable-mdpi/previous_focused.png b/res/drawable-mdpi/previous_focused.png
deleted file mode 100644
index e5e6aae6..00000000
Binary files a/res/drawable-mdpi/previous_focused.png and /dev/null differ
diff --git a/res/drawable-xhdpi/close_normal.png b/res/drawable-xhdpi/close.png
similarity index 100%
rename from res/drawable-xhdpi/close_normal.png
rename to res/drawable-xhdpi/close.png
diff --git a/res/drawable-xhdpi/close_focused.png b/res/drawable-xhdpi/close_focused.png
deleted file mode 100644
index 225d75d2..00000000
Binary files a/res/drawable-xhdpi/close_focused.png and /dev/null differ
diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png
new file mode 100644
index 00000000..b545f8e5
Binary files /dev/null and b/res/drawable-xhdpi/list_focused_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_longpressed_holo.9.png b/res/drawable-xhdpi/list_longpressed_holo.9.png
new file mode 100644
index 00000000..eda10e61
Binary files /dev/null and b/res/drawable-xhdpi/list_longpressed_holo.9.png differ
diff --git a/res/drawable-xhdpi/list_pressed_holo_dark.9.png b/res/drawable-xhdpi/list_pressed_holo_dark.9.png
new file mode 100644
index 00000000..e4b33935
Binary files /dev/null and b/res/drawable-xhdpi/list_pressed_holo_dark.9.png differ
diff --git a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
new file mode 100644
index 00000000..88726b69
Binary files /dev/null and b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png differ
diff --git a/res/drawable-xhdpi/next_normal.png b/res/drawable-xhdpi/next.png
similarity index 100%
rename from res/drawable-xhdpi/next_normal.png
rename to res/drawable-xhdpi/next.png
diff --git a/res/drawable-xhdpi/next_focused.png b/res/drawable-xhdpi/next_focused.png
deleted file mode 100644
index 55a2f1b6..00000000
Binary files a/res/drawable-xhdpi/next_focused.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_normal.png b/res/drawable-xhdpi/pause.png
similarity index 100%
rename from res/drawable-xhdpi/pause_normal.png
rename to res/drawable-xhdpi/pause.png
diff --git a/res/drawable-xhdpi/pause_focused.png b/res/drawable-xhdpi/pause_focused.png
deleted file mode 100644
index 907d147c..00000000
Binary files a/res/drawable-xhdpi/pause_focused.png and /dev/null differ
diff --git a/res/drawable-xhdpi/play_normal.png b/res/drawable-xhdpi/play.png
similarity index 100%
rename from res/drawable-xhdpi/play_normal.png
rename to res/drawable-xhdpi/play.png
diff --git a/res/drawable-xhdpi/play_focused.png b/res/drawable-xhdpi/play_focused.png
deleted file mode 100644
index b00a8c80..00000000
Binary files a/res/drawable-xhdpi/play_focused.png and /dev/null differ
diff --git a/res/drawable-xhdpi/previous_normal.png b/res/drawable-xhdpi/previous.png
similarity index 100%
rename from res/drawable-xhdpi/previous_normal.png
rename to res/drawable-xhdpi/previous.png
diff --git a/res/drawable-xhdpi/previous_focused.png b/res/drawable-xhdpi/previous_focused.png
deleted file mode 100644
index 93eeefa5..00000000
Binary files a/res/drawable-xhdpi/previous_focused.png and /dev/null differ
diff --git a/res/drawable/close.xml b/res/drawable/close.xml
deleted file mode 100644
index 0385473c..00000000
--- a/res/drawable/close.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/close_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/close_focused" />
-	<item android:drawable="@drawable/close_normal" />
-</selector>
diff --git a/res/drawable/hidden_next.xml b/res/drawable/hidden_next.xml
index 7f7b2744..f87bd7f9 100644
--- a/res/drawable/hidden_next.xml
+++ b/res/drawable/hidden_next.xml
@@ -1,6 +1,6 @@
 <?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/next_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/next_focused" />
+	<item android:state_pressed="true" android:drawable="@drawable/next" />
+	<item android:state_focused="true" android:drawable="@drawable/next" />
 	<item android:drawable="@drawable/empty" />
 </selector>
diff --git a/res/drawable/hidden_pause.xml b/res/drawable/hidden_pause.xml
index 6e1f6959..3ae9dd3b 100644
--- a/res/drawable/hidden_pause.xml
+++ b/res/drawable/hidden_pause.xml
@@ -1,6 +1,6 @@
 <?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/pause_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/pause_focused" />
+	<item android:state_pressed="true" android:drawable="@drawable/pause" />
+	<item android:state_focused="true" android:drawable="@drawable/pause" />
 	<item android:drawable="@drawable/empty" />
 </selector>
diff --git a/res/drawable/hidden_play.xml b/res/drawable/hidden_play.xml
index 755d4dc1..1e6e07d6 100644
--- a/res/drawable/hidden_play.xml
+++ b/res/drawable/hidden_play.xml
@@ -1,6 +1,6 @@
 <?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/play_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/play_focused" />
+	<item android:state_pressed="true" android:drawable="@drawable/play" />
+	<item android:state_focused="true" android:drawable="@drawable/play" />
 	<item android:drawable="@drawable/empty" />
 </selector>
diff --git a/res/drawable/list_selector_background_transition_holo_dark.xml b/res/drawable/list_selector_background_transition_holo_dark.xml
new file mode 100644
index 00000000..c1ab1cdd
--- /dev/null
+++ b/res/drawable/list_selector_background_transition_holo_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/list_pressed_holo_dark"  />
+	<item android:drawable="@drawable/list_longpressed_holo"  />
+</transition>
diff --git a/res/drawable/next.xml b/res/drawable/next.xml
deleted file mode 100644
index 052ddfff..00000000
--- a/res/drawable/next.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/next_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/next_focused" />
-	<item android:drawable="@drawable/next_normal" />
-</selector>
diff --git a/res/drawable/pause.xml b/res/drawable/pause.xml
deleted file mode 100644
index bc7b5c1d..00000000
--- a/res/drawable/pause.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/pause_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/pause_focused" />
-	<item android:drawable="@drawable/pause_normal" />
-</selector>
diff --git a/res/drawable/play.xml b/res/drawable/play.xml
deleted file mode 100644
index 14308a1d..00000000
--- a/res/drawable/play.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/play_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/play_focused" />
-	<item android:drawable="@drawable/play_normal" />
-</selector>
diff --git a/res/drawable/previous.xml b/res/drawable/previous.xml
deleted file mode 100644
index f8703de8..00000000
--- a/res/drawable/previous.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/previous_focused" />
-	<item android:state_focused="true" android:drawable="@drawable/previous_focused" />
-	<item android:drawable="@drawable/previous_normal" />
-</selector>
diff --git a/res/drawable/selectable_item_bg.xml b/res/drawable/selectable_item_bg.xml
new file mode 100644
index 00000000..c58bb7ff
--- /dev/null
+++ b/res/drawable/selectable_item_bg.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+	<item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+
+	<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+	<item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
+	<item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
+	<item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+	<item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+	<item android:state_focused="true"                                                             android:drawable="@drawable/list_focused_holo" />
+</selector>
diff --git a/res/layout-v11/notification.xml b/res/layout-v11/notification.xml
index f5bca63c..394e3233 100644
--- a/res/layout-v11/notification.xml
+++ b/res/layout-v11/notification.xml
@@ -64,7 +64,7 @@ THE SOFTWARE.
 		android:layout_gravity="center"
 		android:background="?android:attr/selectableItemBackground"
 		android:scaleType="fitCenter"
-		android:src="@drawable/play_normal"
+		android:src="@drawable/play"
 		android:contentDescription="@string/play_pause" />
 	<ImageButton
 		android:id="@+id/next"
@@ -75,7 +75,7 @@ THE SOFTWARE.
 		android:layout_gravity="center"
 		android:background="?android:attr/selectableItemBackground"
 		android:scaleType="fitCenter"
-		android:src="@drawable/next_normal"
+		android:src="@drawable/next"
 		android:contentDescription="@string/next_song" />
 	<ImageButton
 		android:id="@+id/close"
diff --git a/res/layout/actionbar_controls.xml b/res/layout/actionbar_controls.xml
index dda4892d..994d4c6c 100644
--- a/res/layout/actionbar_controls.xml
+++ b/res/layout/actionbar_controls.xml
@@ -22,7 +22,7 @@ THE SOFTWARE.
 -->
 <org.kreed.vanilla.ActionBarControls
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="?android:attr/selectableItemBackground"
+	android:background="@drawable/selectable_item_bg"
 	android:clickable="true">
 	<ImageView
 		android:id="@+id/cover"
diff --git a/res/layout/controls.xml b/res/layout/controls.xml
new file mode 100644
index 00000000..de936f8f
--- /dev/null
+++ b/res/layout/controls.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2012 Christopher Eby <kreed@kreed.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+	<ImageButton
+		android:id="@+id/shuffle"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="@drawable/selectable_item_bg"
+		android:scaleType="fitCenter"
+		android:src="@drawable/shuffle_inactive"
+		android:contentDescription="@string/cycle_shuffle_mode" />
+	<ImageButton
+		android:id="@+id/previous"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="@drawable/selectable_item_bg"
+		android:scaleType="fitCenter"
+		android:src="@drawable/previous"
+		android:contentDescription="@string/previous_song" />
+	<ImageButton
+		android:id="@+id/play_pause"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="@drawable/selectable_item_bg"
+		android:scaleType="fitCenter"
+		android:src="@drawable/play"
+		android:contentDescription="@string/play_pause" />
+	<ImageButton
+		android:id="@+id/next"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="@drawable/selectable_item_bg"
+		android:scaleType="fitCenter"
+		android:src="@drawable/next"
+		android:contentDescription="@string/next_song" />
+	<ImageButton
+		android:id="@+id/end_action"
+		android:layout_height="fill_parent"
+		android:layout_width="0px"
+		android:layout_weight="1"
+		android:background="@drawable/selectable_item_bg"
+		android:scaleType="fitCenter"
+		android:src="@drawable/repeat_inactive"
+		android:contentDescription="@string/cycle_repeat_mode" />
+</merge>
\ No newline at end of file
diff --git a/res/layout/four_long_widget.xml b/res/layout/four_long_widget.xml
index 2699ae6e..98f714d2 100644
--- a/res/layout/four_long_widget.xml
+++ b/res/layout/four_long_widget.xml
@@ -78,7 +78,7 @@ THE SOFTWARE.
 			android:layout_weight="1"
 			android:src="@drawable/play"
 			android:padding="5dip"
-			android:background="@null"
+			android:background="@drawable/selectable_item_bg"
 			android:scaleType="centerInside"
 			android:contentDescription="@string/play_pause" />
 		<ImageButton
@@ -89,7 +89,7 @@ THE SOFTWARE.
 			android:layout_weight="1"
 			android:padding="5dip"
 			android:src="@drawable/next"
-			android:background="@null"
+			android:background="@drawable/selectable_item_bg"
 			android:scaleType="centerInside"
 			android:contentDescription="@string/next_song" />
 	</LinearLayout>
diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index 43d79444..4709b8a3 100644
--- a/res/layout/full_playback.xml
+++ b/res/layout/full_playback.xml
@@ -62,50 +62,6 @@ THE SOFTWARE.
 		android:layout_margin="0dip"
 		android:background="#a000"
 		android:orientation="horizontal">
-		<ImageButton
-			android:id="@+id/shuffle"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/shuffle_inactive"
-			android:contentDescription="@string/cycle_shuffle_mode" />
-		<ImageButton
-			android:id="@+id/previous"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/previous"
-			android:contentDescription="@string/previous_song" />
-		<ImageButton
-			android:id="@+id/play_pause"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/play"
-			android:contentDescription="@string/play_pause" />
-		<ImageButton
-			android:id="@+id/next"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/next"
-			android:contentDescription="@string/next_song" />
-		<ImageButton
-			android:id="@+id/end_action"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/repeat_inactive"
-			android:contentDescription="@string/cycle_repeat_mode" />
+		<include layout="@layout/controls" />
 	</LinearLayout>
 </merge>
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index c061dd78..8f43f33e 100644
--- a/res/layout/full_playback_alt.xml
+++ b/res/layout/full_playback_alt.xml
@@ -94,50 +94,6 @@ THE SOFTWARE.
 		android:layout_margin="0dip"
 		android:background="#a000"
 		android:orientation="horizontal">
-		<ImageButton
-			android:id="@+id/shuffle"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/shuffle_inactive"
-			android:contentDescription="@string/cycle_shuffle_mode" />
-		<ImageButton
-			android:id="@+id/previous"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/previous"
-			android:contentDescription="@string/previous_song" />
-		<ImageButton
-			android:id="@+id/play_pause"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/play"
-			android:contentDescription="@string/play_pause" />
-		<ImageButton
-			android:id="@+id/next"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/next"
-			android:contentDescription="@string/next_song" />
-		<ImageButton
-			android:id="@+id/end_action"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/repeat_inactive"
-			android:contentDescription="@string/cycle_repeat_mode" />
+		<include layout="@layout/controls" />
 	</LinearLayout>
 </merge>
diff --git a/res/layout/library_content.xml b/res/layout/library_content.xml
index 705e8437..e87b56f7 100644
--- a/res/layout/library_content.xml
+++ b/res/layout/library_content.xml
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/content"
 	android:orientation="vertical"
 	android:layout_width="fill_parent"
@@ -32,11 +32,11 @@ THE SOFTWARE.
 		android:layout_height="0px"
 		android:layout_weight="1" />
 	<HorizontalScrollView
-	    android:id="@+id/limiter_scroller"
-	    android:layout_width="fill_parent"
+		android:id="@+id/limiter_scroller"
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|left">
-	    <LinearLayout
+		<LinearLayout
 			android:id="@+id/limiter_layout"
 			android:layout_width="wrap_content"
 			android:layout_height="fill_parent" />
@@ -64,7 +64,7 @@ THE SOFTWARE.
 			android:paddingBottom="4dip"
 			android:layout_width="wrap_content"
 			android:layout_height="fill_parent"
-			android:background="@null"
+			android:background="@drawable/selectable_item_bg"
 			android:src="@drawable/close"
 			android:contentDescription="@string/clear_search" />
 	</LinearLayout>
diff --git a/res/layout/library_controls.xml b/res/layout/library_controls.xml
index 96b5cee9..5533bd94 100644
--- a/res/layout/library_controls.xml
+++ b/res/layout/library_controls.xml
@@ -64,51 +64,7 @@ THE SOFTWARE.
 			android:orientation="horizontal"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent">
-			<ImageButton
-				android:id="@+id/shuffle"
-				android:layout_height="fill_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:background="@null"
-				android:scaleType="fitCenter"
-				android:src="@drawable/shuffle_inactive"
-				android:contentDescription="@string/cycle_shuffle_mode" />
-			<ImageButton
-				android:id="@+id/previous"
-				android:layout_height="fill_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:background="@null"
-				android:scaleType="fitCenter"
-				android:src="@drawable/previous"
-				android:contentDescription="@string/previous_song" />
-			<ImageButton
-				android:id="@+id/play_pause"
-				android:layout_height="fill_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:background="@null"
-				android:scaleType="fitCenter"
-				android:src="@drawable/play"
-				android:contentDescription="@string/play_pause" />
-			<ImageButton
-				android:id="@+id/next"
-				android:layout_height="fill_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:background="@null"
-				android:scaleType="fitCenter"
-				android:src="@drawable/next"
-				android:contentDescription="@string/next_song" />
-			<ImageButton
-				android:id="@+id/end_action"
-				android:layout_height="fill_parent"
-				android:layout_width="0px"
-				android:layout_weight="1"
-				android:background="@null"
-				android:scaleType="fitCenter"
-				android:src="@drawable/repeat_inactive"
-				android:contentDescription="@string/cycle_repeat_mode" />
+			<include layout="@layout/controls" />
 		</LinearLayout>
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/mini_playback.xml b/res/layout/mini_playback.xml
index a05b0716..78e45dcc 100644
--- a/res/layout/mini_playback.xml
+++ b/res/layout/mini_playback.xml
@@ -36,50 +36,6 @@ THE SOFTWARE.
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
 		android:orientation="horizontal">
-		<ImageButton
-			android:id="@+id/shuffle"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/shuffle_inactive"
-			android:contentDescription="@string/cycle_shuffle_mode" />
-		<ImageButton
-			android:id="@+id/previous"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/previous"
-			android:contentDescription="@string/previous_song" />
-		<ImageButton
-			android:id="@+id/play_pause"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/play"
-			android:contentDescription="@string/play_pause" />
-		<ImageButton
-			android:id="@+id/next"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/next"
-			android:contentDescription="@string/next_song" />
-		<ImageButton
-			android:id="@+id/end_action"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/repeat_inactive"
-			android:contentDescription="@string/cycle_repeat_mode" />
+		<include layout="@layout/controls" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/widget_e.xml b/res/layout/widget_e.xml
index ed1a9322..040cd035 100644
--- a/res/layout/widget_e.xml
+++ b/res/layout/widget_e.xml
@@ -53,55 +53,6 @@ THE SOFTWARE.
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content">
-		<ImageButton
-			android:id="@+id/shuffle"
-			android:adjustViewBounds="true"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/shuffle_inactive"
-			android:contentDescription="@string/cycle_shuffle_mode" />
-		<ImageButton
-			android:id="@+id/previous"
-			android:adjustViewBounds="true"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/previous"
-			android:contentDescription="@string/previous_song" />
-		<ImageButton
-			android:id="@+id/play_pause"
-			android:adjustViewBounds="true"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/play"
-			android:contentDescription="@string/play_pause" />
-		<ImageButton
-			android:id="@+id/next"
-			android:adjustViewBounds="true"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/next"
-			android:contentDescription="@string/next_song" />
-		<ImageButton
-			android:id="@+id/end_action"
-			android:adjustViewBounds="true"
-			android:layout_height="fill_parent"
-			android:layout_width="0px"
-			android:layout_weight="1"
-			android:background="@null"
-			android:scaleType="fitCenter"
-			android:src="@drawable/repeat_inactive"
-			android:contentDescription="@string/cycle_repeat_mode" />
+		<include layout="@layout/controls" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 15238ab4..c7afcd83 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -71,7 +71,7 @@ THE SOFTWARE.
 			android:defaultValue="false" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_playback_view">
-	    <CheckBoxPreference
+		<CheckBoxPreference
 			android:key="playback_on_startup"
 			android:title="@string/playback_on_startup_title"
 			android:summary="@string/playback_on_startup_summary"
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 90c04cd9..9ea9d0fc 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -1660,7 +1660,7 @@ public final class PlaybackService extends Service
 		String title = song.title;
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			int playButton = playing ? R.drawable.pause_normal : R.drawable.play_normal;
+			int playButton = playing ? R.drawable.pause : R.drawable.play;
 			views.setImageViewResource(R.id.play_pause, playButton);
 
 			ComponentName service = new ComponentName(this, PlaybackService.class);
diff --git a/src/org/kreed/vanilla/PlaylistAdapter.java b/src/org/kreed/vanilla/PlaylistAdapter.java
index 9e8e625f..8ef78c9d 100644
--- a/src/org/kreed/vanilla/PlaylistAdapter.java
+++ b/src/org/kreed/vanilla/PlaylistAdapter.java
@@ -77,7 +77,7 @@ public class PlaylistAdapter extends CursorAdapter implements Handler.Callback {
 
 		Resources res = context.getResources();
 		mDragBitmap = BitmapFactory.decodeResource(res, R.drawable.grabber);
-		mDeleteBitmap = BitmapFactory.decodeResource(res, R.drawable.close_normal);
+		mDeleteBitmap = BitmapFactory.decodeResource(res, R.drawable.close);
 	}
 
 	/**