diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 54b7b9c..6157401 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2732,22 +2732,8 @@
                 (SearchManager) getSystemService(Context.SEARCH_SERVICE);
         ComponentName activityName = searchManager.getGlobalSearchActivity();
         if (activityName != null) {
-            // In landscape mode on the Phone UI, we only have enough space to show the magnifying
-            // glass icon
-            boolean iconLoaded = false;
-            if (!LauncherApplication.isScreenLarge()) {
-                // TODO-APPS_CUSTOMIZE: Remove when the QSB fixes itself?
-                int orientation = getResources().getConfiguration().orientation;
-                if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                    searchButton.setImageResource(R.drawable.ic_generic_search);
-                    iconLoaded = true;
-                    sGlobalSearchIcon = null;
-                }
-            }
-            if (!iconLoaded) {
-                sGlobalSearchIcon = updateButtonWithIconFromExternalActivity(
-                        R.id.search_button, activityName, R.drawable.ic_generic_search);
-            }
+            sGlobalSearchIcon = updateButtonWithIconFromExternalActivity(
+                    R.id.search_button, activityName, R.drawable.ic_generic_search);
             searchButton.setVisibility(View.VISIBLE);
             searchDivider.setVisibility(View.VISIBLE);
         } else {
