Index: avahi-0.6.25/avahi-ui/bssh.desktop.in.in
===================================================================
--- avahi-0.6.25.orig/avahi-ui/bssh.desktop.in.in
+++ avahi-0.6.25/avahi-ui/bssh.desktop.in.in
@@ -5,7 +5,7 @@ _Comment=Browse for Zeroconf-enabled SSH
 Exec=@bindir@/bssh
 Terminal=false
 Type=Application
-Icon=network-wired
-Categories=GNOME;Network;
+Icon=gnome-nettool2
+Categories=GNOME;System;Monitor;
 StartupNotify=false
 GenericName=
Index: avahi-0.6.25/avahi-ui/bvnc.desktop.in.in
===================================================================
--- avahi-0.6.25.orig/avahi-ui/bvnc.desktop.in.in
+++ avahi-0.6.25/avahi-ui/bvnc.desktop.in.in
@@ -5,7 +5,7 @@ _Comment=Browse for Zeroconf-enabled VNC
 Exec=@bindir@/bvnc
 Terminal=false
 Type=Application
-Icon=network-wired
-Categories=GNOME;Network;
+Icon=gnome-nettool2
+Categories=GNOME;System;Monitor;
 StartupNotify=false
 GenericName=
Index: avahi-0.6.25/avahi-python/avahi-discover/avahi-discover.desktop.in.in
===================================================================
--- avahi-0.6.25.orig/avahi-python/avahi-discover/avahi-discover.desktop.in.in
+++ avahi-0.6.25/avahi-python/avahi-discover/avahi-discover.desktop.in.in
@@ -5,7 +5,7 @@ _Comment=Browse for Zeroconf services av
 Exec=@bindir@/avahi-discover
 Terminal=false
 Type=Application
-Icon=network-wired
-Categories=GNOME;System;
+Icon=gnome-nettool2
+Categories=GNOME;System;Utility;
 StartupNotify=false
 GenericName=