diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 0fa01e4a702..a6893e7a0ca 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -30,7 +30,8 @@
         <ImageView android:id="@android:id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="20dip" />
+                android:paddingTop="20dip"
+                android:visibility="gone" />
 
         <CheckBox android:id="@+id/automatic_mode"
                 android:layout_width="match_parent"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 5b7392483ef..7fe7f76b745 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -21,7 +21,6 @@
         <com.android.settings.BrightnessPreference
                 android:key="brightness"
                 android:title="@string/brightness"
-                android:dialogIcon="@drawable/ic_popup_brightness"
                 android:dialogTitle="@string/brightness" />
 
         <CheckBoxPreference
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index fe3b99763b9..7494e2fc23c 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -55,6 +55,7 @@ public class BrightnessPreference extends SeekBarPreference implements
                 com.android.internal.R.bool.config_automatic_brightness_available);
 
         setDialogLayoutResource(R.layout.preference_dialog_brightness);
+        setDialogIcon(R.drawable.ic_settings_display);
     }
 
     @Override