diff --git a/WebContent/gui/OSRM.GUIBoxHandle.js b/WebContent/gui/OSRM.GUIBoxHandle.js
index 5384ffbf8..0a07e57b7 100644
--- a/WebContent/gui/OSRM.GUIBoxHandle.js
+++ b/WebContent/gui/OSRM.GUIBoxHandle.js
@@ -37,6 +37,7 @@ OSRM.GUIBoxHandle = function( box_name, side, css, transitionStartFct, transitio
 	var icon = document.createElement('div');
 	icon.id = box_name + '-handle-icon';
 	icon.className = 'iconic-button';
+	icon.title = box_name;
 	
 	content.appendChild(icon);
 	wrapper.appendChild(content);
diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js
index d0c57b45a..1e8226fe3 100644
--- a/WebContent/gui/OSRM.MainGUI.js
+++ b/WebContent/gui/OSRM.MainGUI.js
@@ -73,6 +73,9 @@ setLabels: function() {
 	document.getElementById('gui-data-timestamp').innerHTML = OSRM.G.data_timestamp;
 	document.getElementById('gui-timestamp-label').innerHTML = OSRM.loc("GUI_VERSION");	
 	document.getElementById('gui-timestamp').innerHTML = OSRM.DATE+"; v"+OSRM.VERSION;
+	document.getElementById('config-handle-icon').title = OSRM.loc("GUI_CONFIGURATION");
+	document.getElementById('mapping-handle-icon').title = OSRM.loc("GUI_MAPPING_TOOLS");
+	document.getElementById('main-handle-icon').title = OSRM.loc("GUI_MAIN_WINDOW");
 	
 	document.getElementById("gui-units-toggle").getElementsByTagName("option")[0].innerHTML = OSRM.loc("GUI_KILOMETERS");
 	document.getElementById("gui-units-toggle").getElementsByTagName("option")[1].innerHTML = OSRM.loc("GUI_MILES");
diff --git a/WebContent/localization/OSRM.Locale.de.js b/WebContent/localization/OSRM.Locale.de.js
index 49a4f193f..2a30fe3cd 100644
--- a/WebContent/localization/OSRM.Locale.de.js
+++ b/WebContent/localization/OSRM.Locale.de.js
@@ -32,6 +32,7 @@ OSRM.Localization["de"] = {
 "GUI_REVERSE": "Umdrehen",
 "GUI_START_TOOLTIP": "Startposition eingeben",
 "GUI_END_TOOLTIP": "Zielposition eingeben",
+"GUI_MAIN_WINDOW": "Hauptfenster",
 //config
 "GUI_CONFIGURATION": "Einstellungen",
 "GUI_LANGUAGE": "Sprache",
diff --git a/WebContent/localization/OSRM.Locale.dk.js b/WebContent/localization/OSRM.Locale.dk.js
index e2fd073a5..845d57bbf 100644
--- a/WebContent/localization/OSRM.Locale.dk.js
+++ b/WebContent/localization/OSRM.Locale.dk.js
@@ -32,6 +32,7 @@ OSRM.Localization["dk"] = {
 "GUI_REVERSE": "Omvendt",
 "GUI_START_TOOLTIP": "Indtast start",
 "GUI_END_TOOLTIP": "Indtast destination",
+"GUI_MAIN_WINDOW": "Hovedvinduet",
 //config
 "GUI_CONFIGURATION": "Konfiguration",
 "GUI_LANGUAGE": "Sprog",
diff --git a/WebContent/localization/OSRM.Locale.en.js b/WebContent/localization/OSRM.Locale.en.js
index 34c6c58b2..9c474b1cc 100644
--- a/WebContent/localization/OSRM.Locale.en.js
+++ b/WebContent/localization/OSRM.Locale.en.js
@@ -32,6 +32,7 @@ OSRM.Localization["en"] = {
 "GUI_REVERSE": "Reverse",
 "GUI_START_TOOLTIP": "Enter start",
 "GUI_END_TOOLTIP": "Enter destination",
+"GUI_MAIN_WINDOW": "Main window",
 // config
 "GUI_CONFIGURATION": "Configuration",
 "GUI_LANGUAGE": "Language",
diff --git a/WebContent/localization/OSRM.Locale.es.js b/WebContent/localization/OSRM.Locale.es.js
index b73071fa8..c34b851ee 100644
--- a/WebContent/localization/OSRM.Locale.es.js
+++ b/WebContent/localization/OSRM.Locale.es.js
@@ -32,6 +32,7 @@ OSRM.Localization["es"] = {
 "GUI_REVERSE": "Invertir",
 "GUI_START_TOOLTIP": "Escriba la dirección de origen",
 "GUI_END_TOOLTIP": "Escriba la dirección de destino",
+"GUI_MAIN_WINDOW": "Ventana principal",
 // config
 "GUI_CONFIGURATION": "Configuración",
 "GUI_LANGUAGE": "Idioma",
diff --git a/WebContent/localization/OSRM.Locale.fi.js b/WebContent/localization/OSRM.Locale.fi.js
index 2ec632d3c..67268c660 100644
--- a/WebContent/localization/OSRM.Locale.fi.js
+++ b/WebContent/localization/OSRM.Locale.fi.js
@@ -32,6 +32,7 @@ OSRM.Localization["fi"] = {
 "GUI_REVERSE": "Käänteinen reitti",
 "GUI_START_TOOLTIP": "Syötä lähtöpaikka",
 "GUI_END_TOOLTIP": "Syötä määränpää",
+"GUI_MAIN_WINDOW": "Pääikkuna",
 //config
 "GUI_CONFIGURATION": "Kokoonpano",
 "GUI_LANGUAGE": "Kieli",
diff --git a/WebContent/localization/OSRM.Locale.fr.js b/WebContent/localization/OSRM.Locale.fr.js
index 7cd1ce992..571c2d144 100644
--- a/WebContent/localization/OSRM.Locale.fr.js
+++ b/WebContent/localization/OSRM.Locale.fr.js
@@ -32,6 +32,7 @@ OSRM.Localization["fr"] = {
 "GUI_REVERSE": "Inverser",
 "GUI_START_TOOLTIP": "Entrez le lieu de départ",
 "GUI_END_TOOLTIP": "Entrez le lieu d’arrivée",
+"GUI_MAIN_WINDOW": "Fenêtre principale",
 //config
 "GUI_CONFIGURATION": "Configuration",
 "GUI_LANGUAGE": "Langue",
diff --git a/WebContent/localization/OSRM.Locale.it.js b/WebContent/localization/OSRM.Locale.it.js
index 01b061d4e..aad98464e 100644
--- a/WebContent/localization/OSRM.Locale.it.js
+++ b/WebContent/localization/OSRM.Locale.it.js
@@ -32,6 +32,7 @@ OSRM.Localization["it"] = {
 "GUI_REVERSE": "Inverti",
 "GUI_START_TOOLTIP": "Inserire la Partenza",
 "GUI_END_TOOLTIP": "Inserire la destinazione",
+"GUI_MAIN_WINDOW": "Finestra principale",
 //config
 "GUI_CONFIGURATION": "Configurazione",
 "GUI_LANGUAGE": "Lingua",
diff --git a/WebContent/localization/OSRM.Locale.lv.js b/WebContent/localization/OSRM.Locale.lv.js
index d4ee396f0..9b3aa21c4 100644
--- a/WebContent/localization/OSRM.Locale.lv.js
+++ b/WebContent/localization/OSRM.Locale.lv.js
@@ -32,6 +32,7 @@ OSRM.Localization["lv"] = {
 "GUI_REVERSE": "Pretējā virzienā",
 "GUI_START_TOOLTIP": "Izvēlieties sākumu",
 "GUI_END_TOOLTIP": "Izvēlieties galamērķi",
+"GUI_MAIN_WINDOW": "Galvenais logs",
 // config
 "GUI_CONFIGURATION": "Konfigurācija",
 "GUI_LANGUAGE": "Valoda",
diff --git a/WebContent/localization/OSRM.Locale.pl.js b/WebContent/localization/OSRM.Locale.pl.js
index 6acaf1f32..a1c74d452 100644
--- a/WebContent/localization/OSRM.Locale.pl.js
+++ b/WebContent/localization/OSRM.Locale.pl.js
@@ -32,6 +32,7 @@ OSRM.Localization["pl"] = {
 "GUI_REVERSE": "Odwróć",
 "GUI_START_TOOLTIP": "Wprowadź początek",
 "GUI_END_TOOLTIP": "Wprowadź koniec",
+"GUI_MAIN_WINDOW": "Główne okno",
 //config
 "GUI_CONFIGURATION": "Konfiguracja",
 "GUI_LANGUAGE": "Język",
diff --git a/WebContent/localization/OSRM.Locale.ru.js b/WebContent/localization/OSRM.Locale.ru.js
index 4007c5bf7..77d427074 100644
--- a/WebContent/localization/OSRM.Locale.ru.js
+++ b/WebContent/localization/OSRM.Locale.ru.js
@@ -32,6 +32,7 @@ OSRM.Localization["ru"] = {
 "GUI_REVERSE": "Обратно",
 "GUI_START_TOOLTIP": "Укажите начальную точку",
 "GUI_END_TOOLTIP": "Укажите пункт назначения",
+"GUI_MAIN_WINDOW": "Главное окно",
 // config
 "GUI_CONFIGURATION": "Настройки",
 "GUI_LANGUAGE": "Язык",