diff --git a/app/src/main/res/layout/abstract_recycler_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml
index 0a443ed68..194bf8840 100644
--- a/app/src/main/res/layout/abstract_recycler_fragment.xml
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -20,7 +20,6 @@
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:scrollbars="vertical"
-				android:paddingRight="@dimen/FastScroller.LeftAlignedMargin"
 				android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"
 				android:scrollbarStyle="outsideOverlay"/>
 
diff --git a/app/src/main/res/layout/album_list_header.xml b/app/src/main/res/layout/album_list_header.xml
index e78d0ace5..2253e77ec 100644
--- a/app/src/main/res/layout/album_list_header.xml
+++ b/app/src/main/res/layout/album_list_header.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:orientation="horizontal">
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/item_name"
@@ -13,8 +15,6 @@
 		android:background="@android:color/transparent"
 		android:textColor="?attr/colorAccent"
 		android:textStyle="bold"
-		android:paddingLeft="6dp"
-		android:paddingRight="6dp"
 		android:paddingTop="8dp"
 		android:paddingBottom="8dp"/>
 
@@ -22,8 +22,6 @@
 		android:id="@+id/item_checkbox"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/main.albums_per_folder"
-		android:layout_marginRight="6dp"
-		android:layout_gravity="right"
+		android:layout_gravity="end|center_vertical"
 		android:textColor="?android:textColorPrimary"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/basic_choice_item.xml b/app/src/main/res/layout/basic_choice_item.xml
index e2dc22045..4c0ef9b6e 100644
--- a/app/src/main/res/layout/basic_choice_item.xml
+++ b/app/src/main/res/layout/basic_choice_item.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectableItemBackground">
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/item_name"
 		android:layout_width="0dip"
 		android:layout_height="?android:attr/listPreferredItemHeight"
 		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
 		android:background="@android:color/transparent"
-		android:textColor="?android:textColorPrimary"/>
+		android:gravity="left|center_vertical"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorPrimary" />
 
 	<CheckBox
 		android:id="@+id/item_checkbox"
+		style="@style/MoreButton"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-		style="@style/MoreButton"/>
+		android:checkMark="?android:attr/listChoiceIndicatorMultiple" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
index ce1aa8004..5a9b04101 100644
--- a/app/src/main/res/layout/basic_count_item.xml
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -3,35 +3,34 @@
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
-	android:minHeight="50dip">
+	android:minHeight="50dip"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/basic_count_name"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
 		android:background="@android:color/transparent"
+		android:gravity="left|center_vertical"
 		android:text="Text"
-		android:textColor="?android:textColorPrimary"/>
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorPrimary" />
 
 	<TextView
 		android:id="@+id/basic_count_count"
 		android:layout_width="32dp"
 		android:layout_height="32dp"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="20px"
 		android:layout_marginRight="12dp"
+		android:layout_marginBottom="4px"
 		android:background="@drawable/ic_number_border"
 		android:focusable="false"
-		android:paddingRight="10dp"
-		android:layout_marginLeft="20px"
-		android:layout_marginBottom="4px"
+		android:gravity="right|center_vertical"
 		android:text="99"
 		android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
-		android:textSize="11sp"
-		android:gravity="right|center_vertical"
-		android:layout_gravity="center_vertical"
 		android:textColor="?android:textColorPrimary"
