diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project
index f0b4ce9ce..1446effe9 100644
--- a/comp/src/gb.form/.project
+++ b/comp/src/gb.form/.project
@@ -1,14 +1,14 @@
 # Gambas Project File 3.0
 # Compiled with Gambas 3.7.90
 Title=More controls for graphical components
-Startup=FTestDateChooser
+Startup=FTestValueBox
 Version=3.7.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui
 Component=gb.settings
 Authors="Benoît Minisini"
-Environment="GB_GUI=gb.gtk"
+Environment="GB_GUI=gb.gtk3"
 TabSize=2
 Translate=1
 Language=en
diff --git a/comp/src/gb.form/.src/Balloon/FBalloon.form b/comp/src/gb.form/.src/Balloon/FBalloon.form
index cd0d6a9e0..e4a90fc8f 100644
--- a/comp/src/gb.form/.src/Balloon/FBalloon.form
+++ b/comp/src/gb.form/.src/Balloon/FBalloon.form
@@ -7,6 +7,7 @@
   Mask = True
   Persistent = True
   Border = False
+  TakeFocus = False
   Stacking = Window.Above
   SkipTaskbar = True
   Transparent = True
diff --git a/comp/src/gb.form/.src/IconPanel/IconPanel.class b/comp/src/gb.form/.src/IconPanel/IconPanel.class
index e258e28c8..0856853bb 100644
--- a/comp/src/gb.form/.src/IconPanel/IconPanel.class
+++ b/comp/src/gb.form/.src/IconPanel/IconPanel.class
@@ -146,6 +146,7 @@ Private Sub Count_Write(iCount As Integer)
 
     For iInd = $aCont.Count To iCount - 1
       hToolbar = New _IconPanelContainer($hPanel) As "_IconPanelContainer"
+      hToolbar.Resize(1, 1)
       'hToolbar.Text = "Toolbar " & CInt(iInd)
       $aCont.Add(hToolbar)
       '$hView.Add(iInd, "Item " & CStr(iInd))
diff --git a/comp/src/gb.form/.src/Test/FIconPanel.class b/comp/src/gb.form/.src/Test/FIconPanel.class
index 81c2b5f50..6cc783315 100644
--- a/comp/src/gb.form/.src/Test/FIconPanel.class
+++ b/comp/src/gb.form/.src/Test/FIconPanel.class
@@ -1,10 +1,3 @@
 ' Gambas class file
 
 
-Public Sub Form_Open()
-
-  GridView1.Columns.Count = 2
-  GridView1.Rows.Count = 1
-  GridView1.Rows[0].H = 0
-
-End
diff --git a/comp/src/gb.form/.src/Test/FIconPanel.form b/comp/src/gb.form/.src/Test/FIconPanel.form
index efcbead41..adb195edd 100644
--- a/comp/src/gb.form/.src/Test/FIconPanel.form
+++ b/comp/src/gb.form/.src/Test/FIconPanel.form
@@ -2,20 +2,23 @@
 
 { Form Form
   MoveScaled(0,0,85,64)
-  { ButtonBox1 ButtonBox
-    MoveScaled(13,10,25,4)
-    #Translate = False
-    Text = "ButtonBox1"
-  }
-  { TextBox1 TextBox
-    MoveScaled(13,15,25,4)
-    #Translate = False
-    Text = "TextBox1"
-    Border = False
-  }
-  { GridView1 GridView
-    MoveScaled(29,27,39,30)
-    #Translate = False
-    Border = False
+  { IconPanel1 IconPanel
+    MoveScaled(5,4,67,56)
+    Count = 4
+    Index = 0
+    Text = ("Item 0")
+    Index = 1
+    Text = ("Item 1")
+    Index = 2
+    Text = ("Item 2")
+    { Button1 Button
+      MoveScaled(8,20,16,4)
+    }
+    Index = 3
+    Text = ("Item 3")
+    { ToggleButton1 ToggleButton
+      MoveScaled(12,25,16,4)
+    }
+    Index = 0
   }
 }
diff --git a/comp/src/gb.form/.src/Test/FTestDateChooser.form b/comp/src/gb.form/.src/Test/FTestDateChooser.form
index eac84633b..69696e471 100644
--- a/comp/src/gb.form/.src/Test/FTestDateChooser.form
+++ b/comp/src/gb.form/.src/Test/FTestDateChooser.form
@@ -23,6 +23,6 @@
     Move(413,133,210,42)
   }
   { ScrollBar2 ScrollBar
-    Move(469,182,77,140)
+    Move(462,182,77,140)
   }
 }
