diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 05719854b22925a9dcdc2f776a8f6d37f36d60cc..886e474f09210e722c879f5fb33b342785301dcb 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -169,7 +169,8 @@ std::vector<std::pair<std::string, std::string> > GetShortcutsUsage(const std::s
   s.push_back(mp("Right arrow",    "Go to next time step"));
   s.push_back(mp("Up arrow",       "Make previous view visible"));
   s.push_back(mp("Down arrow",     "Make next view visible"));
-  s.push_back(mp("0",              "Reload project file"));
+  s.push_back(mp("0",              "Reload geometry"));
+  s.push_back(mp(cc + "0",         "Reload full project"));
   s.push_back(mp("1 or F1",        "Mesh lines"));
   s.push_back(mp("2 or F2",        "Mesh surfaces"));
   s.push_back(mp("3 or F3",        "Mesh volumes"));
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index cff7a6740c916b1cfcb48b45a1fd0a2df62d529a..7fd6ca42ae307207bae0e15cbb277f31c7160bfb 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -511,6 +511,10 @@ int FlGui::testGlobalShortcuts(int event)
     geometry_reload_cb(0, 0);
     status = 1;
   }
+  if(Fl::test_shortcut(FL_CTRL + '0') || Fl::test_shortcut(FL_META + '0')) {
+    onelab_reload_cb(0, 0);
+    status = 1;
+  }
   else if(Fl::test_shortcut('1') || Fl::test_shortcut(FL_F + 1)) {
     mesh_1d_cb(0, 0);
     status = 1;
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 1c43e2652b6b0385544b76d8d79df3a96e40eb66..b7e1e8b733c1fe9643db42c3942d12de18e94c29 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -324,7 +324,7 @@ static int _save_view_med(const char *name){ return genericViewFileDialog
 static int _save_view_txt(const char *name){ return genericViewFileDialog
     (name, "TXT Options", 4); }
 static int _save_view_wrl(const char *name){ return genericViewFileDialog
-    (name, "X3D Options", 7); } 
+    (name, "X3D Options", 7); }
 
 static int _save_auto(const char *name)
 {
@@ -568,7 +568,7 @@ static void geometry_edit_cb(Fl_Widget *w, void *data)
   SystemCall(ReplaceSubString("%s", file, prog));
 }
 
-void geometry_reload_cb(Fl_Widget *w, void *data)
+void onelab_reload_cb(Fl_Widget *w, void *data)
 {
   if(CTX::instance()->lock || FlGui::instance()->onelab->isBusy()) {
     Msg::Info("I'm busy! Ask me that later...");
@@ -585,6 +585,13 @@ void geometry_reload_cb(Fl_Widget *w, void *data)
   drawContext::global()->draw();
 }
 
+void geometry_reload_cb(Fl_Widget *w, void *data)
+{
+  std::string fileName = GModel::current()->getFileName();
+  OpenProject(fileName);
+  drawContext::global()->draw();
+}
+
 static void add_new_point()
 {
   opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
diff --git a/Fltk/graphicWindow.h b/Fltk/graphicWindow.h
index 4b7834d201558b2c8d1515bf27c40de816d72fca..e7d946e553779a173b6fcf39b413dd2f4276056d 100644
--- a/Fltk/graphicWindow.h
+++ b/Fltk/graphicWindow.h
@@ -99,6 +99,7 @@ void mod_post_cb(Fl_Widget *w, void *data);
 void mod_back_cb(Fl_Widget *w, void *data);
 void mod_forward_cb(Fl_Widget *w, void *data);
 void geometry_reload_cb(Fl_Widget *w, void *data);
+void onelab_reload_cb(Fl_Widget *w, void *data);
 void mesh_1d_cb(Fl_Widget *w, void *data);
 void mesh_2d_cb(Fl_Widget *w, void *data);
 void mesh_3d_cb(Fl_Widget *w, void *data);
diff --git a/contrib/mobile/utils/android_build.sh b/contrib/mobile/utils/android_build.sh
index ad10864610a9fda83316285a4081439da2c52d19..1e9317c1dc043c9f6c28c4f8974fee595a215bc6 100755
--- a/contrib/mobile/utils/android_build.sh
+++ b/contrib/mobile/utils/android_build.sh
@@ -76,7 +76,7 @@ make androidProject
 check
 
 # Potentially modify source tree for alternate branding
-cd Onelab
+cd Android
 if [ $# -eq 1 ] ; then
   # change package name
   mv src/org/geuz/onelab/ src/org/geuz/$appname
@@ -84,12 +84,11 @@ if [ $# -eq 1 ] ; then
   mv src/org/geuz/$appname/Gmsh.java src/org/geuz/onelab
   find . -type f -name '*.java' -not -name 'Gmsh.java' -exec sed -i "s/org\.geuz\.onelab/org\.geuz\.$appname/g" {} \;
   sed -i "s/org\.geuz\.onelab/org\.geuz\.$appname/g" AndroidManifest.xml
-  grep -r -m 1 'Gmsh' src | cut -d ':' -f 1 | xargs -n 1 sed -i "s/org\.geuz\.$appname;/org\.geuz\.$appname;\n\nimport org.geuz.onelab.Gmsh;/"
+  grep -r -m 1 'Gmsh' src | cut -d ':' -f 1 | xargs -n 1 sed -i "s/org\.geuz\.onelab;/org\.geuz\.$appname;\n\nimport org.geuz.onelab.Gmsh;/"
   # change app name
   sed -i "s/<string name=\"app_name\">Onelab<\/string>/<string name=\"app_name\">$appname<\/string>/" res/values/strings.xml
 fi
 
-
 # Onelab/Mobile package
 if [ ! -d "libs/armeabi-v7a/" ]; then mkdir -p libs/armeabi-v7a/; fi
 target=1