-		android:visibility="gone"/>
+		android:textSize="11sp"
+		android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_header.xml b/app/src/main/res/layout/basic_header.xml
index b1f94b33b..015d42464 100644
--- a/app/src/main/res/layout/basic_header.xml
+++ b/app/src/main/res/layout/basic_header.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/item_name"
-	android:layout_width="fill_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:textAppearance="?android:attr/textAppearanceMedium"
-	android:background="@android:color/transparent"
-	android:textColor="?attr/colorAccent"
-	android:textStyle="bold"
-	android:paddingLeft="6dp"
-	android:paddingRight="6dp"
-	android:paddingTop="8dp"
-	android:paddingBottom="8dp"/>
\ No newline at end of file
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
+
+	<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/item_name"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="@android:color/transparent"
+		android:paddingTop="8dp"
+		android:paddingBottom="8dp"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?attr/colorAccent"
+		android:textStyle="bold" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
index ea1df8e8c..74078edba 100644
--- a/app/src/main/res/layout/basic_list_item.xml
+++ b/app/src/main/res/layout/basic_list_item.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-			  android:background="?attr/selectableItemBackground">
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
-	<TextView
-		android:id="@+id/item_name"
-		android:layout_width="0dip"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-		android:minHeight="50dip"
-		android:background="@android:color/transparent"
-		android:textColor="?android:textColorPrimary"/>
+    <TextView
+        android:id="@+id/item_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="@android:color/transparent"
+        android:gravity="center_vertical|start"
+        android:minHeight="50dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:textColorPrimary" />
 
 	<ImageButton
 		android:id="@+id/item_star"
 		android:layout_width="@dimen/Star.Small"
 		android:layout_height="@dimen/Star.Small"
-		android:scaleType="fitCenter"
-		android:layout_gravity="right|center_vertical"
+		android:layout_gravity="center_vertical|end"
 		android:background="@android:color/transparent"
 		android:focusable="false"
-		android:visibility="gone"/>
+		android:scaleType="fitCenter"
+		android:visibility="gone" />
 
 	<ImageView
 		android:id="@+id/item_more"
-		android:src="?attr/download_none"
+		style="@style/MoreButton"
 		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_gravity="right|center_vertical"
-		style="@style/MoreButton"/>
-</LinearLayout>
\ No newline at end of file
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical|end"
+		android:src="?attr/download_none" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/complex_list_item.xml b/app/src/main/res/layout/complex_list_item.xml
index 143f9af99..096575b57 100644
--- a/app/src/main/res/layout/complex_list_item.xml
+++ b/app/src/main/res/layout/complex_list_item.xml
@@ -1,51 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="?android:attr/listPreferredItemHeight"
-	android:background="?attr/selectableItemBackground">
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
-	<LinearLayout android:orientation="vertical"
+	<LinearLayout
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
-		android:layout_weight="1"
 		android:layout_gravity="center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-		android:gravity="left|center_vertical">
+		android:layout_weight="1"
+		android:gravity="left|center_vertical"
+		android:orientation="vertical">
 
 		<TextView
 			android:id="@+id/item_name"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:background="@android:color/transparent"
-			android:textColor="?android:textColorPrimary"/>
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:textColor="?android:textColorPrimary" />
 
 		<TextView
 			android:id="@+id/item_description"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:background="@android:color/transparent"
-			android:textColor="?android:textColorSecondary"/>
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:textColor="?android:textColorSecondary" />
 	</LinearLayout>
 
 	<ImageButton
 		android:id="@+id/item_star"
 		android:layout_width="@dimen/Star.Small"
 		android:layout_height="@dimen/Star.Small"
-		android:scaleType="fitCenter"
 		android:layout_gravity="right|center_vertical"
 		android:background="@android:color/transparent"
 		android:focusable="false"
-		android:visibility="gone"/>
+		android:scaleType="fitCenter"
+		android:visibility="gone" />
 
 	<ImageView
 		android:id="@+id/item_more"
-		android:src="?attr/download_none"
+		style="@style/MoreButton"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:layout_gravity="right|center_vertical"
-		style="@style/MoreButton"/>
+		android:src="?attr/download_none" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/details_item.xml b/app/src/main/res/layout/details_item.xml
index 4ef5fef06..393dcd702 100644
--- a/app/src/main/res/layout/details_item.xml
+++ b/app/src/main/res/layout/details_item.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:padding="8dp">
+	android:orientation="horizontal"
+	android:padding="8dp"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/detail_name"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
 		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:textColor="?android:textColorPrimary"
 		android:paddingLeft="14dp"
