diff --git a/app/src/gambas-wiki/.icon.png b/app/src/gambas-wiki/.icon.png
index 48b3a07f1..09c21b840 100644
Binary files a/app/src/gambas-wiki/.icon.png and b/app/src/gambas-wiki/.icon.png differ
diff --git a/app/src/gambas-wiki/.project b/app/src/gambas-wiki/.project
index fa479d973..120830392 100644
--- a/app/src/gambas-wiki/.project
+++ b/app/src/gambas-wiki/.project
@@ -3,7 +3,7 @@
 Title=Gambas Wiki Web Application
 Startup=Main
 UseHttpServer=1
-Icon=.public/logo.png
+Icon=icon.png
 Version=3.6.90
 VersionFile=1
 Component=gb.db
diff --git a/app/src/gambas-wiki/.src/CComponent.class b/app/src/gambas-wiki/.src/CComponent.class
index c5167a37e..b3383a6fc 100644
--- a/app/src/gambas-wiki/.src/CComponent.class
+++ b/app/src/gambas-wiki/.src/CComponent.class
@@ -612,6 +612,7 @@ Public Sub Load()
     
     aLine = Split(File.Load(sPath), "\n")
     If aLine.Count And If aLine[aLine.Max] = "" Then aLine.Remove(aLine.Max)
+    
     iLine = 0
     
     While iLine < aLine.Count
@@ -725,6 +726,34 @@ Public Sub Load()
     
   Until Not bAgain
   
+  sPath = File.SetExt(sPath, "help")
+  If Exist(sPath) Then
+    
+    sClass = ""
+    sSymbol = ""
+    
+    For Each sLig In Split(File.Load(sPath), "\n")
+      
+      If Left(sLig) = "#" Then
+        sClass = Mid$(sLig, 2)
+        Continue
+      Endif
+      
+      If Left(sLig) <> "'" Then
+        sSymbol = sLig
+        hSym = Null
+        Try hSym = Classes[Key &/ sClass].Symbols[sSymbol]
+        Continue
+      Endif
+      
+      If hSym Then 
+        hSym.Help &= Mid$(sLig, 2) & "\n"
+      Endif
+      
+    Next
+    
+  Endif
+  
   'PRINT "Initializing controls..."
   
   ' If Type = "Form" Then
diff --git a/app/src/gambas-wiki/.src/Main.module b/app/src/gambas-wiki/.src/Main.module
index 42efb9e5b..e3a89465d 100644
--- a/app/src/gambas-wiki/.src/Main.module
+++ b/app/src/gambas-wiki/.src/Main.module
@@ -1111,6 +1111,8 @@ Public Sub GetDefaultPage() As String
   Try hSymbol = CComponent.Get(Main.Component)[Main.Class].Symbols[Main.Symbol]
   If Not hSymbol Then Return
   
+  If hSymbol.Help Then Return hSymbol.Help
+  
   sResult = "\n"
   sSign = hSymbol.Signature
   Do
@@ -1125,7 +1127,7 @@ Public Sub GetDefaultPage() As String
     
   Loop
   
-  If hSymbol.Help Then sResult = Trim(sResult) & "\n" & hSymbol.Help
+  'If hSymbol.Help Then sResult = Trim(sResult) & "\n" & hSymbol.Help
   
   Return sResult
   
diff --git a/app/src/gambas-wiki/gambas-wiki.png b/app/src/gambas-wiki/gambas-wiki.png
deleted file mode 100644
index bcd875bb5..000000000
Binary files a/app/src/gambas-wiki/gambas-wiki.png and /dev/null differ
diff --git a/app/src/gambas-wiki/icon.png b/app/src/gambas-wiki/icon.png
new file mode 100644
index 000000000..879767160
Binary files /dev/null and b/app/src/gambas-wiki/icon.png differ
diff --git a/app/src/gbs3/.settings b/app/src/gbs3/.settings
index 44e27a6a2..e18c10c2b 100644
--- a/app/src/gbs3/.settings
+++ b/app/src/gbs3/.settings
@@ -82,7 +82,7 @@ SearchComment=False
 SearchString=True
 
 [OpenFile]
-Active=4
+Active=7
 File[1]=".src/MMain.module:336.45"
 File[2]=".src/MServerPage.module:3.0"
 File[3]=".src/CComponent.class:38.0"
diff --git a/app/src/gbs3/icon.png b/app/src/gbs3/icon.png
index a35cf8739..9877af715 100644
Binary files a/app/src/gbs3/icon.png and b/app/src/gbs3/icon.png differ
diff --git a/main/lib/data/Makefile.am b/main/lib/data/Makefile.am
index 45f987cf2..01600cf5c 100644
--- a/main/lib/data/Makefile.am
+++ b/main/lib/data/Makefile.am
@@ -1,5 +1,4 @@
 COMPONENT = gb.data
-EXTRACT_HELP = 1
 include $(top_srcdir)/component.am
 
 gblib_LTLIBRARIES = gb.data.la