diff --git a/app/src/gambas3/.src/Options/FOption.class b/app/src/gambas3/.src/Options/FOption.class
index 665ec093d..e8a550c85 100644
--- a/app/src/gambas3/.src/Options/FOption.class
+++ b/app/src/gambas3/.src/Options/FOption.class
@@ -76,7 +76,7 @@ Public Sub _new()
   Dim iInd As Integer
   Dim hHBox As HBox
   Dim hColor As DrawingArea
-  Dim hButton As Button
+  Dim hButton As ToolButton
   Dim aColors As Integer[]
 
   cmbTheme.List = $aThemeName.Copy().Sort(gb.Language)
@@ -179,13 +179,15 @@ Public Sub _new()
     hHBox = New HBox(svwTheme)
     hHBox.Tag = MTheme.ColorKeys[iInd]
     hHBox.Height = 4 * Desktop.Scale
-    hHBox.Spacing = 4
+    'hHBox.Spacing = 4
     hColor = New DrawingArea(hHBox) As "dwgStyle"
     hColor.Expand = True
     hColor.Border = Border.Plain
-    hButton = New Button(hHBox) As "btnStyle"
-    hButton.Text = ("Define...")
-    hButton.Width = Desktop.Scale * 16
+    hColor.Arrangement = Arrange.Horizontal
+    hColor.Invert = True
+    hButton = New ToolButton(hColor) As "btnStyle"
+    hButton.Picture = Picture["icon:/small/color"]
+    hButton.Resize(Desktop.Scale * 4, Desktop.Scale * 4)
     
   Next
   
@@ -720,8 +722,8 @@ End
 
 Public Sub btnStyle_Click()
 
-  $hDraw = Last.Parent.Children[0]
-  $sStyle = Last.Parent.Tag  
+  $hDraw = Last.Parent '.Children[0]
+  $sStyle = $hDraw.Parent.Tag  
   mnuPopup.Popup
   
 End
diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form
index d9e72d101..11888b194 100644
--- a/app/src/gambas3/.src/Project/FProjectProperty.form
+++ b/app/src/gambas3/.src/Project/FProjectProperty.form
@@ -426,6 +426,7 @@
       }
       { HBox18 HBox
         MoveScaled(0,16,84,4)
+        Background = Color.TextBackground
         { btnInsertLib ToolButton
           MoveScaled(0,0,17,4)
           AutoResize = True
diff --git a/app/src/gambas3/.src/Search/FSearch.class b/app/src/gambas3/.src/Search/FSearch.class
index b9bac9a60..19336482e 100644
--- a/app/src/gambas3/.src/Search/FSearch.class
+++ b/app/src/gambas3/.src/Search/FSearch.class
@@ -759,9 +759,9 @@ Private Sub Browse(Optional bReplace As Boolean, Optional bAgain As Boolean)
   
   For Each sFile In RDir(sDir).Sort()
   
-    If Left(sFile) = "." Then
+    If Left(sFile) = "." And If sFile Not Begins ".public/" Then
       If OnlyData Then Continue
-      If Not (sFile Begins ".src/") Then Continue
+      If sFile Not Begins ".src/" Then Continue
     Endif
     
     If Right(sFile) = "~" Then Continue
diff --git a/app/src/gambas3/img/32/added.png b/app/src/gambas3/img/32/added.png
index 3fbe59f3e..e30758b6c 100644
Binary files a/app/src/gambas3/img/32/added.png and b/app/src/gambas3/img/32/added.png differ
diff --git a/app/src/gambas3/img/32/conflict.png b/app/src/gambas3/img/32/conflict.png
index 8d4503d97..a1639168c 100644
Binary files a/app/src/gambas3/img/32/conflict.png and b/app/src/gambas3/img/32/conflict.png differ
diff --git a/app/src/gambas3/img/32/do-not-translate.png b/app/src/gambas3/img/32/do-not-translate.png
index 57b5471b7..6b80032e6 100644
Binary files a/app/src/gambas3/img/32/do-not-translate.png and b/app/src/gambas3/img/32/do-not-translate.png differ
diff --git a/app/src/gambas3/img/32/exported.png b/app/src/gambas3/img/32/exported.png
index 0378a0d62..bb27581f9 100644
Binary files a/app/src/gambas3/img/32/exported.png and b/app/src/gambas3/img/32/exported.png differ
diff --git a/app/src/gambas3/img/32/modified.png b/app/src/gambas3/img/32/modified.png
index a796175cc..33a457ae0 100644
Binary files a/app/src/gambas3/img/32/modified.png and b/app/src/gambas3/img/32/modified.png differ