diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class
index df57beaeb..f46a513d3 100644
--- a/app/src/gambas3/.src/Project/FCreateFile.class
+++ b/app/src/gambas3/.src/Project/FCreateFile.class
@@ -123,7 +123,6 @@ Public Sub Form_Open()
   'Dim aFilter As String[]
   Dim hPanel As Container
   Dim hPictureBox As PictureBox
-  Dim aFilterType As String[]
   Dim sType As String
 
   $bDoNotSetName = False
@@ -134,20 +133,17 @@ Public Sub Form_Open()
 
   If Project.IsSourceDir($sDir) Then
 
-    aFilterType = ["module", "class"]
-    
     lvwType.Add("module", ("Module"), Project.MakeModuleIcon("module", 32).Picture)
     lvwType.Add("class", ("Class"), Project.MakeModuleIcon("class", 32).Picture)
     
     For Each hModule In CModule.All
-      aFilterType.Add(hModule.Key)
-      lvwType.Add(hModule.Key, hModule.Name, Project.MakeModuleIcon(hModule.Key, 32).Picture)
+      If hModule.Used Then
+        lvwType.Add(hModule.Key, hModule.Name, Project.MakeModuleIcon(hModule.Key, 32).Picture)
+      Endif
     Next
     
   Else
   
-    aFilterType = ["image", "html", "css", "js", "text"]
-    
     lvwType.Add("image", ("Image"), Picture["icon:/32/image"])
     lvwType.Add("text", ("Text file"), Picture["icon:/32/text"])
     lvwType.Add("html", ("HTML file"), Picture["icon:/32/html"])
diff --git a/app/src/gambas3/.src/Search/FSearch.class b/app/src/gambas3/.src/Search/FSearch.class
index 9aecbc119..140493748 100644
--- a/app/src/gambas3/.src/Search/FSearch.class
+++ b/app/src/gambas3/.src/Search/FSearch.class
@@ -18,7 +18,7 @@ Private $hCurrent As Object
 Private $sGrep As String
 Private $bReplace As Boolean
 Private $aBrowse As New CFindResult[]
-Private $aExt As String[] = ["JPG", "JPEG", "BMP", "GIF", "PNG", "ICO", "XPM", "GAMBAS"]
+Private $aExt As String[] = ["JPG", "JPEG", "BMP", "GIF", "PNG", "ICO", "XPM", "GAMBAS", "WAV", "OGG"]
 Private $bCancel As Boolean
 
 Private $cGrepCache As New Collection
@@ -713,6 +713,8 @@ Private Sub Browse(Optional bReplace As Boolean, Optional bAgain As Boolean)
     If sName Begins "callgrind.out." Then Continue
     If sName Begins "cachegrind.out." Then Continue
     
+    If Not Project.IsTextFile(sPath) Then Continue
+    
     If sFile Begins ".src/" Then
       FDebugInfo.SetSearchListInfo(sName)
     Else
diff --git a/app/src/gambas3/img/module/class.png b/app/src/gambas3/img/module/class.png
index b4216666d..ef72f4d67 100644
Binary files a/app/src/gambas3/img/module/class.png and b/app/src/gambas3/img/module/class.png differ
diff --git a/app/src/gambas3/img/module/form.png b/app/src/gambas3/img/module/form.png
index 8be812f47..3710736b3 100644
Binary files a/app/src/gambas3/img/module/form.png and b/app/src/gambas3/img/module/form.png differ
diff --git a/app/src/gambas3/img/module/module.png b/app/src/gambas3/img/module/module.png
index 95a4e5eab..e8be4b904 100644
Binary files a/app/src/gambas3/img/module/module.png and b/app/src/gambas3/img/module/module.png differ
diff --git a/app/src/gambas3/img/module/report.png b/app/src/gambas3/img/module/report.png
index feea07629..26ddde292 100644
Binary files a/app/src/gambas3/img/module/report.png and b/app/src/gambas3/img/module/report.png differ
diff --git a/app/src/gambas3/img/module/webpage.png b/app/src/gambas3/img/module/webpage.png
index 3fb6aaf9e..a48aa5f90 100644
Binary files a/app/src/gambas3/img/module/webpage.png and b/app/src/gambas3/img/module/webpage.png differ