diff --git a/Resources/UK/CmdHelp b/Resources/UK/CmdHelp
index 5d6490c1683ef47284b4f6895d0d15ece1fc3e30..f82c9273ec52cbd2bc6ac4ec02f6f0d69394eeb4 100644
Binary files a/Resources/UK/CmdHelp and b/Resources/UK/CmdHelp differ
diff --git a/s/Iconbar b/s/Iconbar
index e4bc6b40c055fafaa37ac6ffd00451efe8cc83c9..e29cc2e4147d4074054f2db88c030c0fa8f2492b 100644
--- a/s/Iconbar
+++ b/s/Iconbar
@@ -124,7 +124,7 @@ addtoR1
         SUBVC   R14,R14,R2
         STRVC   R14,iconbarheight       ; used later
  [ HideIconBar
-        MOV     R2, #-3
+        MOVVC   R2, #-3
  |
         LDRVC   R2,iconbarhandle        ; open at same height
  ]
@@ -321,11 +321,24 @@ openiconbar Entry   "R1-R9,R11"
         LDMIA   R14,{cx0,cy0,cx1,cy1}           ; always open iconbar at bottom
         LDR     R14,iconbarheight
         ADD     cy1,cy0,R14
+      [ ThreeDPatch
+        LDR     R14,ThreeDFlags
+        TST     R14,#ThreeDFlags_NoIconBarBorder
+        MOVNE   R14,#255                        ; no border special value
+        MOVEQ   R14,#sc_black
+        STRB    R14,[handle,#w_tfcol]           ; transfer border visual flag to window definition
+
+        MOVNE   R14,#0                          ; no left/right border allowance
+        MOVNE   R11,#0
+        LDREQ   R14,dx
+        LDREQ   R11,dy
+      |
         LDR     R14,dx
+        LDR     R11,dy
+      ]
         ADD     cx0,cx0,R14
         SUB     cx1,cx1,R14
-        LDR     R14,dy
-        ADD     cy0,cy0,R14                     ; cx0,cy0,cx1,cy1 = screen posn
+        ADD     cy0,cy0,R11                     ; cx0,cy0,cx1,cy1 = screen posn
         LDR     x0,[handle,#w_wex0]             ; try to keep extent the same
         SUB     x1,cx1,cx0
         ADD     x1,x0,x1                        ; x0,x1 = extent
diff --git a/s/Wimp01 b/s/Wimp01
index bdc7d2bb0107a7131399d76c9d8442cc54921185..1fc4412e5a97175e51e038d29f223ffb15bd9406 100644
--- a/s/Wimp01
+++ b/s/Wimp01
@@ -383,6 +383,7 @@ ThreeDFlags_NoIconBgInTransWindows	*	1<<5
 ThreeDFlags_NoFontBlending		*	1<<6
 ThreeDFlags_FullIconClipping		*	1<<7    ; we're just ignoring this flag
 ThreeDFlags_WindowOutlineOver           *       1<<8
+ThreeDFlags_NoIconBarBorder             *       1<<9
 
 arrowIconWidth_No3D     *       24
 arrowIconWidth_3D       *       32
@@ -2344,6 +2345,8 @@ WimpVisualFlags_Help		DCB "*WimpVisualFlags changes some aspects of the visual a
 				DCB "   Use font blending in icons.",cr
 				DCB "-WindowOutlineOver",cr
 				DCB "   Plot the window outline over the tool icons.",cr
+				DCB "-NoIconBarBorder",cr
+				DCB "   Remove the outline from the iconbar.",cr
 				DCB "-All",cr
 				DCB "   Turn all flags on.",cr
 				DCB "-WindowBorderFaceColour <&RRGGBB>",cr
@@ -7651,7 +7654,7 @@ WimpKillSprite_Code
 	DCB	"ButtonBorderFaceColour=BBFC/E,ButtonBorderShallowColour=BBSC/E,ButtonBorderOppColour=BBOC/E,"
 	DCB	"ButtonColour=BC/E,ButtonWellColour=BWC/E,ButtonHighlightColour=BHC/E,"
 	DCB	"NoFontBlending=NFB/S,FontBlending=FB/S,"
-	DCB     "WindowOutlineColour=WOC/E,WindowOutlineOver=WOO/S",0
+	DCB     "WindowOutlineColour=WOC/E,WindowOutlineOver=WOO/S,NoIconBarBorder=NIBB/S",0
 	ALIGN
 
 WimpVisualFlags_Code
@@ -7706,6 +7709,9 @@ WimpVisualFlags_Code
 	LDR	r1,[sp,#80]
 	TEQ	r1,#0
 	ORRNE	r2,r2,#ThreeDFlags_WindowOutlineOver
+	LDR	r1,[sp,#84]
+	TEQ	r1,#0
+	ORRNE	r2,r2,#ThreeDFlags_NoIconBarBorder
 
 	LDR	r1,[sp,#28]		; window border face colour
 	BL	%FT02