diff --git a/app/src/gambas3/.src/Component/CClassInfo.class b/app/src/gambas3/.src/Component/CClassInfo.class
index 25ca23503..4c03e64c8 100644
--- a/app/src/gambas3/.src/Component/CClassInfo.class
+++ b/app/src/gambas3/.src/Component/CClassInfo.class
@@ -248,7 +248,7 @@ Public Sub InitControl()
         If MultiContainer Then
           bDoNotApply = Not CPropertyInfo.MULTI_CONTAINER_PROP.Exist(sProp)
         Else
-          bDoNotApply = True
+          bDoNotApply = Not CPropertyInfo.ALLOWED_CONTROL_PROP.Exist(sProp)
         Endif
       Else
         bDoNotApply = VirtualControl
diff --git a/app/src/gambas3/.src/Component/CPropertyInfo.class b/app/src/gambas3/.src/Component/CPropertyInfo.class
index 0abc0c76f..db4d1c7c5 100644
--- a/app/src/gambas3/.src/Component/CPropertyInfo.class
+++ b/app/src/gambas3/.src/Component/CPropertyInfo.class
@@ -6,6 +6,7 @@ Public Const PUBLIC_NAME As String = "Public"
 Public Const TRANSLATE_NAME As String = "Translate"
 
 Static Public MULTI_CONTAINER_PROP As String[] = ["Index", "Count", "Text", "Picture"]
+Static Public ALLOWED_CONTROL_PROP As String[] = ["Text"]
 
 Static Public CreatingSpecialProperty As Boolean
 
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index a30693b77..78f4cd65f 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -1022,7 +1022,7 @@ Public Sub MakeModuleIcon(sModule As String, iSize As Integer, Optional bStartup
   hImage = $cImageCache[sKey]
   If Not hImage Then
     hImage = Picture["icon:/" &/ CStr(iSize) &/ "file"].Image '$cImageCache["base"]
-    hImage = hImage.Stretch(iSize, iSize)
+    'hImage = hImage.Stretch(iSize, iSize)
     hImageModule = Image.Load("img/module" &/ sModule & ".png") '.Stretch(iSize / 2, iSize / 2)
     hImage.PaintImage(hImageModule, iSize / 4, iSize / 4, iSize / 2, iSize / 2)