diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7d2c741..bda5591 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2846,7 +2846,7 @@
     }
 
     /**
-     * Sets the app market icon (shown when all apps is visible on x-large screens)
+     * Sets the app market icon
      */
     private void updateAppMarketIcon() {
         final View marketButton = findViewById(R.id.market_button);
@@ -2859,6 +2859,11 @@
             sAppMarketIcon = updateTextButtonWithIconFromExternalActivity(
                     R.id.market_button, activityName, R.drawable.app_market_generic);
             marketButton.setVisibility(View.VISIBLE);
+            
+            // Remove the shop icon text in the Phone UI
+            if (!LauncherApplication.isScreenLarge()) {
+                ((TextView) marketButton).setText("");
+            }
         } else {
             // We should hide and disable the view so that we don't try and restore the visibility
             // of it when we swap between drag & normal states from IconDropTarget subclasses.
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index 6ddecf1..4061f19 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -193,6 +193,11 @@
         final TextView dims = (TextView) findViewById(R.id.widget_dims);
         dims.setText(String.format(mDimensionsFormatString, cellSpan[0], cellSpan[1]));
         dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
@@ -215,6 +220,11 @@
             dims.setText(String.format(mDimensionsFormatString, 1, 1));
             dims.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
@@ -234,6 +244,11 @@
         TextView name = (TextView) findViewById(R.id.wallpaper_name);
         name.setText(info.loadLabel(packageManager));
         name.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        
+        // Hide the divider in the Phone UI.
+        if (!LauncherApplication.isScreenLarge()) {
+            findViewById(R.id.divider).setVisibility(View.GONE);
+        }
 
         if (createHolographicOutline) {
             mIconCache = cache;
