diff --git a/woof-code/rootfs-skeleton/root/.xinitrc b/woof-code/rootfs-skeleton/root/.xinitrc
index c67f6f7fd31..a2e59222e3c 100755
--- a/woof-code/rootfs-skeleton/root/.xinitrc
+++ b/woof-code/rootfs-skeleton/root/.xinitrc
@@ -11,6 +11,7 @@
 . /etc/rc.d/PUPSTATE
 
 #v4.01 BK daemon to handle kernel uevents...
+echo '' > /var/local/pup_event_icon_change_flag
 /sbin/clean_desk_icons #v4.02 tidy up drive icons first.
 #/sbin/pup_event_frontend_d &
 #130525 ...start this further down.
diff --git a/woof-code/rootfs-skeleton/usr/sbin/eventmanager b/woof-code/rootfs-skeleton/usr/sbin/eventmanager
index 7740a16eae3..05e3635f741 100755
--- a/woof-code/rootfs-skeleton/usr/sbin/eventmanager
+++ b/woof-code/rootfs-skeleton/usr/sbin/eventmanager
@@ -109,6 +109,11 @@ else
                  <default>'${LABELPARTITIONS}'</default>
                  <variable>NEWLABELPARTITIONS</variable>
                </checkbox>
+               <checkbox>
+                  <label>'$(gettext 'Refresh / Realign existing icons')'</label>
+                  <default>false</default>
+                  <variable>NEWICONWIPE</variable>
+               </checkbox>
 
               </vbox>
               <text space-fill="true" space-expand="true"><label>""</label></text>
@@ -318,6 +323,7 @@ if [ "$ROX_DESKTOP" ] ; then
 	[ "$NEWICON_PLACE_START_GAP" != "$ICON_PLACE_START_GAP" ] && changed+=" ICON_PLACE_START_GAP" && CLEAN_ROX_DESK_ICONS=yes
 	[ "$NEWICON_PLACE_SPACING" != "$ICON_PLACE_SPACING" ] && changed+=" ICON_PLACE_SPACING" && CLEAN_ROX_DESK_ICONS=yes
 	[ "$NEWLABELPARTITIONS" != "$LABELPARTITIONS" ] && changed+=" LABELPARTITIONS" && CLEAN_ROX_DESK_ICONS=yes
+	[ "$NEWICONWIPE" = "true" ] && changed+=" NEWICONWIPE" && CLEAN_ROX_DESK_ICONS=yes
 	#--
 	if [ "$CLEAN_ROX_DESK_ICONS" = "yes" ] ; then
 		echo "$changed"