diff --git a/comp/src/gb.form/.src/Test/FTestValueBox.class b/comp/src/gb.form/.src/Test/FTestValueBox.class
index bc23a54e9..cbb119931 100644
--- a/comp/src/gb.form/.src/Test/FTestValueBox.class
+++ b/comp/src/gb.form/.src/Test/FTestValueBox.class
@@ -6,3 +6,9 @@ Public Sub Button1_Click()
   TextBox1.Border = Not TextBox1.Border
 
 End
+
+Public Sub ValueBox1_Change()
+
+  Debug
+
+End
diff --git a/comp/src/gb.form/.src/Test/FTestValueBox.form b/comp/src/gb.form/.src/Test/FTestValueBox.form
index a9015624b..e7a4dc8b4 100644
--- a/comp/src/gb.form/.src/Test/FTestValueBox.form
+++ b/comp/src/gb.form/.src/Test/FTestValueBox.form
@@ -4,7 +4,6 @@
   MoveScaled(0,0,64,64)
   { ValueBox1 ValueBox
     MoveScaled(9,11,24,4)
-    Text = ("ValueBox1")
   }
   { TextBox1 TextBox
     MoveScaled(11,26,24,4)
diff --git a/comp/src/gb.form/.src/Test/Form1.form b/comp/src/gb.form/.src/Test/Form1.form
index 7de635473..018b2169d 100644
--- a/comp/src/gb.form/.src/Test/Form1.form
+++ b/comp/src/gb.form/.src/Test/Form1.form
@@ -5,6 +5,32 @@
   Arrangement = Arrange.Vertical
   Spacing = True
   Margin = True
+  { Menu1 Menu
+    Text = ("Menu1")
+    { Menu2 Menu
+      Text = ("Menu2")
+      Picture = Picture["img/16/cross.png"]
+    }
+    { Menu3 Menu
+      Text = ("Menu3")
+      Picture = Picture["stock/16/gambas.png"]
+    }
+    { Menu7 Menu
+      Text = ("Menu7")
+      Shortcut = "Ctrl+B"
+    }
+    { Menu6 Menu
+    }
+    { Menu4 Menu
+      Text = ("Menu4")
+      Picture = Picture["stock/16/gnu.png"]
+    }
+    { Menu5 Menu
+      Text = ("Menu5")
+      Picture = Picture["stock/16/linux.png"]
+      Shortcut = "Ctrl+Shift+Alt+Backspace"
+    }
+  }
   { HBox1 HBox
     MoveScaled(8,2,95,5)
     #Translate = False
diff --git a/comp/src/gb.form/.src/ValueBox.class b/comp/src/gb.form/.src/ValueBox.class
index 73626be37..80feaf2d9 100644
--- a/comp/src/gb.form/.src/ValueBox.class
+++ b/comp/src/gb.form/.src/ValueBox.class
@@ -25,6 +25,7 @@ Private $hDateBox As DateBox
 Private $hMaskBox As MaskBox
 
 Private $sDecimalSep As String
+Private $sLastText As String
 
 Public Sub _new()
   
@@ -196,12 +197,14 @@ Public Sub NumberBox_Change()
   Object.Lock($hTextBox)
   If sText <> $hTextBox.Text Then
     $hTextBox.Text = sText
-    bRaiseChange = True
   Endif
   $hTextBox.Pos = Max(If(bNeg, 1, 0), iPos)
   Object.Unlock($hTextBox)
   
-  If bRaiseChange Then Raise Change
+  If $hTextBox.Text <> $sLastText Then
+    $sLastText = $hTextBox.Text
+    Raise Change
+  Endif
   
 End