diff --git a/ultrasonic/src/main/res/layout/album_list_item.xml b/ultrasonic/src/main/res/layout/album_list_item.xml
index d6774dbc..e4129ff1 100644
--- a/ultrasonic/src/main/res/layout/album_list_item.xml
+++ b/ultrasonic/src/main/res/layout/album_list_item.xml
@@ -1,52 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:orientation="horizontal"
-              a:layout_width="fill_parent"
-              a:layout_height="wrap_content"
-              a:minHeight="?android:attr/listPreferredItemHeight"
-              >
+    a:orientation="horizontal"
+    a:layout_width="fill_parent"
+    a:layout_height="wrap_content"
+    a:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
-            a:id="@+id/album_coverart"
-            a:layout_width="64dp"
-            a:layout_height="64dp"
-            a:layout_gravity="left|center_vertical"
-            a:paddingLeft="3dip"/>
+        a:id="@+id/album_coverart"
+        a:layout_width="64dp"
+        a:layout_height="64dp"
+        a:layout_gravity="left|center_vertical"
+        a:paddingLeft="3dip" />
 
     <LinearLayout
-            a:orientation="vertical"
-            a:layout_width="0dip"
+        a:orientation="vertical"
+        a:layout_width="0dip"
+        a:layout_height="wrap_content"
+        a:layout_weight="1"
+        a:layout_gravity="left|center_vertical"
+        a:paddingLeft="6dip"
+        a:paddingRight="3dip">
+
+        <TextView
+            a:id="@+id/album_title"
+            a:layout_width="wrap_content"
             a:layout_height="wrap_content"
-            a:layout_weight="1"
-            a:layout_gravity="left|center_vertical"
-            a:paddingLeft="6dip"
-            a:paddingRight="3dip">
+            a:textAppearance="?android:attr/textAppearanceMedium"
+            a:singleLine="true"
+            a:ellipsize="marquee" />
 
         <TextView
-                a:id="@+id/album_title"
-                a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:textAppearance="?android:attr/textAppearanceMedium"
-                a:singleLine="true"
-                a:ellipsize="marquee"/>
-
-        <TextView
-                a:id="@+id/album_artist"
-                a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:textAppearance="?android:attr/textAppearanceSmall"
-                a:singleLine="true"/>
+            a:id="@+id/album_artist"
+            a:layout_width="wrap_content"
+            a:layout_height="wrap_content"
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            a:singleLine="true" />
 
     </LinearLayout>
 
     <ImageView
-        	a:id="@+id/album_star" 
-        	a:layout_width="wrap_content"
-			a:layout_height="fill_parent"
-			a:gravity="center_vertical"
-			a:background="@android:color/transparent"
-            a:src="?attr/star_hollow"
-            a:focusable="false"
-            a:paddingRight="3dip" />
-    
+        a:id="@+id/album_star"
+        a:layout_width="38dp"
+        a:layout_height="fill_parent"
+        a:gravity="center_vertical"
+        a:background="@android:color/transparent"
+        a:src="?attr/star_hollow"
+        a:focusable="false"
+        a:paddingRight="3dip" />
+
 </LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/download_playlist.xml b/ultrasonic/src/main/res/layout/download_playlist.xml
index a0a43e19..39e709b5 100644
--- a/ultrasonic/src/main/res/layout/download_playlist.xml
+++ b/ultrasonic/src/main/res/layout/download_playlist.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout
-        xmlns:a="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        a:orientation="vertical"
-        a:layout_width="fill_parent"
-        a:layout_height="fill_parent"
-        a:layout_weight="1">
+    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    a:orientation="vertical"
+    a:layout_width="fill_parent"
+    a:layout_height="fill_parent"
+    a:layout_weight="1">
 
     <TextView
