diff --git a/data/udev-discover.ui b/data/udev-discover.ui
index 5e63568..ec30521 100644
--- a/data/udev-discover.ui
+++ b/data/udev-discover.ui
@@ -1282,7 +1282,7 @@ Javier Hernandez &lt;jhernandez@emergya.es&gt;</property>
                               <object class="GtkImage" id="device_image">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="stock">gtk-dialog-question</property>
+                                <property name="stock">dialog-question</property>
                                 <property name="icon-size">6</property>
                               </object>
                               <packing>
diff --git a/udev-discover.in b/udev-discover.in
index e5e9a9e..fec8b4e 100644
--- a/udev-discover.in
+++ b/udev-discover.in
@@ -49,7 +49,7 @@ ICON_SUBSYS_COL, NAME_SUBSYS_COL = range(2)
 
 # Load icons
 theme = Gtk.IconTheme.get_default()
-device_icon = theme.load_icon('gtk-dialog-question', 24, 0)
+device_icon = theme.load_icon('dialog-question', 24, 0)
 
 class SubsystemChoserDialog(GConfStore):
     defaults = {
diff --git a/udevdiscover/device/__init__.py b/udevdiscover/device/__init__.py
index f58844e..7448501 100644
--- a/udevdiscover/device/__init__.py
+++ b/udevdiscover/device/__init__.py
@@ -131,7 +131,7 @@ def get_device_object(device):
 class Device(object):
     '''A simple object representing a device.'''
 
-    DEFAULT_ICON = 'gtk-dialog-question'
+    DEFAULT_ICON = 'dialog-question'
     UNKNOWN_DEV = 'Unknown Device'
     DEVICE_TYPE_STR = {gudev.DEVICE_TYPE_BLOCK: 'block', 
         gudev.DEVICE_TYPE_CHAR: 'char',