diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb148b202509577630eeb38ae0e632b892cea031..b0e3c8672df5ca74beac0db6f1ce6056df770a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,7 +269,7 @@ endmacro(set_config_option)
 # machines)
 check_type_size("void*" SIZEOF_VOID_P)
 if(SIZEOF_VOID_P EQUAL 8)
-  set_config_option(HAVE_64BIT_SIZE_T "64Bit")
+  set(HAVE_64BIT_SIZE_T TRUE)
 endif(SIZEOF_VOID_P EQUAL 8)
 
 if(ENABLE_BLAS_LAPACK)
diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 78ccc8e9c2c22410ff68afda0c45b674f8736285..5e2cad54f9e6801f25fe1bab93155a757a46b131 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -7,7 +7,6 @@
 #define _GMSH_CONFIG_H_
 
 #cmakedefine HAVE_3M
-#cmakedefine HAVE_64BIT_SIZE_T
 #cmakedefine HAVE_ACIS
 #cmakedefine HAVE_ANN
 #cmakedefine HAVE_BAMG
diff --git a/Common/Hash.h b/Common/Hash.h
index 449c0c75f9c096d5d34a823b6efead9db61d3177..5cfcf4a0cf7150f2c9f60bd0e04bea7a7e63431c 100644
--- a/Common/Hash.h
+++ b/Common/Hash.h
@@ -6,8 +6,6 @@
 #ifndef _HASH_H_
 #define _HASH_H_
 
-#include "GmshConfig.h"
-
 //--FNV hashing parameters
 
 #if defined(HAVE_64BIT_SIZE_T)
@@ -48,7 +46,7 @@ template <> struct Hash1FNV1a<1> {
 
 // Entry point
 template <int N> struct HashFNV1a {
-  static size_t eval(const void *const key) 
+  static size_t eval(const void *const key)
   {
     size_t hash = FNV_OFFSET_BASIS;
     return Hash1FNV1a<N>::eval(hash, static_cast<const unsigned char*>(key));
diff --git a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad.png b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad.png
index 001965f33af0022680c6e8982e857dd74a9611fd..a375bd3d75634a444e0847add7345be901bf7a4e 100644
Binary files a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad.png and b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad.png differ
diff --git a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png
index be1e6888ad0b308577dbd81d1ae1ce06554e2cb5..ce69f13ee2cc67fa2e3bfcaa7adf7acebb9e066e 100644
Binary files a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png and b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_ipad_retina.png differ
diff --git a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png
index fcaa30c368bd1153505f04de4ea033d2b7fa1a2a..4ad538bdd6d17c10ee4fa1e2cf0003161b255228 100644
Binary files a/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png and b/contrib/mobile/iOS/Onelab/Images.xcassets/AppIcon.appiconset/icon_app_iphone_retina.png differ
diff --git a/contrib/mobile/utils/make_icon_ios.sh b/contrib/mobile/utils/make_icon_ios.sh
index 5bace9cb5834b5109acf3839170d0960f6c648e5..2b26c4769036433b46bdba8abf68abbd55027223 100755
--- a/contrib/mobile/utils/make_icon_ios.sh
+++ b/contrib/mobile/utils/make_icon_ios.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-icon_source=../../../utils/icons/gmsh_mobile_master.png
-launch_source=../../../utils/icons/gmsh_mobile_master.png
+icon_source=../../../utils/icons/gmsh_mobile_1024x1024.png
+launch_source=../../../utils/icons/gmsh_mobile_1024x1024.png
 
-icon_source=$HOME/tex/proposals/bbemg/bbemg-logo-twitter-white.png
-launch_source=$HOME/tex/proposals/bbemg/bbemg-logo-color-rgb.png
+#icon_source=$HOME/tex/proposals/bbemg/bbemg-logo-twitter-white.png
+#launch_source=$HOME/tex/proposals/bbemg/bbemg-logo-color-rgb.png
 
 mkdir -p AppIcon.appiconset
 # App icons (iPad)