diff --git a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
index 5cb307f..4c0907c 100644
--- a/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
+++ b/core/java/com/android/internal/view/menu/CascadingMenuPopup.java
@@ -347,21 +347,18 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         final MenuAdapter adapter = new MenuAdapter(menu, inflater, mOverflowOnly);
 
-        // Apply "force show icon" setting. There are 4 cases:
-        // (1) This is the top level menu. Only add spacing for icons if forced.
+        // Apply "force show icon" setting. There are 3 cases:
+        // (1) This is the top level menu and icon spacing is forced. Add spacing.
         // (2) This is a submenu. Add spacing if any of the visible menu items has an icon.
-        // (3) This is a top level menu that is not an overflow menu. Add spacing if any of the
-        //     visible menu items has an icon.
-        // (4) This is an overflow menu or a top level menu that doesn't have "force" set.
-        //     Don't allow spacing.
+        // (3) This is the top level menu and icon spacing isn't forced. Do not add spacing.
         if (!isShowing() && mForceShowIcon) {
           // Case 1
           adapter.setForceShowIcon(true);
-        } else if (isShowing() || !isShowing() && !mForceShowIcon && !mOverflowOnly) {
-          // Case 2 or 3
+        } else if (isShowing()) {
+          // Case 2
           adapter.setForceShowIcon(MenuPopup.shouldPreserveIconSpacing(menu));
         }
-        // Case 4: Else, don't allow spacing for icons.
+        // Case 3: Else, don't allow spacing for icons (default behavior; do nothing).
 
         final int menuWidth = measureIndividualMenuWidth(adapter, null, mContext, mMenuMaxWidth);
         final MenuPopupWindow popupWindow = createPopupWindow();
diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
index 1f1e594..9f029ad 100644
--- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java
+++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
@@ -104,6 +104,9 @@
      */
     public void setForceShowIcon(boolean forceShowIcon) {
         mForceShowIcon = forceShowIcon;
+        if (mPopup != null) {
+            mPopup.setForceShowIcon(forceShowIcon);
+        }
     }
 
     /**