diff --git a/VersionASM b/VersionASM
index e0127ebb9d10c3d329b052c1fde1515d05659e22..20c9ba118bb3e3f09e17a47e50b60e093262eba1 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.22"
-Module_Version          SETA    522
+Module_MajorVersion     SETS    "5.23"
+Module_Version          SETA    523
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "10 Apr 2013"
-Module_ApplicationDate  SETS    "10-Apr-13"
+Module_Date             SETS    "13 Apr 2013"
+Module_ApplicationDate  SETS    "13-Apr-13"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "5.22"
-Module_HelpVersion      SETS    "5.22 (10 Apr 2013)"
+Module_FullVersion      SETS    "5.23"
+Module_HelpVersion      SETS    "5.23 (13 Apr 2013)"
                         END
diff --git a/VersionNum b/VersionNum
index bd7bac2c2113fafdd437ec8d768319c0ed05eb13..5013bd7cc8825a7e14d233b76b822cc224e6b330 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (5.22)
+/* (5.23)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.22
+#define Module_MajorVersion_CMHG        5.23
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                10 Apr 2013
+#define Module_Date_CMHG                13 Apr 2013
 
-#define Module_MajorVersion             "5.22"
-#define Module_Version                  522
+#define Module_MajorVersion             "5.23"
+#define Module_Version                  523
 #define Module_MinorVersion             ""
-#define Module_Date                     "10 Apr 2013"
+#define Module_Date                     "13 Apr 2013"
 
-#define Module_ApplicationDate          "10-Apr-13"
+#define Module_ApplicationDate          "13-Apr-13"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "5.22"
-#define Module_HelpVersion              "5.22 (10 Apr 2013)"
-#define Module_LibraryVersionInfo       "5:22"
+#define Module_FullVersion              "5.23"
+#define Module_HelpVersion              "5.23 (13 Apr 2013)"
+#define Module_LibraryVersionInfo       "5:23"
diff --git a/s/Iconbar b/s/Iconbar
index 0c1d7aed3ff094573051aa938787c7008ac6420c..a1a3f8427539f2863b759171953d16052b1691cb 100644
--- a/s/Iconbar
+++ b/s/Iconbar
@@ -155,7 +155,7 @@ addtoR1
 ; if indirected can be turned off with validation X
         Push    R3
         LDR     R3,[R1,#4]
-        MOV     R2,#"X"
+        MOV     R2,#WimpValidation_NoAuto
         BL      findcommand
         Pull    R3
         BEQ     %FT9                    ; found X
@@ -644,7 +644,7 @@ resizeicons_loop
         BLHI    mapslotinout
 ; so that indirected data is ok. Now R1-> text
         Push    "R2,R3"
-        MOV     R2,#"X"
+        MOV     R2,#WimpValidation_NoAuto
         LDR     R3,[R5,#i_data+4]                 ; validation string
         BL      findcommand
         Pull    "R2,R3"
diff --git a/s/Tiling b/s/Tiling
index b4f2d6ab4c61ade093ccd7b2d9b059001b26fa81..7e44f710c714303a1d7834363ce940e717cfc38e 100644
--- a/s/Tiling
+++ b/s/Tiling
@@ -56,8 +56,8 @@ plotspritebackground
 
         LDR     R1,[handle,#w_areaCBptr]
         CMP     R1,#2
-        BLO     %FT3
-        MOV     R0,#24
+        BLO     %FT3                            ; 0 ==> system, 1 ==> wimp, else user
+        MOV     R0,#SpriteReason_SelectSprite
         ORR     R0,R0,#256
         ADR     R2,plotsprite_tile1
         SWI     XOS_SpriteOp
@@ -101,9 +101,9 @@ plotspritebackground
         B       %FT6
 3
         LDR     R2,tiling_sprite
-        CMP     R2,#0
+        CMP     R2,#0                   ; disabled/not there
         BEQ     %FT4
-        CMP     R2,#-1
+        CMP     R2,#-1                  ; needs recache
         LDRNE   R1,baseofsprites
         BNE     %FT5
         BLEQ    findwimptilesprite
diff --git a/s/Wimp04 b/s/Wimp04
index 892432278413a48ed9617d3e9f65794335fdedc9..0f2f6284b087095d869ff89f1e71b8c2c39ad367 100644
--- a/s/Wimp04
+++ b/s/Wimp04
@@ -5178,7 +5178,7 @@ int_which_icon
 whiclp
         CMP     R4,R6
         BHS     endwhlp
-        CMP     R0,#nullptr             ; if iconbar,
+        CMP     R0,#nullptr2            ; if iconbar,
         BNE     %FT01                   ; check that the task owns this icon
         Push    "R1,R2,R7"
         BL      findicon                ; R2 -> iconblock