diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index f0db5cd6f2..41bdbee82a 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -32,7 +32,7 @@
 <!-- QSB -->
     <dimen name="qsb_bar_height">82dp</dimen>
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">0dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">24dip</dimen>
 
 <!-- Workspace -->
     <dimen name="workspace_divider_padding_top">12dp</dimen>
diff --git a/src/com/android/launcher2/HolographicViewHelper.java b/src/com/android/launcher2/HolographicViewHelper.java
index 0e798da870..93d7853518 100644
--- a/src/com/android/launcher2/HolographicViewHelper.java
+++ b/src/com/android/launcher2/HolographicViewHelper.java
@@ -21,6 +21,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.widget.ImageView;
 
@@ -69,12 +70,13 @@ public class HolographicViewHelper {
      * Creates a copy of the original image.
      */
     private Bitmap createOriginalImage(ImageView v, Canvas canvas) {
+        final Drawable d = v.getDrawable();
         final Bitmap b = Bitmap.createBitmap(
-                v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
+                d.getIntrinsicWidth(), d.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
 
         canvas.setBitmap(b);
         canvas.save();
-            v.draw(canvas);
+            d.draw(canvas);
         canvas.restore();
         canvas.setBitmap(null);
 
@@ -86,12 +88,13 @@ public class HolographicViewHelper {
      * Responsibility for the bitmap is transferred to the caller.
      */
     private Bitmap createPressImage(ImageView v, Canvas canvas) {
+        final Drawable d = v.getDrawable();
         final Bitmap b = Bitmap.createBitmap(
-                v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
+                d.getIntrinsicWidth(), d.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
 
         canvas.setBitmap(b);
         canvas.save();
-            v.draw(canvas);
+            d.draw(canvas);
         canvas.restore();
         canvas.drawColor(mHighlightColor, PorterDuff.Mode.SRC_IN);
         canvas.setBitmap(null);