diff --git a/res/drawable-v21/divider_outside_inset.xml b/res/drawable-v21/inset_divider.xml
similarity index 70%
rename from res/drawable-v21/divider_outside_inset.xml
rename to res/drawable-v21/inset_divider.xml
index af61d86b..adf90f12 100644
--- a/res/drawable-v21/divider_outside_inset.xml
+++ b/res/drawable-v21/inset_divider.xml
@@ -1,6 +1,6 @@
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
 	android:drawable="?android:attr/dividerHorizontal"
-	android:insetLeft="7sp"
-	android:insetRight="3sp" >
+	android:insetLeft="8sp"
+	android:insetRight="8sp" >
 </inset>
 
diff --git a/res/drawable/divider_outside_inset.xml b/res/drawable/inset_divider.xml
similarity index 100%
rename from res/drawable/divider_outside_inset.xml
rename to res/drawable/inset_divider.xml
diff --git a/res/layout/draggable_row.xml b/res/layout/draggable_row.xml
index 4724ef8e..309cea35 100644
--- a/res/layout/draggable_row.xml
+++ b/res/layout/draggable_row.xml
@@ -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="@drawable/divider_outside_inset" />
+		android:background="@drawable/inset_divider" />
 
 </ch.blinkenlights.android.vanilla.DraggableRow>
diff --git a/res/layout/filebrowser_content.xml b/res/layout/filebrowser_content.xml
index aab1138d..c2fc40ff 100644
--- a/res/layout/filebrowser_content.xml
+++ b/res/layout/filebrowser_content.xml
@@ -57,9 +57,8 @@ THE SOFTWARE.
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:listSelector="?android:attr/selectableItemBackground"
-	android:divider="@drawable/divider_outside_inset"
-	android:dividerHeight="1dip"
-	android:scrollbarStyle="outsideInset" />
+	android:divider="@drawable/inset_divider"
+	android:dividerHeight="1dip" />
 
 </LinearLayout>
 
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
index 84bf7e94..77aa3f59 100644
--- a/res/layout/listview.xml
+++ b/res/layout/listview.xml
@@ -24,7 +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="@drawable/divider_outside_inset"
+	android:divider="@drawable/inset_divider"
 	android:dividerHeight="1dip"
-	android:scrollbarStyle="outsideInset"
 	android:fastScrollEnabled="true"/>
diff --git a/res/layout/playlist_activity.xml b/res/layout/playlist_activity.xml
index 60614f95..e337e82e 100644
--- a/res/layout/playlist_activity.xml
+++ b/res/layout/playlist_activity.xml
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 	android:divider="@null"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:scrollbarStyle="outsideInset"
 	dslv:drag_enabled="false"
 	dslv:drag_start_mode="onMove"
 	dslv:float_background_color="?float_color"
diff --git a/res/layout/showqueue_listview.xml b/res/layout/showqueue_listview.xml
index a59324eb..247ae713 100644
--- a/res/layout/showqueue_listview.xml
+++ b/res/layout/showqueue_listview.xml
@@ -6,7 +6,6 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:listSelector="?android:attr/selectableItemBackground"
-	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 f6c6c0e3..20bbc1c2 100644
--- a/res/layout/tab_order.xml
+++ b/res/layout/tab_order.xml
@@ -35,7 +35,6 @@ 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/theme.xml b/res/values/theme.xml
index dbf8f759..a6e348a8 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -33,6 +33,7 @@ THE SOFTWARE.
 		<!-- color to use in full_playback text, set to bright_foreground_disabled_holo_light //-->
 		<item name="overlay_foreground_color">#ffb2b2b2</item>
 		<item name="float_color">#f222</item>
+		<item name="android:scrollbarStyle">outsideInset</item>
 	</style>
 
 	<style name="Playback" parent="VanillaBase">