diff --git a/app/src/gambas-wiki/.src/CComponent.class b/app/src/gambas-wiki/.src/CComponent.class
index b3383a6fc..cf12fda86 100644
--- a/app/src/gambas-wiki/.src/CComponent.class
+++ b/app/src/gambas-wiki/.src/CComponent.class
@@ -547,6 +547,7 @@ Public Sub Load()
   Dim sHelp As String
   Dim sElt As String
   Dim cCycle As Collection
+  Dim I As Integer
   
   If $bLoaded Then Return
 
@@ -600,6 +601,11 @@ Public Sub Load()
     Print "<pre>Cannot load list file: " & File.SetExt(sPath, "list") & "\n</pre>"
     Return
   Endif
+  
+  For I = 0 To aList.Max
+    sClass = aList[I]
+    If Right(sClass) = "!" Then aList[I] = Left(sClass, -1)
+  Next
     
   For Each sClass In aList
     If sClass Then cClass[sClass] = True
diff --git a/app/src/gambas3/.src/Editor/Form/CControl.class b/app/src/gambas3/.src/Editor/Form/CControl.class
index 44460de10..503042ac3 100644
--- a/app/src/gambas3/.src/Editor/Form/CControl.class
+++ b/app/src/gambas3/.src/Editor/Form/CControl.class
@@ -177,7 +177,7 @@ Private Function CreateControl(sName As String, sClass As String, hParent As Obj
 
     Case "picturebox"
       hCtrl = New PictureBox(hParent)
-      hCtrl.Picture = Picture["img/logo/logo-32.png"]
+      hCtrl.Picture = Picture["img/control/picturebox.png"]
 
     Case "treeview"
       hCtrl = New TreeView(hParent)
@@ -914,7 +914,11 @@ Public Sub UpdateName()
 
       If Unknown Then 
         If Not IsMultiContainer() Then
-          If Not HasText() Then Try Control.Text = Name
+          If Not HasText() Then 
+            Try Control.Text = Name
+          Else
+            Try Control.Text = $cValue["Text"]
+          Endif
         Endif
         Control.Refresh
       Endif
diff --git a/app/src/gambas3/img/control/picturebox.png b/app/src/gambas3/img/control/picturebox.png
index 0830c1ff5..78eacc0cf 100644
Binary files a/app/src/gambas3/img/control/picturebox.png and b/app/src/gambas3/img/control/picturebox.png differ
diff --git a/comp/src/gb.form/.hidden/control/imageview.png b/comp/src/gb.form/.hidden/control/imageview.png
index fdfdec27e..5d69bcd2a 100644
Binary files a/comp/src/gb.form/.hidden/control/imageview.png and b/comp/src/gb.form/.hidden/control/imageview.png differ