-            a:id="@+id/download_empty"
-            a:text="@string/download.empty"
-            a:layout_width="fill_parent"
-            a:layout_height="wrap_content"
-            a:padding="10dip"/>
+        a:id="@+id/download_empty"
+        a:text="@string/download.empty"
+        a:layout_width="fill_parent"
+        a:layout_height="wrap_content"
+        a:padding="10dip"/>
 
     <com.mobeta.android.dslv.DragSortListView
-            a:id="@+id/download_list"
-            a:layout_width="fill_parent"
-            a:layout_height="0dip"
-            a:layout_weight="1"
-            a:fastScrollEnabled="true"
-        	a:textFilterEnabled="true"
-            app:drag_handle_id="@+id/song_drag"
-            app:remove_enabled="true"
-            app:remove_mode="flingRemove"
-            app:fling_handle_id="@+id/song_drag"
-            app:drag_start_mode="onMove"
-            app:float_background_color="?attr/color_background"
-            app:float_alpha="0.7" />
-
+        a:id="@+id/download_list"
+        a:layout_width="fill_parent"
+        a:layout_height="0dip"
+        a:layout_weight="1"
+        a:fastScrollEnabled="true"
+        a:textFilterEnabled="true"
+        app:drag_handle_id="@+id/song_drag"
+        app:remove_enabled="true"
+        app:remove_mode="flingRemove"
+        app:fling_handle_id="@+id/song_drag"
+        app:drag_start_mode="onMove"
+        app:float_background_color="?attr/color_background"
+        app:float_alpha="0.7" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/song_details.xml b/ultrasonic/src/main/res/layout/song_details.xml
index 56db6036..c2ed8e16 100644
--- a/ultrasonic/src/main/res/layout/song_details.xml
+++ b/ultrasonic/src/main/res/layout/song_details.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-              a:layout_width="0dip"
-              a:layout_height="wrap_content"
-              a:layout_gravity="center_vertical"
-              a:layout_weight="1"
-              a:orientation="vertical">
+    a:layout_width="0dip"
+    a:layout_height="wrap_content"
+    a:layout_gravity="center_vertical"
+    a:layout_weight="1"
+    a:layout_marginLeft="4dp"
+    a:orientation="vertical">
 
     <LinearLayout
         a:layout_width="fill_parent"
diff --git a/ultrasonic/src/main/res/layout/song_list_item.xml b/ultrasonic/src/main/res/layout/song_list_item.xml
index 8f25b1a5..6133e928 100644
--- a/ultrasonic/src/main/res/layout/song_list_item.xml
+++ b/ultrasonic/src/main/res/layout/song_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     a:layout_width="fill_parent"
     a:layout_height="wrap_content"
     a:minHeight="?android:attr/listPreferredItemHeight"
@@ -7,12 +8,11 @@
 
     <CheckedTextView
         a:id="@+id/song_check"
-        a:layout_width="wrap_content"
+        a:layout_width="38dp"
         a:layout_height="fill_parent"
         a:checkMark="?attr/button_check_custom"
         a:gravity="center_vertical"
-        a:paddingLeft="3dip"
-        a:paddingRight="3dip"/>
+        a:paddingRight="4dip"/>
 
     <include layout="@layout/song_details" />
 
@@ -21,7 +21,8 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:layout_gravity="center_vertical"
-        a:orientation="horizontal">
+        a:orientation="horizontal"
+        tools:visibility="gone">
 
         <ImageView
             a:id="@+id/song_five_star_1"
@@ -67,18 +68,18 @@
             a:id="@+id/song_five_star_5"
             a:layout_width="10dip"
             a:layout_height="fill_parent"
+            a:layout_marginRight="8dip"
             a:background="@android:color/transparent"
             a:focusable="false"
             a:gravity="center_vertical"
             a:scaleType="centerInside"
-            a:layout_marginRight="8dip"
             a:src="?attr/star_hollow" />
 
     </LinearLayout>
 
     <ImageView
         a:id="@+id/song_star"
-        a:layout_width="wrap_content"
+        a:layout_width="38dp"
         a:layout_height="fill_parent"
         a:background="@android:color/transparent"
         a:focusable="false"