--- a/.fvwm/config	Tue Aug 28 18:24:57 2012 +0300
+++ b/.fvwm/config	Tue Aug 28 18:37:04 2012 +0300
@@ -54,9 +54,10 @@
 ImagePath +:/usr/share/icons/locolor/32x32/apps
 ImagePath +:/usr/share/icons/hicolor/32x32/apps
 ImagePath +:/usr/include/X11/bitmaps/
-ImagePath +:/usr/share/app-install/icons/
-ImagePath +:/usr/share/pixmaps
-ImagePath +:/usr/share/icons
+# This paths contain large icons for some apps, they make menus look ugly...
+# ImagePath +:/usr/share/app-install/icons/
+# ImagePath +:/usr/share/pixmaps
+# ImagePath +:/usr/share/icons
 
 ################################################################
 # Set aliases to common values.

--- a/.fvwm/xdg2fvwm.py	Tue Aug 28 18:24:57 2012 +0300
+++ b/.fvwm/xdg2fvwm.py	Tue Aug 28 18:37:04 2012 +0300
@@ -32,6 +32,9 @@
         elif isinstance(entry, xdg.Menu.MenuEntry):
             desktop = DesktopEntry(entry.DesktopEntry.getFileName())
             icon = desktop.getIcon()
+            icon_slash_idx = icon.rfind('/')
+            if icon_slash_idx == -1:
+                icon = icon + ".png"
             cmd = desktop.getExec().rstrip('%FUfu')
             if icon == '':
                 print u'AddToMenu "%s" "%s" Exec exec %s' % (name, desktop.getName(), cmd)