-		android:layout_gravity="center_vertical"/>
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorPrimary" />
 
 	<TextView
 		android:id="@+id/detail_value"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
 		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-		android:textColor="?android:textColorSecondary"
 		android:paddingLeft="14dp"
-		android:layout_gravity="center_vertical"/>
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:textColorSecondary" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/expandable_header.xml b/app/src/main/res/layout/expandable_header.xml
index bd78275eb..c7b743ccf 100644
--- a/app/src/main/res/layout/expandable_header.xml
+++ b/app/src/main/res/layout/expandable_header.xml
@@ -2,6 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
 			  android:orientation="horizontal">
 
 	<TextView
@@ -13,8 +15,6 @@
 		android:background="@android:color/transparent"
 		android:textColor="?attr/colorAccent"
 		android:textStyle="bold"
-		android:paddingLeft="6dp"
-		android:paddingRight="6dp"
 		android:paddingTop="8dp"
 		android:paddingBottom="8dp"/>
 
@@ -25,8 +25,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:paddingRight="10dp"
-		android:paddingLeft="10dp"
-		android:paddingTop="10dp"
 		android:background="?attr/selectableItemBackgroundBorderless"
 		android:clickable="true"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index fb30e167e..ef0402f86 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectableItemBackground">
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/genre_name"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
+		android:background="@android:color/transparent"
+		android:ellipsize="marquee"
+		android:gravity="center_vertical|start"
 		android:minHeight="50dip"
 		android:singleLine="true"
-		android:ellipsize="marquee"
-		android:background="@android:color/transparent"
-		android:textColor="?android:textColorPrimary"/>
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="?android:textColorPrimary" />
 
 	<LinearLayout
 		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:orientation="vertical"
+		android:layout_height="match_parent"
+		android:background="@android:color/transparent"
 		android:gravity="right|center_vertical"
-		android:paddingRight="10dip"
-		android:background="@android:color/transparent">
+		android:orientation="vertical">
 
 		<TextView
 			android:id="@+id/genre_songs"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:textColor="?android:textColorSecondary"/>
+			android:textColor="?android:textColorSecondary" />
 
 		<TextView
 			android:id="@+id/genre_albums"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:textColor="?android:textColorSecondary"/>
+			android:textColor="?android:textColorSecondary" />
 	</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
index d7c8d312f..dd86df50e 100644
--- a/app/src/main/res/layout/song_list_item.xml
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -1,142 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@id/drag_handle"
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="?android:attr/listPreferredItemHeight"
-		android:background="?attr/selectableItemBackground">
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="0dip"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:layout_gravity="center_vertical">
-
-        <LinearLayout android:orientation="horizontal"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center_vertical">
+	android:id="@id/drag_handle"
+	android:layout_width="match_parent"
+	android:layout_height="?android:attr/listPreferredItemHeight"
+	android:background="?attr/selectableItemBackground"
+	android:orientation="horizontal"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:orientation="horizontal">
 
 			<TextView
 				android:id="@+id/song_track"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="left|top"
+				android:layout_gravity="top|start"
+				android:drawablePadding="6dip"
+				android:gravity="start"
+				android:paddingRight="6dp"
 				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:textColor="?android:textColorPrimary"
-				android:paddingLeft="6dip"
-				android:paddingRight="6dip"
-				android:drawablePadding="6dip"/>
+				android:textColor="?android:textColorPrimary" />
 
-            <TextView
+			<TextView
 				android:id="@+id/song_title"
-				android:layout_width="0dip"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:layout_weight="1"
 				android:layout_gravity="left|top"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:singleLine="true"
-				android:ellipsize="marquee"
-				android:paddingLeft="6dip"
-				android:paddingRight="6dip"
+				android:layout_weight="1"
 				android:drawablePadding="6dip"
-				android:textColor="?android:textColorPrimary"/>
+				android:ellipsize="marquee"
+				android:paddingRight="6dp"
+				android:singleLine="true"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textColor="?android:textColorPrimary" />
 
 			<ImageButton
 				android:id="@+id/song_bookmark"
 				android:layout_width="@dimen/SongStatusIcon"
 				android:layout_height="@dimen/SongStatusIcon"
