diff --git a/locales/de.js b/locales/de.js
index a18b46f..b41e542 100644
--- a/locales/de.js
+++ b/locales/de.js
@@ -173,6 +173,7 @@
 	"tool_styles": "Stil",
 	"tool_bullets": "Bullets",
 	"tool_numbers": "Zahlen",
+	"tool_font": "Font",
 	"color_fill": "Füllung",
 	"color_stroke": "Strich",
 	"color_text": "Text",
@@ -318,5 +319,6 @@
 	"more": "mehr",
 	"follow_present": "Folgen",
 	"mute_present": "Entfolgen",
-  "follow_present_help": "Wenn jemand den Space präsentiert, folgen die anderen Mitglieder automatisch der Präsentation. Mit diesem Knopf lässt sich das an- oder ausschalten."
+	"follow_present_help": "Wenn jemand den Space präsentiert, folgen die anderen Mitglieder automatisch der Präsentation. Mit diesem Knopf lässt sich das an- oder ausschalten.",
+	"media": "Media"
 }
diff --git a/locales/en.js b/locales/en.js
index c6ce026..6f6aa0f 100644
--- a/locales/en.js
+++ b/locales/en.js
@@ -172,6 +172,7 @@
 	"tool_styles": "Styles",
 	"tool_bullets": "Bullets",
 	"tool_numbers": "Numbers",
+	"tool_font": "Font",
 	"color_fill": "Fill",
 	"color_stroke": "Stroke",
 	"color_text": "Text",
@@ -321,5 +322,6 @@
 	"follow_present": "Follow",
 	"mute_present": "Unfollow",
 	"follow_present_help": "If someone else is presenting this Space, the other members automatically follow the presentation. Switch following on or off with this button.",
-	"export": "export"
+	"export": "export",
+	"media": "Media"
 }
\ No newline at end of file
diff --git a/locales/es.js b/locales/es.js
index 2c10f7e..5d3fc58 100644
--- a/locales/es.js
+++ b/locales/es.js
@@ -124,7 +124,7 @@
 	"new_password": "Nueva Contraseña",
 	"verify_password": "Verificar Contraseña",
 	"change_password": "Cambiar Contraseña",
-	"reset_password": "Reiniciar Contraseña",
+	"reset_password": "Restablecer contraseña",
 	"terminate_caption": "Borrar Cuenta",
 	"terminate_warning": "Si borras tu cuenta, todos los Espacios, Directorios y Mensajes (incluyendo todo el contenido que tú y otras personas crearon en tus Espacios) serán destruidos.",
 	"terminate_warning2": "Esta acción no puede deshacerse.",
@@ -172,6 +172,7 @@
 	"tool_styles": "Estilos",
 	"tool_bullets": "'Bullets'",
 	"tool_numbers": "Números",
+	"tool_font": "Fuente",
 	"color_fill": "Rellenar",
 	"color_stroke": "Trazo",
 	"color_text": "Texto",
@@ -321,5 +322,6 @@
 	"follow_present": "Seguir",
 	"mute_present": "Dejar de Seguir",
 	"follow_present_help": "Si alguien más está presentando este espacio, los otros miembros siguen automáticamente la presentación. Active o desactive el seguimiento con este botón.",
-	"export": "exportar"
+	"export": "exportar",
+	"media": "Media"
 }
diff --git a/locales/fr.js b/locales/fr.js
index 894d3a8..3a75451 100644
--- a/locales/fr.js
+++ b/locales/fr.js
@@ -172,6 +172,7 @@
 	"format_h3": "Titre 3",
 	"font_size": "Taille de la police",
 	"line_height": "Hauteur de ligne",
+	"tool_font": "Font",
 	"tool_align": "Align",
 	"tool_styles": "Style",
 	"tool_bullets": "Puces",
@@ -315,5 +316,6 @@
 	"more": "plus",
 	"follow_present": "Suivre",
 	"mute_present": "Pas suivre",
-	"follow_present_help": "follow_present_help"
+	"follow_present_help": "follow_present_help",
+	"media": "Media"
 }
diff --git a/locales/oc.js b/locales/oc.js
index 6642d69..c69cecd 100644
--- a/locales/oc.js
+++ b/locales/oc.js
@@ -173,6 +173,7 @@
     "tool_bullets": "Bullets",
     "tool_numbers": "Nombres",
     "color_fill": "Fill",
+    "tool_font": "Font",
     "color_stroke": "Traçat",
     "color_text": "Tèxte",
     "tool_type": "Tipe",
@@ -321,5 +322,6 @@
     "follow_present": "Seguir",
     "mute_present": "Quitar de seguir",
     "follow_present_help": "follow_present_help",
-    "export": "exportar"
+    "export": "exportar",
+    "media": "Media"
 }
diff --git a/views/partials/login.html b/views/partials/login.html
index f2c8b7b..242dcea 100644
--- a/views/partials/login.html
+++ b/views/partials/login.html
@@ -98,8 +98,8 @@
       </form>
     </div>
     <div class="content" v-if="password_reset_send==true">
