diff --git a/res/layout-land/four_long_widget.xml b/res/layout-land/four_long_widget.xml
index 244aec4a..2d607792 100644
--- a/res/layout-land/four_long_widget.xml
+++ b/res/layout-land/four_long_widget.xml
@@ -73,7 +73,8 @@ THE SOFTWARE.
 		android:src="@drawable/play"
 		android:padding="5dip"
 		android:background="@null"
-		android:scaleType="centerInside" />
+		android:scaleType="centerInside"
+		android:contentDescription="@string/play_pause" />
 	<ImageButton
 		android:id="@+id/next"
 		android:adjustViewBounds="true"
@@ -82,5 +83,6 @@ THE SOFTWARE.
 		android:padding="5dip"
 		android:src="@drawable/next"
 		android:background="@null"
-		android:scaleType="centerInside" />
+		android:scaleType="centerInside"
+		android:contentDescription="@string/next_song" />
 </LinearLayout>
diff --git a/res/layout/four_long_widget.xml b/res/layout/four_long_widget.xml
index 7e9583a2..8ac913e5 100644
--- a/res/layout/four_long_widget.xml
+++ b/res/layout/four_long_widget.xml
@@ -79,7 +79,8 @@ THE SOFTWARE.
 			android:src="@drawable/play"
 			android:padding="5dip"
 			android:background="@null"
-			android:scaleType="centerInside" />
+			android:scaleType="centerInside"
+			android:contentDescription="@string/play_pause" />
 		<ImageButton
 			android:id="@+id/next"
 			android:adjustViewBounds="true"
@@ -89,6 +90,7 @@ THE SOFTWARE.
 			android:padding="5dip"
 			android:src="@drawable/next"
 			android:background="@null"
-			android:scaleType="centerInside" />
+			android:scaleType="centerInside"
+			android:contentDescription="@string/next_song" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/four_square_widget.xml b/res/layout/four_square_widget.xml
index 648cbefc..825c191c 100644
--- a/res/layout/four_square_widget.xml
+++ b/res/layout/four_square_widget.xml
@@ -88,7 +88,8 @@ THE SOFTWARE.
 				android:background="@null"
 				android:layout_height="fill_parent"
 				android:layout_width="0px"
-				android:layout_weight="1" />
+				android:layout_weight="1"
+				android:contentDescription="@string/play_pause" />
 			<ImageButton
 				android:id="@+id/next"
 				android:adjustViewBounds="true"
@@ -97,7 +98,8 @@ THE SOFTWARE.
 				android:background="@null"
 				android:layout_height="fill_parent"
 				android:layout_width="0px"
-				android:layout_weight="1" />
+				android:layout_weight="1"
+				android:contentDescription="@string/next_song" />
 		</LinearLayout>
 	</LinearLayout>
 </FrameLayout>
diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index f124023d..43d79444 100644
--- a/res/layout/full_playback.xml
+++ b/res/layout/full_playback.xml
@@ -64,43 +64,48 @@ THE SOFTWARE.
 		android:orientation="horizontal">
 		<ImageButton
 			android:id="@+id/shuffle"
-			android:layout_height="wrap_content"
+			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:src="@drawable/shuffle_inactive"
+			android:contentDescription="@string/cycle_shuffle_mode" />
 		<ImageButton
 			android:id="@+id/previous"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/previous" />
+			android:src="@drawable/previous"
+			android:contentDescription="@string/previous_song" />
 		<ImageButton
 			android:id="@+id/play_pause"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/play" />
+			android:src="@drawable/play"
+			android:contentDescription="@string/play_pause" />
 		<ImageButton
 			android:id="@+id/next"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/next" />
+			android:src="@drawable/next"
+			android:contentDescription="@string/next_song" />
 		<ImageButton
 			android:id="@+id/end_action"
-			android:layout_height="wrap_content"
+			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:src="@drawable/repeat_inactive"
+			android:contentDescription="@string/cycle_repeat_mode" />
 	</LinearLayout>
 </merge>
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index 3a3f0d43..c061dd78 100644
--- a/res/layout/full_playback_alt.xml
+++ b/res/layout/full_playback_alt.xml
@@ -96,43 +96,48 @@ THE SOFTWARE.
 		android:orientation="horizontal">
 		<ImageButton
 			android:id="@+id/shuffle"
-			android:layout_height="wrap_content"
+			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:src="@drawable/shuffle_inactive"
+			android:contentDescription="@string/cycle_shuffle_mode" />
 		<ImageButton
 			android:id="@+id/previous"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/previous" />
