diff --git a/app/src/gambas3/.src/Debug/FDebugInfo.form b/app/src/gambas3/.src/Debug/FDebugInfo.form
index 0357dcd5c..9f1c0dcd4 100644
--- a/app/src/gambas3/.src/Debug/FDebugInfo.form
+++ b/app/src/gambas3/.src/Debug/FDebugInfo.form
@@ -272,7 +272,7 @@
     }
   }
   { btnClose ToolButton
-    MoveScaled(1,1,4,4)
+    MoveScaled(0,0,4,4)
     Background = Color.Background
     Ignore = True
     Picture = Picture["icon:/small/close"]
diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.form b/app/src/gambas3/.src/Editor/Code/FEditor.form
index acdc3f60d..9b5410311 100644
--- a/app/src/gambas3/.src/Editor/Code/FEditor.form
+++ b/app/src/gambas3/.src/Editor/Code/FEditor.form
@@ -109,7 +109,7 @@
     { mnuWatch Menu
       Action = ".watch"
       Text = Shortcut(("Watch expression"), "W")
-      Picture = Picture["icon:/small/watch"]
+      Picture = Picture["img/16/watch.png"]
     }
     { mnuSepBookmark Menu
     }
diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
index 43bf67a37..96b6ad0f5 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class
+++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
@@ -1696,7 +1696,7 @@ Public Sub imvImage_Draw(hZoom As Image)
     
     With $hPasteSelect.GetExtents()
       If .Width > 0 And If .Height > 0 Then
-        hImage = New Image(Ceil(.Width) + 1, Ceil(.Height) + 1, Color.Transparent)
+        hImage = New Image(Ceil(.Width), Ceil(.Height), Color.Transparent)
         
         Paint.Begin(hImage)
         Paint.Brush = Paint.Image($hPaste)
diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.form b/app/src/gambas3/.src/Editor/Image/FImageEditor.form
index fd3551f9a..583aee059 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageEditor.form
+++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.form
@@ -446,9 +446,15 @@
       Picture = Picture["img/draw/magic.png"]
       Toggle = True
     }