-      <h4>Reset Password</h4>
-      Please check your email inbox.
+      <h4><%=__("reset_password")%></h4>
+      <%=__("password_check_inbox")%>
     </div>
   </div>
 
diff --git a/views/partials/team.html b/views/partials/team.html
index 398f010..40cad41 100644
--- a/views/partials/team.html
+++ b/views/partials/team.html
@@ -5,7 +5,7 @@
   <h4>Spacedeck Team Management</h4>
 
   <div v-if="!user.team" class="dialog-section text-left">
-    You are not in a team yet. Please upgrade first.</h2>
+    You are not in a team yet. Please upgrade first.
   </div>
 
   <div v-if="user.team">
@@ -34,7 +34,7 @@
     </div>
 
     <div class="dialog-section text-left">
-      <h4>Members</h4>
+      <h4><%=__("members")%></h4>
 
       <p>
         New members will get an invitation email. After the invitation was used, the member is active. The number of active members in your team will affect your monthly charge.
diff --git a/views/partials/tool/object-options.html b/views/partials/tool/object-options.html
index 1cc216f..5851e6b 100644
--- a/views/partials/tool/object-options.html
+++ b/views/partials/tool/object-options.html
@@ -1,34 +1,34 @@
 <div class="dialog-section no-b no-p" v-if="active_space_loaded">
   <div class="btn-group">
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="delete_selected_artifacts()">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="delete_selected_artifacts()" title="<%=__("delete")%>">
       <span class="icon icon-trash"></span>
       <span class="icon-label"><%=__("delete")%></span>
     </button>
 
     <button class="btn btn-divider"></button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="toggle_lock_of_selected_artifacts()" v-if="active_space_role=='admin'">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="toggle_lock_of_selected_artifacts()" v-if="active_space_role=='admin'" title="<%=__("lock")%>">
       <span class="icon icon-lock-closed"></span>
       <span class="icon-label"><%=__("lock")%></span>
     </button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="toggle_lock_of_selected_artifacts()" v-if="active_space_role=='admin'">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="toggle_lock_of_selected_artifacts()" v-if="active_space_role=='admin'" title="<%=__("unlock")%>">
       <span class="icon icon-lock-open"></span>
       <span class="icon-label"><%=__("unlock")%></span>
     </button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="duplicate_selected_artifacts()">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="duplicate_selected_artifacts()" title="<%=__("copy")%>">
       <span class="icon icon-duplicate"></span>
       <span class="icon-label"><%=__("copy")%></span>
     </button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="create_link_on_selected_artifacts()">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="create_link_on_selected_artifacts()" title="<%=__("link")%>">
       <span class="icon icon-link"></span>
       <span class="icon-label"><%=__("link")%></span>
     </button>
     
     <span v-if="first_selected_artifact">
-      <button class="btn btn-transparent btn-icon-labeled" v-on:click="download_selected_artifacts()" v-if="selection_metrics.count==1 && first_selected_artifact.payload_uri">
+      <button class="btn btn-transparent btn-icon-labeled" v-on:click="download_selected_artifacts()" v-if="selection_metrics.count==1 && first_selected_artifact.payload_uri" title="<%=__("download")%>">
         <span class="icon icon-download"></span>
         <span class="icon-label"><%=__("download")%></span>
       </button>
diff --git a/views/partials/tool/toolbar-elements.html b/views/partials/tool/toolbar-elements.html
index 22047d7..061c575 100644
--- a/views/partials/tool/toolbar-elements.html
+++ b/views/partials/tool/toolbar-elements.html
@@ -19,7 +19,7 @@
     <button class="btn btn-divider"></button>
 
     <div class="dropdown top left light" v-bind:class="{open:opened_dialog=='shapes'}">
-      <div class="btn-collapse in">
+      <div class="btn-collapse in" title="<%=__("tool_shape")%>">
         <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='shapes'}" v-on:click="open_dialog('shapes')">
           <span class="icon icon-shapes"></span>
           <span class="icon-label"><%=__("tool_shape")%></span>
@@ -31,28 +31,28 @@
       </div>
     </div>
 
-    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_scribble()" v-bind:class="{active:active_tool=='scribble'}">
+    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_scribble()" v-bind:class="{active:active_tool=='scribble'}" title="<%=__("tool_scribble")%>">
       <span class="icon icon-tool-scribble"></span>
       <span class="icon-label"><%=__("tool_scribble")%></span>
     </button>
     
-    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_arrow()" v-bind:class="{active:active_tool=='arrow'}">
+    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_arrow()" v-bind:class="{active:active_tool=='arrow'}" title="<%=__("tool_arrow")%>">
       <span class="icon icon-tool-arrow"></span>
       <span class="icon-label"><%=__("tool_arrow")%></span>
     </button>
     
     <div class="dropdown bottom light center">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="handle_insert_image_url()" v-on:touchstart="handle_insert_image_url()">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="handle_insert_image_url()" v-on:touchstart="handle_insert_image_url()" title="<%=__("media")%>">
           <span class="icon icon-upload"></span>