+			android:src="@drawable/previous"
+			android:contentDescription="@string/previous_song" />
 		<ImageButton
 			android:id="@+id/play_pause"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/play" />
+			android:src="@drawable/play"
+			android:contentDescription="@string/play_pause" />
 		<ImageButton
 			android:id="@+id/next"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/next" />
+			android:src="@drawable/next"
+			android:contentDescription="@string/next_song" />
 		<ImageButton
 			android:id="@+id/end_action"
-			android:layout_height="wrap_content"
+			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:src="@drawable/repeat_inactive"
+			android:contentDescription="@string/cycle_repeat_mode" />
 	</LinearLayout>
 </merge>
diff --git a/res/layout/library_content.xml b/res/layout/library_content.xml
index 48231395..3728ca8d 100644
--- a/res/layout/library_content.xml
+++ b/res/layout/library_content.xml
@@ -69,7 +69,8 @@ THE SOFTWARE.
 			android:layout_width="wrap_content"
 			android:layout_height="fill_parent"
 			android:background="@null"
-			android:src="@drawable/close" />
+			android:src="@drawable/close"
+			android:contentDescription="@string/clear_search" />
 	</LinearLayout>
 </LinearLayout>
 
diff --git a/res/layout/library_controls.xml b/res/layout/library_controls.xml
index 66f80e02..8919fcaa 100644
--- a/res/layout/library_controls.xml
+++ b/res/layout/library_controls.xml
@@ -70,7 +70,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/shuffle_inactive" />
+				android:src="@drawable/shuffle_inactive"
+				android:contentDescription="@string/cycle_shuffle_mode" />
 			<ImageButton
 				android:id="@+id/previous"
 				android:layout_height="fill_parent"
@@ -78,7 +79,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/previous" />
+				android:src="@drawable/previous"
+				android:contentDescription="@string/previous_song" />
 			<ImageButton
 				android:id="@+id/play_pause"
 				android:layout_height="fill_parent"
@@ -86,7 +88,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/play" />
+				android:src="@drawable/play"
+				android:contentDescription="@string/play_pause" />
 			<ImageButton
 				android:id="@+id/next"
 				android:layout_height="fill_parent"
@@ -94,7 +97,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/next" />
+				android:src="@drawable/next"
+				android:contentDescription="@string/next_song" />
 			<ImageButton
 				android:id="@+id/end_action"
 				android:layout_height="fill_parent"
@@ -102,7 +106,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/repeat_inactive" />
+				android:src="@drawable/repeat_inactive"
+				android:contentDescription="@string/cycle_repeat_mode" />
 		</LinearLayout>
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/mini_playback.xml b/res/layout/mini_playback.xml
index c3da6405..a05b0716 100644
--- a/res/layout/mini_playback.xml
+++ b/res/layout/mini_playback.xml
@@ -38,43 +38,48 @@ THE SOFTWARE.
 		android:orientation="horizontal">
 		<ImageButton
 			android:id="@+id/shuffle"
-			android:layout_height="wrap_content"
+			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:src="@drawable/shuffle_inactive"
+			android:contentDescription="@string/cycle_shuffle_mode" />
 		<ImageButton
 			android:id="@+id/previous"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/previous" />
+			android:src="@drawable/previous"
+			android:contentDescription="@string/previous_song" />
 		<ImageButton
 			android:id="@+id/play_pause"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/play" />
+			android:src="@drawable/play"
+			android:contentDescription="@string/play_pause" />
 		<ImageButton
 			android:id="@+id/next"
-			android:layout_height="wrap_content"
+			android:layout_height="fill_parent"
 			android:layout_width="0px"
 			android:layout_weight="1"
 			android:background="@null"
 			android:scaleType="fitCenter"
-			android:src="@drawable/next" />
+			android:src="@drawable/next"
+			android:contentDescription="@string/next_song" />
 		<ImageButton
 			android:id="@+id/end_action"
-			android:layout_height="wrap_content"
+			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:src="@drawable/repeat_inactive"
+			android:contentDescription="@string/cycle_repeat_mode" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/one_cell_widget.xml b/res/layout/one_cell_widget.xml
index 61d7f2db..e7159bb5 100644
--- a/res/layout/one_cell_widget.xml
+++ b/res/layout/one_cell_widget.xml
@@ -53,7 +53,8 @@ THE SOFTWARE.
 			android:background="@null"
 			android:layout_height="0px"
 			android:layout_width="fill_parent"
-			android:layout_weight="1" />
+			android:layout_weight="1"
+			android:contentDescription="@string/play_pause" />
 		<ImageButton
 			android:id="@+id/next"
 			android:adjustViewBounds="true"