+    { btnHide ToolButton
+      MoveScaled(102,0,4,4)
+      ToolTip = ("Hide selection")
+      Action = ".hide"
+      Picture = Picture["img/draw/hide.png"]
+    }
     { btnEditSelection ToolButton btnTool
       Name = "btnEditSelection"
-      MoveScaled(103,0,4,4)
+      MoveScaled(106,0,4,4)
       Tag = "change"
       ToolTip = ("Edit selection")
       Action = ".tool-change"
@@ -456,13 +462,7 @@
       Toggle = True
     }
     { Separator8 Separator
-      MoveScaled(107,0,1,4)
-    }
-    { btnHide ToolButton
-      MoveScaled(108,0,4,4)
-      ToolTip = ("Hide selection")
-      Action = ".hide"
-      Picture = Picture["img/draw/hide.png"]
+      MoveScaled(110,0,1,4)
     }
     { btnInvert ToolButton
       MoveScaled(111,0,4,4)
@@ -741,7 +741,7 @@
 { Toolbars
   { Toolbar image
     Text = "Image editor"
-    List = "save,reload,locked,undo,redo,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,resize,rotate,copy,cut,tool-paste,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-text,tool-magic,tool-change,hide,invert,duplicate,offset,crop,flip-h,flip-v,rotate-r,rotate-l"
-    Default = "save,reload,locked,undo,redo,|,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,|,copy,cut,tool-paste,|,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-text,tool-magic,tool-change,|,hide,invert,duplicate,offset,|,crop,flip-h,flip-v,rotate-r,rotate-l"
+    List = "save,reload,locked,undo,redo,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,resize,rotate,copy,cut,tool-paste,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-text,tool-magic,hide,tool-change,invert,duplicate,offset,crop,flip-h,flip-v,rotate-r,rotate-l"
+    Default = "save,reload,locked,undo,redo,|,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,|,copy,cut,tool-paste,|,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-text,tool-magic,hide,tool-change,|,invert,duplicate,offset,|,crop,flip-h,flip-v,rotate-r,rotate-l"
   }
 }
diff --git a/app/src/gambas3/img/16/average-dark.png b/app/src/gambas3/img/16/average-dark.png
index a7ea57c6b..6fa9bb2c3 100644
Binary files a/app/src/gambas3/img/16/average-dark.png and b/app/src/gambas3/img/16/average-dark.png differ
diff --git a/app/src/gambas3/img/16/average.png b/app/src/gambas3/img/16/average.png
index 310aaa0a3..a6052ac16 100644
Binary files a/app/src/gambas3/img/16/average.png and b/app/src/gambas3/img/16/average.png differ
diff --git a/app/src/gambas3/img/16/breakpoint-dark.png b/app/src/gambas3/img/16/breakpoint-dark.png
new file mode 100644
index 000000000..186a5007f
Binary files /dev/null and b/app/src/gambas3/img/16/breakpoint-dark.png differ
diff --git a/app/src/gambas3/img/16/breakpoint.png b/app/src/gambas3/img/16/breakpoint.png
index ca637702c..e1fd27b10 100644
Binary files a/app/src/gambas3/img/16/breakpoint.png and b/app/src/gambas3/img/16/breakpoint.png differ
diff --git a/app/src/gambas3/img/16/console-dark.png b/app/src/gambas3/img/16/console-dark.png
new file mode 100644
index 000000000..81798a50a
Binary files /dev/null and b/app/src/gambas3/img/16/console-dark.png differ
diff --git a/app/src/gambas3/img/16/console.png b/app/src/gambas3/img/16/console.png
index 91fe0a751..dd27aeed4 100644
Binary files a/app/src/gambas3/img/16/console.png and b/app/src/gambas3/img/16/console.png differ
diff --git a/app/src/gambas3/img/16/current-dark.png b/app/src/gambas3/img/16/current-dark.png
new file mode 100644
index 000000000..ae75dd7a2
Binary files /dev/null and b/app/src/gambas3/img/16/current-dark.png differ
diff --git a/app/src/gambas3/img/16/current.png b/app/src/gambas3/img/16/current.png
index 23e38ca0b..6316b11cc 100644
Binary files a/app/src/gambas3/img/16/current.png and b/app/src/gambas3/img/16/current.png differ
diff --git a/app/src/gambas3/img/16/delete-container-dark.png b/app/src/gambas3/img/16/delete-container-dark.png
new file mode 100644
index 000000000..9bd7f2911
Binary files /dev/null and b/app/src/gambas3/img/16/delete-container-dark.png differ
diff --git a/app/src/gambas3/img/16/delete-container.png b/app/src/gambas3/img/16/delete-container.png
index 35e48d210..10f70f040 100644
Binary files a/app/src/gambas3/img/16/delete-container.png and b/app/src/gambas3/img/16/delete-container.png differ
diff --git a/app/src/gambas3/img/16/embed-container-dark.png b/app/src/gambas3/img/16/embed-container-dark.png
new file mode 100644
index 000000000..d2338779b
Binary files /dev/null and b/app/src/gambas3/img/16/embed-container-dark.png differ
diff --git a/app/src/gambas3/img/16/embed-container.png b/app/src/gambas3/img/16/embed-container.png
index 96ffb81d3..4237ce15d 100644
Binary files a/app/src/gambas3/img/16/embed-container.png and b/app/src/gambas3/img/16/embed-container.png differ
diff --git a/app/src/gambas3/img/16/eol-dark.png b/app/src/gambas3/img/16/eol-dark.png
new file mode 100644
index 000000000..97449c6d3
Binary files /dev/null and b/app/src/gambas3/img/16/eol-dark.png differ
diff --git a/app/src/gambas3/img/16/eol.png b/app/src/gambas3/img/16/eol.png
index 81e12190a..6826b91d9 100644
Binary files a/app/src/gambas3/img/16/eol.png and b/app/src/gambas3/img/16/eol.png differ
diff --git a/app/src/gambas3/img/16/local-dark.png b/app/src/gambas3/img/16/local-dark.png
new file mode 100644
index 000000000..fa75fc00e
Binary files /dev/null and b/app/src/gambas3/img/16/local-dark.png differ
diff --git a/app/src/gambas3/img/16/local.png b/app/src/gambas3/img/16/local.png
index 7432f0391..e29c8a996 100644
Binary files a/app/src/gambas3/img/16/local.png and b/app/src/gambas3/img/16/local.png differ
diff --git a/app/src/gambas3/img/16/percent-dark.png b/app/src/gambas3/img/16/percent-dark.png
index 5588d79e6..9a77ddfb6 100644
Binary files a/app/src/gambas3/img/16/percent-dark.png and b/app/src/gambas3/img/16/percent-dark.png differ
diff --git a/app/src/gambas3/img/16/percent.png b/app/src/gambas3/img/16/percent.png
index ef16c7824..14cab1206 100644
Binary files a/app/src/gambas3/img/16/percent.png and b/app/src/gambas3/img/16/percent.png differ
diff --git a/app/src/gambas3/img/16/startup-class-dark.png b/app/src/gambas3/img/16/startup-class-dark.png
new file mode 100644
index 000000000..e9e796036
Binary files /dev/null and b/app/src/gambas3/img/16/startup-class-dark.png differ
diff --git a/app/src/gambas3/img/16/startup-class.png b/app/src/gambas3/img/16/startup-class.png
index a2ad38094..10163ccd0 100644
Binary files a/app/src/gambas3/img/16/startup-class.png and b/app/src/gambas3/img/16/startup-class.png differ
diff --git a/app/src/gambas3/img/16/task-dark.png b/app/src/gambas3/img/16/task-dark.png
new file mode 100644
index 000000000..e4761dab6
Binary files /dev/null and b/app/src/gambas3/img/16/task-dark.png differ
diff --git a/app/src/gambas3/img/16/task.png b/app/src/gambas3/img/16/task.png
index 8a959590a..d6282f839 100644
Binary files a/app/src/gambas3/img/16/task.png and b/app/src/gambas3/img/16/task.png differ
diff --git a/app/src/gambas3/img/16/warning-dark.png b/app/src/gambas3/img/16/warning-dark.png
new file mode 100644
index 000000000..72b99450b
Binary files /dev/null and b/app/src/gambas3/img/16/warning-dark.png differ
diff --git a/app/src/gambas3/img/16/warning.png b/app/src/gambas3/img/16/warning.png
index ee10bd1b4..90f958732 100644
Binary files a/app/src/gambas3/img/16/warning.png and b/app/src/gambas3/img/16/warning.png differ
diff --git a/app/src/gambas3/img/16/watch-dark.png b/app/src/gambas3/img/16/watch-dark.png
new file mode 100644
index 000000000..8bb20e9d2
Binary files /dev/null and b/app/src/gambas3/img/16/watch-dark.png differ
diff --git a/app/src/gambas3/img/16/watch.png b/app/src/gambas3/img/16/watch.png
index 0faed5b71..f7bb71a43 100644
Binary files a/app/src/gambas3/img/16/watch.png and b/app/src/gambas3/img/16/watch.png differ
diff --git a/app/src/gambas3/img/16/wrap.png b/app/src/gambas3/img/16/wrap.png
index 2d2a0c3d8..200d2acd5 100644
Binary files a/app/src/gambas3/img/16/wrap.png and b/app/src/gambas3/img/16/wrap.png differ
diff --git a/app/src/gambas3/img/48/all.png b/app/src/gambas3/img/48/all.png
index f26c87e70..87d55e493 100644
Binary files a/app/src/gambas3/img/48/all.png and b/app/src/gambas3/img/48/all.png differ
diff --git a/app/src/gambas3/img/draw/hide-dark.png b/app/src/gambas3/img/draw/hide-dark.png
index 202b37465..cfa00280a 100644
Binary files a/app/src/gambas3/img/draw/hide-dark.png and b/app/src/gambas3/img/draw/hide-dark.png differ
diff --git a/app/src/gambas3/img/draw/hide.png b/app/src/gambas3/img/draw/hide.png
index 96bf66913..6ffdca288 100644
Binary files a/app/src/gambas3/img/draw/hide.png and b/app/src/gambas3/img/draw/hide.png differ
diff --git a/app/src/gambas3/img/draw/offset-dark.png b/app/src/gambas3/img/draw/offset-dark.png
index 315d4964b..06873c7da 100644
Binary files a/app/src/gambas3/img/draw/offset-dark.png and b/app/src/gambas3/img/draw/offset-dark.png differ
diff --git a/app/src/gambas3/img/draw/offset.png b/app/src/gambas3/img/draw/offset.png
index de2d96b0d..076f636a1 100644
Binary files a/app/src/gambas3/img/draw/offset.png and b/app/src/gambas3/img/draw/offset.png differ
diff --git a/app/src/gambas3/img/logo/logo-ide.png b/app/src/gambas3/img/logo/logo-ide.png
index cb06c2d67..779755899 100644
Binary files a/app/src/gambas3/img/logo/logo-ide.png and b/app/src/gambas3/img/logo/logo-ide.png differ
diff --git a/app/src/gambas3/img/logo/project.png b/app/src/gambas3/img/logo/project.png
index 9b4d28af3..9240cde9c 100644
Binary files a/app/src/gambas3/img/logo/project.png and b/app/src/gambas3/img/logo/project.png differ
diff --git a/comp/src/gb.dbus.trayicon/.project b/comp/src/gb.dbus.trayicon/.project
index acd79b8fe..8b8702114 100644
--- a/comp/src/gb.dbus.trayicon/.project
+++ b/comp/src/gb.dbus.trayicon/.project
@@ -8,6 +8,7 @@ Component=gb.image
 Component=gb.gui
 Component=gb.form
 Component=gb.dbus
+Environment="GB_GUI=gb.qt4"
 TabSize=2
 Language=fr
 Type=Component
diff --git a/comp/src/gb.dbus.trayicon/.src/FTest.class b/comp/src/gb.dbus.trayicon/.src/FTest.class
index e0c18742b..b54977100 100644
--- a/comp/src/gb.dbus.trayicon/.src/FTest.class
+++ b/comp/src/gb.dbus.trayicon/.src/FTest.class
@@ -4,6 +4,7 @@
 Public Sub TrayIcon1_Click()
 
   Debug
+  Me.Visible = Not Me.Visible
 
 End
 
@@ -54,3 +55,27 @@ Public Sub TrayIcon1_MiddleClick()
   Debug
 
 End
+
+Public Sub Menu6_Click()
+
+  Debug
+
+End
+
+Public Sub Menu7_Click()
+
+  Debug
+
+End
+
+Public Sub Menu8_Click()
+
+  Debug
+
+End
+
+Public Sub Button3_Click()
+
+  Menu5.Value = Not Menu5.Value
+
+End
diff --git a/comp/src/gb.dbus.trayicon/.src/FTest.form b/comp/src/gb.dbus.trayicon/.src/FTest.form
index 39c3f93e4..0e3da77e6 100644
--- a/comp/src/gb.dbus.trayicon/.src/FTest.form
+++ b/comp/src/gb.dbus.trayicon/.src/FTest.form
@@ -2,6 +2,7 @@
 
 { Form Form
   MoveScaled(0,0,64,64)
+  Persistent = True
   { Menu1 Menu
     Text = ("Menu1")
     { Menu2 Menu
@@ -58,4 +59,8 @@
     MoveScaled(23,4,16,4)
     Text = ("Picture")
   }
+  { Button3 Button
+    MoveScaled(32,12,16,4)
+    Text = ("Menu5")
+  }
 }
diff --git a/comp/src/gb.dbus.trayicon/.src/TrayIcon.class b/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
index a90649e68..9f684ace8 100644
--- a/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
+++ b/comp/src/gb.dbus.trayicon/.src/TrayIcon.class
@@ -275,6 +275,7 @@ Public Sub _Clicked(hMenu As Menu)
 
   If hMenu.Toggle Then
     hMenu.Value = Not hMenu.Value
+    Object.Raise(hMenu, "Click")
     UpdateMenu
   Else
     hMenu.Value = True
diff --git a/comp/src/gb.dbus.trayicon/default.png b/comp/src/gb.dbus.trayicon/default.png
index dedf476db..eae7cf1a5 100644
Binary files a/comp/src/gb.dbus.trayicon/default.png and b/comp/src/gb.dbus.trayicon/default.png differ
diff --git a/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class b/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
index 8764bfa25..c8fa76349 100644
--- a/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
+++ b/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
@@ -292,6 +292,11 @@ Public Sub DrawingArea_MouseDown()
       'Me.Parent.SetFocus()
       hTabPanel.Index = GetIndex()
     Endif
+  Else If Mouse.Middle Then
+    If IsClosable() Then
+      hTabPanel = GetParent()
+      hTabPanel._Close(GetIndex())
+    Endif
   Endif
   
 End