-          <span class="icon-label" >Media</span>
+          <span class="icon-label" ><%=__("media")%></span>
         </button>
       </div>
     </div>
 
     <div class="dropdown bottom light center">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="start_adding_note()" v-bind:class="{active:active_tool=='note'}">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="start_adding_note()" v-bind:class="{active:active_tool=='note'}" title="<%=__("tool_text")%>">
           <span class="icon icon-tool-text"></span>
           <span class="icon-label"><%=__("tool_text")%></span>
         </button>
@@ -61,7 +61,7 @@
 
     <div class="dropdown top left light">
       <div class="btn-collapse">
-        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='image'}" v-on:click="open_dialog('image')">
+        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='image'}" v-on:click="open_dialog('image')" title="<%=__("image")%>">
           <span class="icon icon-picture"></span>
           <span class="icon-label"><%=__("image")%></span>
         </button>
@@ -74,7 +74,7 @@
 
     <div class="dropdown top left light" v-bind:class="{open:opened_dialog=='zones'}">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='zones'}" v-on:click="open_dialog('zones')">
+        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='zones'}" v-on:click="open_dialog('zones')" title="<%=__("tool_zones")%>">
           <span class="icon icon-zone"></span>
           <span class="icon-label"><%=__("tool_zones")%></span>
         </button>
@@ -89,7 +89,7 @@
 
     <div class="dropdown top left center" v-show="logged_in" v-bind:class="{open:opened_dialog=='background'}">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='background'}" v-on:click="open_dialog('background')">
+        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='background'}" v-on:click="open_dialog('background')" title="<%=__("tool_canvas")%>">
           <span class="letter">bg</span>
           <span class="icon-label"><%=__("tool_canvas")%></span>
         </button>
@@ -102,9 +102,10 @@
 
     <button class="btn btn-transparent btn-icon-labeled"
             v-if="active_space_role=='admin'"
-            v-on:click="activate_access()">
+            v-on:click="activate_access()"
+            title="<%= __('share') %>">
       <span class="icon icon-share"></span>
-      <span class="icon-label"><%=  __('share') %></span>
+      <span class="icon-label"><%= __('share') %></span>
     </button>
     
     <!--        
@@ -117,7 +118,7 @@
             -->
     <button class="btn btn-transparent btn-icon-labeled" title="Start Presentation (others follow what you see)" v-on:click="toggle_present_mode()" v-bind:class="{open:present_mode}">
       <span class="icon icon-presentation"></span>
-      <span class="icon-label"><%=  __('present') %></span>
+      <span class="icon-label"><%= __('present') %></span>
     </button>
 
   </div>
diff --git a/views/partials/tool/toolbar-object.html b/views/partials/tool/toolbar-object.html
index 657678b..b8c88e1 100644
--- a/views/partials/tool/toolbar-object.html
+++ b/views/partials/tool/toolbar-object.html
@@ -43,9 +43,9 @@
     
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='text-styles'}">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-styles')" v-bind:class="{open : opened_dialog=='text-styles'}">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-styles')" v-bind:class="{open : opened_dialog=='text-styles'}" title="<%=__("tool_styles")%>">
           <span class="icon icon-text-styles"></span>
-          <span class="icon-label">Styles</span>
+          <span class="icon-label"><%=__("tool_styles")%></span>
         </button>
       </div>
 
@@ -56,7 +56,7 @@
     
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='type-align'}">
       <div class="btn-collapse" v-bind:class="{in:selection_metrics.contains_text}">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('type-align')" v-bind:class="{open : opened_dialog=='type-align'}">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('type-align')" v-bind:class="{open : opened_dialog=='type-align'}" title="<%=__("tool_align")%>">
           <span class="icon icon-text-align-left-alt"></span>
           <span class="icon-label"><%=__("tool_align")%></span>
         </button>
@@ -70,7 +70,7 @@
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='layout'}">
 
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('layout')"  v-bind:class="{open : opened_dialog=='layout'}">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('layout')"  v-bind:class="{open : opened_dialog=='layout'}" title="<%=__("tool_layout")%>">
           <span class="icon icon-cluster"></span>
           <span class="icon-label"><%=__("tool_layout")%></span>
         </button>
@@ -84,9 +84,9 @@
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='text-settings'}">
       
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-settings')" v-bind:class="{open : opened_dialog=='text-settings'}">
+        <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-settings')" v-bind:class="{open : opened_dialog=='text-settings'}" title="<%=__("tool_font")%>">
           <span class="icon icon-text-typeface"></span>
-          <span class="icon-label">Font</span>
+          <span class="icon-label"><%=__("tool_font")%></span>
         </button>
       </div>