@@ -61,6 +62,7 @@ THE SOFTWARE.
 			android:background="@null"
 			android:layout_height="0px"
 			android:layout_width="fill_parent"
-			android:layout_weight="1" />
+			android:layout_weight="1"
+			android:contentDescription="@string/next_song" />
 	</LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/widget_d.xml b/res/layout/widget_d.xml
index b3da1345..4980b77f 100644
--- a/res/layout/widget_d.xml
+++ b/res/layout/widget_d.xml
@@ -68,7 +68,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/shuffle_inactive" />
+				android:src="@drawable/shuffle_inactive"
+				android:contentDescription="@string/cycle_shuffle_mode" />
 			<ImageButton
 				android:id="@+id/previous"
 				android:adjustViewBounds="true"
@@ -77,7 +78,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/previous" />
+				android:src="@drawable/previous"
+				android:contentDescription="@string/previous_song" />
 			<ImageButton
 				android:id="@+id/play_pause"
 				android:adjustViewBounds="true"
@@ -86,7 +88,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/play" />
+				android:src="@drawable/play"
+				android:contentDescription="@string/play_pause" />
 			<ImageButton
 				android:id="@+id/next"
 				android:adjustViewBounds="true"
@@ -95,7 +98,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/next" />
+				android:src="@drawable/next"
+				android:contentDescription="@string/next_song" />
 			<ImageButton
 				android:id="@+id/end_action"
 				android:adjustViewBounds="true"
@@ -104,7 +108,8 @@ THE SOFTWARE.
 				android:layout_weight="1"
 				android:background="@null"
 				android:scaleType="fitCenter"
-				android:src="@drawable/repeat_inactive" />
+				android:src="@drawable/repeat_inactive"
+				android:contentDescription="@string/cycle_repeat_mode" />
 		</LinearLayout>
 	</LinearLayout>
 </FrameLayout>
diff --git a/res/values-nb/translatable.xml b/res/values-nb/translatable.xml
index 2fec5fec..3ca189a3 100644
--- a/res/values-nb/translatable.xml
+++ b/res/values-nb/translatable.xml
@@ -43,8 +43,8 @@ THE SOFTWARE.
 	<string name="play">Spill</string>
 	<string name="edit">Endre</string>
 	<string name="rename">Gi nytt navn</string>
-	<string name="add_to_playlist">Legg til spilleliste...</string>
-	<string name="new_playlist">Ny Spilleliste...</string>
+	<string name="add_to_playlist">Legg til spilleliste…</string>
+	<string name="new_playlist">Ny Spilleliste…</string>
 	<string name="expand">Utvid</string>
 	<string name="delete">Slett</string>
 	<string name="playback_view">Spilles Nå</string>
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index c310d5cb..c01f3449 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -53,8 +53,8 @@ THE SOFTWARE.
 	<string name="play">Play</string>
 	<string name="edit">Edit</string>
 	<string name="rename">Rename</string>
-	<string name="add_to_playlist">Add to Playlist...</string>
-	<string name="new_playlist">New Playlist...</string>
+	<string name="add_to_playlist">Add to Playlist…</string>
+	<string name="new_playlist">New Playlist…</string>
 	<string name="expand">Expand</string>
 	<string name="delete">Delete</string>
 	<string name="playback_view">Now Playing</string>
@@ -62,6 +62,7 @@ THE SOFTWARE.
 	<string name="search">Search</string>
 	<string name="done">Done</string>
 	<string name="remove">Remove</string>
+	<string name="clear_search">Clear search</string>
 
 	<plurals name="playing">
 		<item quantity="one">1 song playing.</item>
diff --git a/src/org/kreed/vanilla/PlaylistActivity.java b/src/org/kreed/vanilla/PlaylistActivity.java
index ed211014..7bcd6556 100644
--- a/src/org/kreed/vanilla/PlaylistActivity.java
+++ b/src/org/kreed/vanilla/PlaylistActivity.java
@@ -194,7 +194,7 @@ public class PlaylistActivity extends Activity
 		Intent intent = new Intent();
 		intent.putExtra("id", info.id);
 		intent.putExtra("position", info.position);
-		intent.putExtra("audioId", (Long)((MediaView)info.targetView).getTag());
+		intent.putExtra("audioId", (Long)info.targetView.getTag());
 
 		menu.add(0, MENU_PLAY, 0, R.string.play).setIntent(intent);
 		menu.add(0, MENU_PLAY_ALL, 0, R.string.play_all).setIntent(intent);