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

--- a/.fvwm/xdg2fvwm.py	Mon Aug 27 23:30:30 2012 +0300
+++ b/.fvwm/xdg2fvwm.py	Tue Aug 28 17:23:55 2012 +0300
@@ -33,11 +33,11 @@
         elif isinstance(entry, xdg.Menu.MenuEntry):
             desktop = DesktopEntry(entry.DesktopEntry.getFileName())
             icon = desktop.getIcon()
-            ind = icon.rfind('.')
-            if ind != -1:
-                icon = icon[0:ind]
             cmd = desktop.getExec().rstrip('%FUfu')
-            print u'AddToMenu "%s" "%s%%%s.png%%" Exec exec %s' % (name, desktop.getName(), os.path.basename(icon), cmd)
+            if icon == '':
+                print u'AddToMenu "%s" "%s" Exec exec %s' % (name, desktop.getName(), cmd)
+            else:
+                print u'AddToMenu "%s" "%s%%%s%%" Exec exec %s' % (name, desktop.getName(), icon, cmd)
         else:
             pass