diff --git a/app/assets/stylesheets/locomotive/content_locale_picker.css.scss b/app/assets/stylesheets/locomotive/content_locale_picker.css.scss
index fb14e2bd..4b7239e3 100644
--- a/app/assets/stylesheets/locomotive/content_locale_picker.css.scss
+++ b/app/assets/stylesheets/locomotive/content_locale_picker.css.scss
@@ -29,7 +29,7 @@
     width: 20px;
     height: 20px;
 
-    margin-right: 4px;
+    margin-right: 7px;
   }
 
   span.text {
diff --git a/app/cells/locomotive/content_locale_picker_cell.rb b/app/cells/locomotive/content_locale_picker_cell.rb
index 9f3803f4..1df3265a 100644
--- a/app/cells/locomotive/content_locale_picker_cell.rb
+++ b/app/cells/locomotive/content_locale_picker_cell.rb
@@ -4,7 +4,7 @@ class Locomotive::ContentLocalePickerCell < Cell::Base
     site    = args[:site]
     locale  = args[:locale].to_s
 
-    logger.debug "site.locales = #{site.locales.inspect}"
+    logger.debug "site.locales = #{site.locales.inspect} / #{site.locales.size}"
 
     if site.locales.empty? || site.locales.size < 2
       ''
diff --git a/app/views/locomotive/shared/actions/_contents.html.haml b/app/views/locomotive/shared/actions/_contents.html.haml
index fe8bb6cc..0ae5d69a 100644
--- a/app/views/locomotive/shared/actions/_contents.html.haml
+++ b/app/views/locomotive/shared/actions/_contents.html.haml
@@ -2,11 +2,12 @@
   .action
     = link_to content_tag(:em) + content_tag(:span, t('locomotive.content_types.index.new')), new_content_type_url, :class => 'button'
 
-.action
-  = link_to '#', :id => 'content-locale-picker-link', :class => 'button' do
-    %span.hand
-      &nbsp;
+- if current_site.locales.size > 1
+  .action
+    = link_to '#', :id => 'content-locale-picker-link', :class => 'button' do
+      %span.hand
+        &nbsp;
 
-    = image_tag "locomotive/icons/flags/#{current_content_locale}.png", :class => 'flag'
+      = image_tag "locomotive/icons/flags/#{current_content_locale}.png", :class => 'flag'
 
-    %span.text= current_content_locale
\ No newline at end of file
+      %span.text= current_content_locale
\ No newline at end of file
diff --git a/doc/TODO b/doc/TODO
index f2aaabe4..cb19100b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -68,8 +68,13 @@ x edit my site
     - custom_fields: use the appropriate icon to drag select options
 - i18n
   x add locales a site responds to
-  - locale switcher
+  x locale switcher
+  - back to default locale (if changed in settings)
+  - front
 - inline editor
+  - remove inline-editor tag
+  - rack
+  - iframe
 
 - disallow to click twice on the submit form button (spinner ?)
 - message to notify people if their browser is too old