diff --git a/res/drawable-v21/divider_outside_inset.xml b/res/drawable-v21/divider_outside_inset.xml
new file mode 100644
index 00000000..af61d86b
--- /dev/null
+++ b/res/drawable-v21/divider_outside_inset.xml
@@ -0,0 +1,6 @@
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+	android:drawable="?android:attr/dividerHorizontal"
+	android:insetLeft="7sp"
+	android:insetRight="3sp" >
+</inset>
+
diff --git a/res/drawable/divider_outside_inset.xml b/res/drawable/divider_outside_inset.xml
new file mode 100644
index 00000000..db8af4ac
--- /dev/null
+++ b/res/drawable/divider_outside_inset.xml
@@ -0,0 +1,11 @@
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+	android:insetLeft="0dp"
+	android:insetRight="0dp" >
+	<!-- holo version of divider which doesn't really have an inset.
+	     It would be very nice to inherit from "?android:attr/dividerHorizontal"
+	     but this seems to crash on Android 4 -->
+	<shape android:shape="rectangle">
+			<solid android:color="#2affffff"/>
+	</shape>
+</inset>
+
diff --git a/res/layout/draggable_row.xml b/res/layout/draggable_row.xml
index b90d40b0..4724ef8e 100644
--- a/res/layout/draggable_row.xml
+++ b/res/layout/draggable_row.xml
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<View
 			android:id="@+id/pmark"
 			android:visibility="gone"
-			android:layout_width="4dip"
+			android:layout_width="@dimen/pmark_size"
 			android:layout_height="@dimen/row_normal_height"
 			android:background="@color/now_playing_marker" />
 
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			android:scaleType="centerCrop"
 			android:layout_width="@dimen/cover_size"
 			android:layout_height="@dimen/cover_size"
-			android:layout_marginLeft="@dimen/cover_padding"
+			android:layout_marginLeft="@dimen/cover_padding_with_pmark"
 			android:layout_gravity="center_vertical"
 			android:visibility="gone" />
 		<TextView
@@ -73,6 +73,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	<View
 		android:layout_width="match_parent"
 		android:layout_height="1dip"
-		android:background="?android:attr/dividerHorizontal"/>
+		android:background="@drawable/divider_outside_inset" />
 
 </ch.blinkenlights.android.vanilla.DraggableRow>
diff --git a/res/layout/filebrowser_content.xml b/res/layout/filebrowser_content.xml
index 114ac0c1..aab1138d 100644
--- a/res/layout/filebrowser_content.xml
+++ b/res/layout/filebrowser_content.xml
@@ -56,11 +56,10 @@ THE SOFTWARE.
 	android:id="@+id/list"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:divider="?android:attr/dividerHorizontal"
-	android:dividerHeight="1dip"
 	android:listSelector="?android:attr/selectableItemBackground"
+	android:divider="@drawable/divider_outside_inset"
+	android:dividerHeight="1dip"
 	android:scrollbarStyle="outsideInset" />
 
-
 </LinearLayout>
 
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
index be033248..77ada290 100644
--- a/res/layout/listview.xml
+++ b/res/layout/listview.xml
@@ -24,6 +24,6 @@ THE SOFTWARE.
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:divider="?android:attr/dividerHorizontal"
+	android:divider="@drawable/divider_outside_inset"
 	android:dividerHeight="1dip"
 	android:scrollbarStyle="outsideInset" />
diff --git a/res/layout/showqueue_listview.xml b/res/layout/showqueue_listview.xml
index a78093d4..a59324eb 100644
--- a/res/layout/showqueue_listview.xml
+++ b/res/layout/showqueue_listview.xml
@@ -6,7 +6,7 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:listSelector="?android:attr/selectableItemBackground"
-	android:scrollbarStyle="outsideOverlay"
+	android:scrollbarStyle="outsideInset"
 	android:divider="@null"
 	dslv:drag_enabled="true"
 	dslv:drag_start_mode="onMove"
diff --git a/res/layout/tab_order.xml b/res/layout/tab_order.xml
index 20bbc1c2..f6c6c0e3 100644
--- a/res/layout/tab_order.xml
+++ b/res/layout/tab_order.xml
@@ -35,6 +35,7 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_weight="1"
 		android:choiceMode="multipleChoice"
+		android:scrollbarStyle="outsideInset"
 		dslv:drag_enabled="true"
 		dslv:drag_start_mode="onMove"
 		dslv:float_background_color="?float_color"
diff --git a/res/values-v21/dimens.xml b/res/values-v21/dimens.xml
index 86cdedbf..269f9fa6 100644
--- a/res/values-v21/dimens.xml
+++ b/res/values-v21/dimens.xml
@@ -3,6 +3,8 @@
 <resources>
 	<dimen name="cover_size">44sp</dimen>
 	<dimen name="cover_padding">14sp</dimen>
+	<dimen name="pmark_size">4sp</dimen>
+	<dimen name="cover_padding_with_pmark">10sp</dimen>
 	<dimen name="text_padding">14sp</dimen>
 	<dimen name="row_normal_height">56sp</dimen>
 	<dimen name="divider_size">0dip</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9cbda6f4..8ac5656d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -3,6 +3,8 @@
 <resources>
 	<dimen name="cover_size">44sp</dimen>
 	<dimen name="cover_padding">0sp</dimen>
+	<dimen name="pmark_size">4sp</dimen>
+	<dimen name="cover_padding_with_pmark">0sp</dimen>
 	<dimen name="text_padding">3sp</dimen>
 	<dimen name="row_normal_height">44sp</dimen>
 	<dimen name="divider_size">1dip</dimen>
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
index 6961fece..9bea16c3 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
@@ -359,7 +359,7 @@ public class LibraryPagerAdapter
 			view.setAdapter(adapter);
 			if (type != MediaUtils.TYPE_FILE)
 				loadSortOrder((MediaAdapter)adapter);
-			view.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
+
 			adapter.setFilter(mFilter);
 
 			mAdapters[type] = adapter;