diff --git a/.gitignore b/.gitignore
index 339f1eb5e..5dbf23b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 
 # Mac finder artifacts
 .DS_Store
+.ruby-gemset
diff --git a/README.md b/README.md
index 9fe47f6ad..ef9b015bd 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo
 
 ## Configuración para desarrollo y tests
 
-Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.2, la gema `bundler`, y PostgreSQL (9.4 o superior).
+Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.2, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
 
 ```
 cd participacion
diff --git a/README_EN.md b/README_EN.md
index 40a39ae01..ee63eede4 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -21,7 +21,7 @@ Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http
 
 ## Configuration for development and test environments
 
-Prerequisites: install git, ImageMagick, Ruby 2.2.2, bundler gem and PostgreSQL (>=9.4).
+Prerequisites: install git, ImageMagick, Ruby 2.2.2, bundler gem, ghostscript and PostgreSQL (>=9.4).
 
 ```
 cd participacion
diff --git a/app/assets/images/language_select.png b/app/assets/images/language_select.png
new file mode 100644
index 000000000..e0c4e6411
Binary files /dev/null and b/app/assets/images/language_select.png differ
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index d45dc0b75..f95b7462b 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -482,6 +482,24 @@ footer {
 // 08. Forms
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+form.locale-form {
+  display: inline-block;
+  position: relative;
+
+  select {
+    background-image: url("language_select.png");
+
+    &.js-locale-switcher {
+      background-color: transparent;
+      border: 0;
+      color: white;
+      outline: none;
+      padding-left: rem-calc(3);
+      padding-right: rem-calc(24);
+    }
+  }
+}
+
 form {
 
   label {
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
index 3ab2b0a98..b60290296 100644
--- a/app/views/shared/_locale_switcher.html.erb
+++ b/app/views/shared/_locale_switcher.html.erb
@@ -1,10 +1,8 @@
 <div class="locale">
-  <span>
-    <%= t("layouts.header.language") %>
-    <form>
-      <select class="js-locale-switcher" name='locale-switcher'>
-        <%= available_locale_options_for_select %>
-      </select>
-    </form>
-  </span>
+  <span class="inline-block"><%= t("layouts.header.locale") %></span>
+  <form class="locale-form">
+    <select class="js-locale-switcher" name="locale-switcher">
+      <%= available_locale_options_for_select %>
+    </select>
+  </form>
 </div>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 151a9fc47..cdf6774db 100644
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -39,7 +39,7 @@ en:
       index:
         title: 'Debate topics'
         add_tag: 'Add a new debate topic'
-      mark_as_featured: 'Mark as featured'
+      mark_as_featured: 'Propose topic to create debate'
       name:
         placeholder: 'Write a topic'
       destroy: Delete Tag
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index fbaed7566..02f0ef65a 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -33,13 +33,13 @@ es:
     actions:
       hide: Ocultar
       hide_author: Bloquear al autor
-      restore: Permitir
+      restore: Volver a mostrar
       confirm: '¿Estás seguro?'
     tags:
       index:
         title: 'Temas de debate'
         add_tag: 'Añade un nuevo tema de debate'
-      mark_as_featured: 'Marcar como destacado'
+      mark_as_featured: 'Proponer etiqueta al crear debate'
       name:
         placeholder: 'Escribe el nombre del tema'
       destroy: Elimina la etiqueta
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 631609924..a2ea265f3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -13,7 +13,7 @@ en:
       open_city_slogan: So the citizens can decide what kind of city they want.
       see_all_debates: See all debates
       my_account_link: My account
-      language: Site language
+      locale: "Site language:"
       administration: Administration
       moderation: Moderation
       welcome: Welcome
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7ec328d6f..8d24181c4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,5 +1,5 @@
 es:
-  locale: 'Español'
+  locale: "Español"
   layouts:
     header:
       external_link_transparency: Transparencia
@@ -13,7 +13,7 @@ es:
       open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
       see_all_debates: Ver todos los debates
       my_account_link: Mi cuenta
-      language: Idioma de la página
+      locale: "Idioma de la página:"
       administration: Administrar
       moderation: Moderar
       welcome: Portada
@@ -115,7 +115,7 @@ es:
     show:
       title: "Mi cuenta"
       save_changes_submit: "Guardar cambios"
-      change_credentials_link: "Cambiar mis credenciales"
+      change_credentials_link: "Cambiar mis datos de acceso"
       email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
       avatar: "Avatar"