diff --git a/ultrasonic/src/main/res/layout/main_buttons.xml b/ultrasonic/src/main/res/layout/main_buttons.xml
index 16984338..8406c453 100644
--- a/ultrasonic/src/main/res/layout/main_buttons.xml
+++ b/ultrasonic/src/main/res/layout/main_buttons.xml
@@ -10,16 +10,25 @@
 		<ImageView a:layout_width="wrap_content" a:layout_height="wrap_content"
 			a:layout_gravity="center_vertical" a:src="?attr/select_folder" />
 
-		<LinearLayout a:orientation="vertical" a:layout_width="wrap_content"
-			a:layout_height="fill_parent">
+		<LinearLayout
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:orientation="vertical">
 
-			<TextView a:id="@+id/main.select_server_1" a:text="@string/main.select_server"
-				a:layout_width="fill_parent" a:layout_height="wrap_content"
-				a:layout_marginLeft="10dip" a:layout_marginTop="6dip"
+			<TextView
+				a:id="@+id/main.select_server_1"
+				a:layout_width="fill_parent"
+				a:layout_height="wrap_content"
+				a:layout_marginLeft="10dip"
+				a:layout_marginTop="6dip"
+				a:text="@string/main.select_server"
 				a:textAppearance="?android:attr/textAppearanceLarge" />
 
-			<TextView a:id="@+id/main.select_server_2" a:layout_width="fill_parent"
-				a:layout_height="wrap_content" a:layout_marginLeft="10dip"
+			<TextView
+				a:id="@+id/main.select_server_2"
+				a:layout_width="fill_parent"
+				a:layout_height="wrap_content"
+				a:layout_marginLeft="10dip"
 				a:textAppearance="?android:attr/textAppearanceSmall" />
 
 		</LinearLayout>
diff --git a/ultrasonic/src/main/res/layout/notification.xml b/ultrasonic/src/main/res/layout/notification.xml
index d312d89f..c1191a14 100644
--- a/ultrasonic/src/main/res/layout/notification.xml
+++ b/ultrasonic/src/main/res/layout/notification.xml
@@ -70,7 +70,7 @@
         android:layout_gravity="center"
         android:gravity="end"
         android:orientation="horizontal"
-        >
+        android:paddingRight="4dp">
 
         <ImageButton
             android:id="@+id/control_previous"
@@ -104,12 +104,13 @@
 
         <ImageButton
             android:id="@+id/control_stop"
-            android:layout_width="22dip"
-            android:layout_height="22dip"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
             android:layout_gravity="center"
+            android:layout_marginLeft="4dp"
+            android:alpha="70"
             android:background="@drawable/btn_bg"
             android:scaleType="fitXY"
-            android:alpha="70"
             android:src="@drawable/ic_menu_exit_dark" />
     </LinearLayout>
 
diff --git a/ultrasonic/src/main/res/layout/notification_large.xml b/ultrasonic/src/main/res/layout/notification_large.xml
index e3a3809f..b0aedca8 100644
--- a/ultrasonic/src/main/res/layout/notification_large.xml
+++ b/ultrasonic/src/main/res/layout/notification_large.xml
@@ -26,11 +26,12 @@
         android:paddingRight="8dip"
         android:paddingBottom="8dip"
         >
-        
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" >
+            android:orientation="horizontal"
+            android:paddingRight="4dp">
 
             <TextView
                 android:id="@+id/trackname"
@@ -42,19 +43,17 @@
                 android:ellipsize="marquee"
                 android:focusable="true"
                 android:singleLine="true"
-                tools:text="Track name"
-                />
+                tools:text="Track name" />
 
             <ImageButton
                 android:id="@+id/control_stop"
-                android:layout_width="22dip"
-                android:layout_height="22dip"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
                 android:layout_gravity="center|end"
-                android:gravity="center_vertical"
                 android:background="@drawable/btn_bg"
+                android:gravity="center_vertical"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_menu_exit_dark"
-                />
+                android:src="@drawable/ic_menu_exit_dark" />
         </LinearLayout>
 
 		<TextView
diff --git a/ultrasonic/src/main/res/layout/song_list_item.xml b/ultrasonic/src/main/res/layout/song_list_item.xml
index cec22dbb..6f0c12ab 100644
--- a/ultrasonic/src/main/res/layout/song_list_item.xml
+++ b/ultrasonic/src/main/res/layout/song_list_item.xml
@@ -70,7 +70,7 @@
             a:focusable="false"
             a:gravity="center_vertical"
             a:scaleType="centerInside"
-            a:layout_marginRight="3dip"
+            a:layout_marginRight="8dip"
             a:src="?attr/star_hollow" />
 
     </LinearLayout>
@@ -82,7 +82,7 @@
         a:background="@android:color/transparent"
         a:focusable="false"
         a:gravity="center_vertical"
-        a:paddingRight="3dip"
+        a:paddingRight="8dip"
         a:src="?attr/star_hollow" />
 
     <ImageView
@@ -92,7 +92,7 @@
         a:background="@android:color/transparent"
         a:focusable="false"
         a:gravity="center_vertical"
-        a:paddingRight="3dip"
+        a:paddingRight="8dip"
         a:src="@drawable/ic_drag_queue" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/layout/video_list_item.xml b/ultrasonic/src/main/res/layout/video_list_item.xml
index 60f8e332..0066fb2d 100644
--- a/ultrasonic/src/main/res/layout/video_list_item.xml
+++ b/ultrasonic/src/main/res/layout/video_list_item.xml
@@ -23,7 +23,7 @@
         a:background="@android:color/transparent"
         a:focusable="false"
         a:gravity="center_vertical"
-        a:paddingRight="3dip"
+        a:paddingRight="8dip"
         a:src="?attr/star_hollow" />
 
 </LinearLayout>
\ No newline at end of file