diff --git a/app/assets/images/flags/flag-en.png b/app/assets/images/flags/flag-en.png
new file mode 100755
index 00000000..51a27cf1
Binary files /dev/null and b/app/assets/images/flags/flag-en.png differ
diff --git a/app/assets/images/flags/flag-nl.png b/app/assets/images/flags/flag-nl.png
new file mode 100755
index 00000000..362c9f06
Binary files /dev/null and b/app/assets/images/flags/flag-nl.png differ
diff --git a/app/assets/javascripts/user/application.js.erb b/app/assets/javascripts/user/application.js.erb
index 07a1cf18..cfd7246e 100644
--- a/app/assets/javascripts/user/application.js.erb
+++ b/app/assets/javascripts/user/application.js.erb
@@ -187,6 +187,9 @@ function Qupdate(selector){
   setTranslations(selector);
 }
 function setTranslations(selector){
+  var list = $('#top-navigation-list');
+  list.find('.locale').show();
+  list.find('.locale-'+$locale).hide();
   if(selector){
     $(selector).find('[data-t]').each(function(){$(this).text(t($(this).attr('data-t')))})
   }else{
diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass
index bdb1779b..e990f0aa 100644
--- a/app/assets/stylesheets/user/structure.css.sass
+++ b/app/assets/stylesheets/user/structure.css.sass
@@ -67,6 +67,15 @@ body
   .order-count-cell
     white-space: nowrap
   .page-header
+  #top-navigation-list
+    .locale
+      padding-left: 30px
+      background-repeat: no-repeat
+      background-position: 15px center
+      &.locale-en
+        background-image: image-url('flags/flag-en.png')
+      &.locale-nl
+        background-image: image-url('flags/flag-nl.png')
 #list-needs-help-button
   button
     margin-left: 5px
diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim
index c53eafcd..67176979 100644
--- a/app/views/layouts/phone.html.slim
+++ b/app/views/layouts/phone.html.slim
@@ -68,7 +68,9 @@ html lang="en"
           = link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
           .container.nav-collapse
             ul.nav#top-navigation-list
-              li= link_to 'View history', user_list_history_path
+              li.locale.locale-en= link_to_function 'English', %|setLocale('en')| 
+              li.locale.locale-nl= link_to_function 'Nederlands', %|setLocale('nl')| 
+              li= link_to t('user.list_history.title'), user_list_history_path, data: {t: 'list_history.title'}
     .container
       .content
         .alert.alert-error.hide
diff --git a/make_android b/make_mobile
similarity index 100%
rename from make_android
rename to make_mobile
diff --git a/script/build_mobile_app.rb b/script/build_mobile_app.rb
index f13cc2a2..f39b5fa1 100644
--- a/script/build_mobile_app.rb
+++ b/script/build_mobile_app.rb
@@ -68,7 +68,7 @@ for action in uc.action_methods
     ## WRITE TO IOS PATH
     ios_view = result.gsub /(href|src)="\/user\/([^"]+)/, %|\\1="./\\2| # replace absolute path names to relative ones
     ios_view = ios_view.gsub /(href|src)="\/assets\/([^"]+)/, %|\\1="./assets/\\2| # make assets calls relative
-    ios_view.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"><script type="text/javascript" src="cordova-2.2.0.js"></script><script type="text/javascript" src="barcodescanner.js"></script>'
+    ios_view.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"></script><script type="text/javascript" src="cordova-2.2.0.js"></script><script type="text/javascript" src="barcodescanner.js"></script>'
     ios_view.gsub! '##assets_path##', './assets/'
     File.open(File.join(ios_root, "#{action}.html"), 'w'){|f| f.puts ios_view}