diff --git a/orig/folder.svgz b/orig/folder.svgz
new file mode 100644
index 00000000..44315d19
Binary files /dev/null and b/orig/folder.svgz differ
diff --git a/orig/grabber.svgz b/orig/grabber.svgz
index a0fecafd..8f711a0c 100644
Binary files a/orig/grabber.svgz and b/orig/grabber.svgz differ
diff --git a/res/drawable-hdpi/folder.png b/res/drawable-hdpi/folder.png
new file mode 100644
index 00000000..438f50c6
Binary files /dev/null and b/res/drawable-hdpi/folder.png differ
diff --git a/res/drawable-hdpi/grabber.png b/res/drawable-hdpi/grabber.png
index 4dbb7c41..8a4c2460 100644
Binary files a/res/drawable-hdpi/grabber.png and b/res/drawable-hdpi/grabber.png differ
diff --git a/res/drawable-hdpi/ic_launcher_folder.png b/res/drawable-hdpi/ic_launcher_folder.png
deleted file mode 100644
index 90b5aa4e..00000000
Binary files a/res/drawable-hdpi/ic_launcher_folder.png and /dev/null differ
diff --git a/res/drawable-mdpi/folder.png b/res/drawable-mdpi/folder.png
new file mode 100644
index 00000000..58bff4d0
Binary files /dev/null and b/res/drawable-mdpi/folder.png differ
diff --git a/res/drawable-mdpi/grabber.png b/res/drawable-mdpi/grabber.png
index 38033c24..9c23f4d6 100644
Binary files a/res/drawable-mdpi/grabber.png and b/res/drawable-mdpi/grabber.png differ
diff --git a/res/drawable-mdpi/ic_launcher_folder.png b/res/drawable-mdpi/ic_launcher_folder.png
deleted file mode 100644
index 0ce6f70b..00000000
Binary files a/res/drawable-mdpi/ic_launcher_folder.png and /dev/null differ
diff --git a/res/drawable-xhdpi/folder.png b/res/drawable-xhdpi/folder.png
new file mode 100644
index 00000000..3bc35402
Binary files /dev/null and b/res/drawable-xhdpi/folder.png differ
diff --git a/res/drawable-xhdpi/grabber.png b/res/drawable-xhdpi/grabber.png
index f73bc65b..4cdc65ae 100644
Binary files a/res/drawable-xhdpi/grabber.png and b/res/drawable-xhdpi/grabber.png differ
diff --git a/src/org/kreed/vanilla/FileSystemAdapter.java b/src/org/kreed/vanilla/FileSystemAdapter.java
index 6d362664..a8790356 100644
--- a/src/org/kreed/vanilla/FileSystemAdapter.java
+++ b/src/org/kreed/vanilla/FileSystemAdapter.java
@@ -117,7 +117,7 @@ public class FileSystemAdapter extends BaseAdapter implements LibraryAdapter {
 	{
 		mActivity = activity;
 		mLimiter = limiter;
-		mFolderIcon = BitmapFactory.decodeResource(activity.getResources(), R.drawable.ic_launcher_folder);
+		mFolderIcon = BitmapFactory.decodeResource(activity.getResources(), R.drawable.folder);
 		if (limiter == null) {
 			limiter = buildLimiter(Environment.getExternalStorageDirectory());
 		}
diff --git a/src/org/kreed/vanilla/MediaView.java b/src/org/kreed/vanilla/MediaView.java
index 84142a59..9ebf9f53 100644
--- a/src/org/kreed/vanilla/MediaView.java
+++ b/src/org/kreed/vanilla/MediaView.java
@@ -182,8 +182,8 @@ public final class MediaView extends View {
 
 		if (mShowBitmaps && mLeftBitmap != null) {
 			Bitmap expander = mLeftBitmap;
-			canvas.drawBitmap(expander, 0, (height - expander.getHeight()) / 2, paint);
-			xOffset = expander.getWidth();
+			canvas.drawBitmap(expander, padding, (height - expander.getHeight()) / 2, paint);
+			xOffset = expander.getWidth() + padding;
 		}
 
 		canvas.save();