diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py
index 1c9cbe507..2da024ef2 100644
--- a/deluge/ui/gtkui/aboutdialog.py
+++ b/deluge/ui/gtkui/aboutdialog.py
@@ -73,7 +73,16 @@ should have received a copy of the GNU General Public License along with this pr
 if not, see <http://www.gnu.org/licenses>."))
         self.about.set_website("http://deluge-torrent.org")
         self.about.set_website_label("http://deluge-torrent.org")
-        self.about.set_icon(common.get_logo(32))
+
+        if deluge.common.windows_check():
+            self.about.set_icon(common.get_logo(32))
+        else:
+            try:
+                icon_theme = gtk.icon_theme_get_default()
+                self.about.set_icon(icon_theme.load_icon("deluge", 32, 0))
+            except:
+                self.about.set_icon(common.get_logo(32))
+                
         self.about.set_logo(gtk.gdk.pixbuf_new_from_file(
                                 deluge.common.get_pixmap("deluge-about.png")))
 
diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index 7aa90057d..d738d9333 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -324,7 +324,11 @@ class MenuBar(component.Component):
                 gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK))
             chooser.set_local_only(True)
             if not deluge.common.windows_check():
-                chooser.set_icon(common.get_logo(18))
+                try:
+                    icon_theme = gtk.icon_theme_get_default()
+                    chooser.set_icon(icon_theme.load_icon("deluge", 32, 0))
+                except:
+                    chooser.set_icon(common.get_logo(32))
                 chooser.set_property("skip-taskbar-hint", True)
             chooser.set_current_folder(config["choose_directory_dialog_path"])
             if chooser.run() == gtk.RESPONSE_OK: