diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 08dd8e7809169b32bc430078086f3b862b637061..54d6c7a611e977c0a53765ce4dd2a3a7a1d55e16 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -2358,11 +2358,11 @@ static void MaxNumSurface(void *a, void *b)
 
 static void ReplaceDuplicatePointsNew()
 {
-  Msg::Info("New Coherence required...");
+  Msg::Info("New Coherence...");
 
   double tol = CTX::instance()->geom.tolerance * CTX::instance()->lc;
 
-  // Create unique points
+  // create kdtree
   std::map<MVertex*, Vertex*> v2V;
   std::vector<MVertex*> all;
   List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Points);
@@ -2376,7 +2376,7 @@ static void ReplaceDuplicatePointsNew()
   List_Delete(tmp);
   MVertexPositionSet pos(all);
 
-  // touch unique points
+  // touch all points
   tmp = Tree2List(GModel::current()->getGEOInternals()->Points);
   for(int i = 0; i < List_Nbr(tmp); i++) {
     Vertex *V;
@@ -2385,7 +2385,7 @@ static void ReplaceDuplicatePointsNew()
   }
   List_Delete(tmp);
 
-  // Replace old points in curves
+  // replace points in curves
   tmp = Tree2List(GModel::current()->getGEOInternals()->Curves);
   for(int i = 0; i < List_Nbr(tmp); i++) {
     Curve *c;
@@ -2409,7 +2409,7 @@ static void ReplaceDuplicatePointsNew()
   }
   List_Delete(tmp);
 
-  // Replace old points in surfaces
+  // replace points in surfaces
   tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
   for(int i = 0; i < List_Nbr(tmp); i++) {
     Surface *s;
@@ -2424,7 +2424,7 @@ static void ReplaceDuplicatePointsNew()
   }
   List_Delete(tmp);
 
-  // Replace old points in volumes
+  // replace points in volumes
   tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
   for(int i = 0; i < List_Nbr(tmp); i++) {
     Volume *vol;
@@ -2439,7 +2439,7 @@ static void ReplaceDuplicatePointsNew()
   }
   List_Delete(tmp);
 
-  // Replace old points in physical groups
+  // replace points in physical groups
   for(int i = 0; i < List_Nbr(GModel::current()->getGEOInternals()->PhysicalGroups); i++){
     PhysicalGroup *p;
     List_Read(GModel::current()->getGEOInternals()->PhysicalGroups, i, &p);
diff --git a/doc/texinfo/opt_print.texi b/doc/texinfo/opt_print.texi
index 376c82e7bfc40195ec188b4a63ff2aad02d7ca0d..395ba730efb5f70cae0a15467ca44674cfbb212c 100644
--- a/doc/texinfo/opt_print.texi
+++ b/doc/texinfo/opt_print.texi
@@ -39,6 +39,21 @@ Composite all window tiles in the same output image (for bitmap output only)@*
 Default value: @code{0}@*
 Saved in: @code{General.OptionsFileName}
 
+@item Print.PgfTwoDim
+Output PGF format for two dimensions. Mostly irrelevant if `PgfExportAxis=0`. Default `1` (yes).@*
+Default value: @code{1}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Print.PgfExportAxis
+Include axis in export pgf code (not in the png). Default `0` (no).@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
+@item Print.PgfHorizontalBar
+Use a horizontal color bar in the pgf output. Default `0` (no).@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
 @item Print.DeleteTemporaryFiles
 Delete temporary files used during printing@*
 Default value: @code{1}@*
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index 3ee35863062d042915e47ae7a038c66c731afb81..6e4fd29e154bec4b4663ad7f8b6f39feae71f726 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -72,6 +72,8 @@ Rename project file
 Save file as
 @item Shift+Ctrl+c
 Show clipping plane window
+@item Shift+Ctrl+h
+Show current options and workspace window
 @item Shift+Ctrl+j
 Save options as default
 @item Shift+Ctrl+m
diff --git a/utils/icons/gmsh_1024x1024.png b/utils/icons/gmsh_1024x1024.png
index d39959fd79011a602ad7e99cfebf7ec3bb46d9e5..05482498838a2acbe29db0050436bccc9b071807 100644
Binary files a/utils/icons/gmsh_1024x1024.png and b/utils/icons/gmsh_1024x1024.png differ
diff --git a/utils/icons/gmsh_mobile_master.png b/utils/icons/gmsh_mobile_master.png
index 08299ae033e150d9e0caeada9c88988926db4b57..59f5c1b45c6999e8bc977953be41a2e48ab2ee21 100644
Binary files a/utils/icons/gmsh_mobile_master.png and b/utils/icons/gmsh_mobile_master.png differ