diff --git a/app/assets/images/flags/flag-en.png b/app/assets/images/user/flags/flag-en.png
similarity index 100%
rename from app/assets/images/flags/flag-en.png
rename to app/assets/images/user/flags/flag-en.png
diff --git a/app/assets/images/flags/flag-nl.png b/app/assets/images/user/flags/flag-nl.png
similarity index 100%
rename from app/assets/images/flags/flag-nl.png
rename to app/assets/images/user/flags/flag-nl.png
diff --git a/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee b/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee
new file mode 100644
index 00000000..167c6da7
--- /dev/null
+++ b/app/assets/javascripts/user/app/controllers/settings_controller.js.coffee
@@ -0,0 +1,2 @@
+App.SettingsController = Ember.Controller.extend
+  locales: ['nl', 'en']
diff --git a/app/assets/javascripts/user/app/router.js.coffee b/app/assets/javascripts/user/app/router.js.coffee
index a42dcce5..9f47943a 100644
--- a/app/assets/javascripts/user/app/router.js.coffee
+++ b/app/assets/javascripts/user/app/router.js.coffee
@@ -12,4 +12,5 @@ App.Router.map ->
   @resource 'join_requests'
   @resource 'lists', ->
     @resource 'list', path: ':list_id'
+  @route 'settings'
   @route 'error'
diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem
index 3af463ef..42c0d87f 100644
--- a/app/assets/javascripts/user/app/templates/application.emblem
+++ b/app/assets/javascripts/user/app/templates/application.emblem
@@ -50,6 +50,10 @@ aside.side-menu
     li
       =link-to 'join_requests'
         span= t 'models.plural.join_request'
+    li
+      =link-to 'settings'
+        span.settings-icon
+        span= t 'settings.title'
     li.hide
       a{action "openDebugger"}
         span.fa.fa-wrench.fa-lg
diff --git a/app/assets/javascripts/user/app/templates/settings.emblem b/app/assets/javascripts/user/app/templates/settings.emblem
new file mode 100644
index 00000000..7c7098dc
--- /dev/null
+++ b/app/assets/javascripts/user/app/templates/settings.emblem
@@ -0,0 +1,6 @@
+.row: h3=t 'settings.title'
+.display-row
+  .display-label=t 'settings.language'
+  .display-field
+    each locale in locales
+      App.SettingsLocaleView locale=locale
diff --git a/app/assets/javascripts/user/app/templates/settings/locale.emblem b/app/assets/javascripts/user/app/templates/settings/locale.emblem
new file mode 100644
index 00000000..968a69f4
--- /dev/null
+++ b/app/assets/javascripts/user/app/templates/settings/locale.emblem
@@ -0,0 +1 @@
+= view.localeFlag
diff --git a/app/assets/javascripts/user/app/views/settings_locale_view.js.coffee b/app/assets/javascripts/user/app/views/settings_locale_view.js.coffee
new file mode 100644
index 00000000..070050ab
--- /dev/null
+++ b/app/assets/javascripts/user/app/views/settings_locale_view.js.coffee
@@ -0,0 +1,11 @@
+App.SettingsLocaleView = Ember.View.extend
+  templateName: 'settings/locale'
+  classNames: 'settings-locale'
+  classNameBindings: ['current']
+  current: (-> @get('locale') is $locale ).property('controller.locale')
+  localeFlag: (->
+    new Ember.Handlebars.SafeString "<img src=\"#{$assets_path}user/flags/flag-#{@get('locale')}.png\">"
+  ).property('locale')
+  click: ->
+    setLocale @get('locale')
+    @set 'controller.locale', @get('locale')
diff --git a/app/assets/javascripts/user/flat/application.js.coffee.erb b/app/assets/javascripts/user/flat/application.js.coffee.erb
index 986bca93..8d7da812 100644
--- a/app/assets/javascripts/user/flat/application.js.coffee.erb
+++ b/app/assets/javascripts/user/flat/application.js.coffee.erb
@@ -18,7 +18,6 @@
 #  )(jQuery)
 
 @Qstorage = localStorage
-
 $.extend($translations.en, <%= I18n.t('user', locale: :en).to_json %>);
 $.extend($translations.nl, <%= I18n.t('user', locale: :nl).to_json %>);
 setLocale()
diff --git a/app/assets/stylesheets/user/foundation/_qconstants.css.sass b/app/assets/stylesheets/user/foundation/_qconstants.css.sass
index bccb91f5..96cd3f86 100644
--- a/app/assets/stylesheets/user/foundation/_qconstants.css.sass
+++ b/app/assets/stylesheets/user/foundation/_qconstants.css.sass
@@ -5,4 +5,4 @@ $green: #7BB459 //Heineken
 //$wood: image-url('textures/wood001-vertical.jpg')
 $wood: image-url('theme1/wall-bg.jpg')
 $background-brown: #57351f
-$active-link-color: #ff0
+$current-color: #ff0
diff --git a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass
index 5019ed02..7232acfe 100644
--- a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass
+++ b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass
@@ -52,8 +52,8 @@ header.top-menu
     margin-top: 10px
     color: #999
     &.active
-      color: $active-link-color
-      border-color: $active-link-color
+      color: $current-color
+      border-color: $current-color
       &.callout
         color: #f70
         border-color: #f70
diff --git a/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass
index 2d229bd6..230f9201 100644
--- a/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass
+++ b/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass
@@ -26,8 +26,12 @@ aside.side-menu
     margin-right: 18px
     @extend .fa
     @extend .fa-list
+  .settings-icon
+    margin-right: 18px
+    @extend .fa
+    @extend .fa-gears
   a.active
-    color: $active-link-color
+    color: $current-color
 
 .toggle-side-menu
   position: absolute
diff --git a/app/assets/stylesheets/user/foundation/components/_settings.css.sass b/app/assets/stylesheets/user/foundation/components/_settings.css.sass
new file mode 100644
index 00000000..6d3baaa5
--- /dev/null
+++ b/app/assets/stylesheets/user/foundation/components/_settings.css.sass
@@ -0,0 +1,5 @@
+.settings-locale
+  display: inline-block
+  margin-right: 8px
+  &.current
+    border: 1px solid $current-color
diff --git a/config/locales/user.en.yml b/config/locales/user.en.yml
index a2f8579a..d7fb8af7 100644
--- a/config/locales/user.en.yml
+++ b/config/locales/user.en.yml
@@ -100,3 +100,6 @@ en:
           message: Cannot find %{model} with id %{id}
         general:
           message: Cannot find resource
+    settings:
+      title: Settings
+      language: Language
diff --git a/config/locales/user.nl.yml b/config/locales/user.nl.yml
index af13eb88..895a21f5 100644
--- a/config/locales/user.nl.yml
+++ b/config/locales/user.nl.yml
@@ -99,3 +99,7 @@ nl:
           message: '%{model} met id %{id} kan niet worden gevonden'
         general:
           message: Data niet beschikbaar
+
+    settings:
+      title: Settings
+      language: Taal