-				android:layout_gravity="right|top"
+				android:layout_gravity="top|end"
 				android:background="@null"
 				android:focusable="false"
 				android:scaleType="fitCenter"
-				android:visibility="gone"/>
-					
+				android:visibility="gone" />
+
 			<ImageButton
 				android:id="@+id/song_star"
 				android:layout_width="@dimen/Star.Small"
 				android:layout_height="@dimen/Star.Small"
-				android:scaleType="fitCenter"
-				android:layout_gravity="right|top"
+				android:layout_gravity="top|end"
 				android:background="@null"
 				android:focusable="false"
-				android:visibility="gone"/>
+				android:scaleType="fitCenter"
+				android:visibility="gone" />
 
 			<ImageButton
 				android:id="@+id/song_played"
 				android:layout_width="@dimen/SongStatusIcon"
 				android:layout_height="@dimen/SongStatusIcon"
-				android:scaleType="fitCenter"
-				android:layout_gravity="right|top"
+				android:layout_gravity="top|end"
 				android:background="@null"
 				android:focusable="false"
-				android:visibility="gone"/>
+				android:scaleType="fitCenter"
+				android:visibility="gone" />
 
-            <TextView
+			<TextView
 				android:id="@+id/song_status"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="right|top"
 				android:drawablePadding="1dip"
-				android:paddingRight="2dip"/>
+				android:paddingRight="2dip" />
 
 			<ImageView
 				android:id="@+id/song_status_icon"
 				android:layout_width="@dimen/SongStatusIcon"
 				android:layout_height="@dimen/SongStatusIcon"
-				android:layout_gravity="top"
+				android:layout_gravity="top|end"
 				android:src="?attr/downloading"
-				android:visibility="gone"/>
-        </LinearLayout>
+				android:visibility="gone" />
+		</LinearLayout>
 
-        <LinearLayout
+		<LinearLayout
 			android:id="@+id/song_bottom"
-			android:orientation="horizontal"
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical">
-
-            <TextView
-                    android:id="@+id/song_artist"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_gravity="left|center_vertical"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
-                    android:ellipsize="middle"
-                    android:paddingLeft="6dip"
-					android:textColor="?android:textColorSecondary"/>
+			android:layout_gravity="center_vertical"
+			android:orientation="horizontal">
+
+			<TextView
+				android:id="@+id/song_artist"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical|start|end"
+				android:layout_weight="1"
+				android:ellipsize="middle"
+				android:singleLine="true"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textColor="?android:textColorSecondary" />
 
 			<RatingBar
 				android:id="@+id/song_rating"
+				style="@android:style/Widget.Holo.RatingBar.Small"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:isIndicator="true"
 				android:layout_centerHorizontal="true"
+				android:isIndicator="true"
 				android:numStars="5"
-				style="@android:style/Widget.Holo.RatingBar.Small"
-				android:visibility="gone"/>
-
-            <TextView
-                    android:id="@+id/song_duration"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right|center_vertical"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:singleLine="true"
-                    android:paddingLeft="3dip"
-                    android:paddingRight="4dip"
-					android:textColor="?android:textColorSecondary"/>
-
-        </LinearLayout>
-    </LinearLayout>
-	
+				android:visibility="gone" />
+
+			<TextView
+				android:id="@+id/song_duration"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical|end"
+				android:paddingLeft="3dip"
+				android:paddingRight="4dip"
+				android:singleLine="true"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:textColor="?android:textColorSecondary" />
+
+		</LinearLayout>
+	</LinearLayout>
+
 	<ImageView
 		android:id="@+id/item_more"
-		android:src="?attr/download_none"
+		style="@style/MoreButton"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
-		android:layout_gravity="right|center_vertical"
-		style="@style/MoreButton"/>
+		android:layout_gravity="center_vertical|end"
+		android:src="?attr/download_none" />
+
 </LinearLayout>