diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 716e44a7..c13b4c3b 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -920,6 +920,15 @@
     "gpsHead": {
         "message": "GPS"
     },
+    "gpsMapHead": {
+        "message": "Current GPS location"
+    },
+    "gpsMapMessage1": {
+        "message": "Please check your internet connection"
+    },
+    "gpsMapMessage2": {
+        "message": "Waiting for GPS 3D fix…"
+    },
     "gps3dFix": {
         "message": "3D Fix:"
     },
diff --git a/tabs/gps.css b/tabs/gps.css
index 5aca28ad..d5e78ab3 100644
--- a/tabs/gps.css
+++ b/tabs/gps.css
@@ -87,6 +87,14 @@
     float: right;
 }
 
+.tab-gps #loadmap .controls a:hover {
+    background-color: #f5f5f5;
+}
+
+.tab-gps #loadmap .controls a:active {
+    background-color: #e6e6e6;
+}
+
 .tab-gps #loadmap .controls a:first-child {
     margin-left: -1px;
     margin-right: 5px;
diff --git a/tabs/gps.html b/tabs/gps.html
index 64962911..e2ad57e6 100644
--- a/tabs/gps.html
+++ b/tabs/gps.html
@@ -148,14 +148,13 @@
         <div class="cf_column half">
             <div class="gui_box grey gps_map">
                 <div class="gui_box_titlebar" style="margin-bottom: 0px;">
-                        <div class="spacer_box_title" i18n="gpsHead"></div>
+                        <div class="spacer_box_title" i18n="gpsMapHead"></div>
                 </div>
-                <div id="connect">
-                    Please check your internet connection
+                <div id="connect" i18n="gpsMapMessage1">
                     <div class="default_btn" style="width:50px; margin-left:auto; margin-right:auto; float:none;"><a id="check">retry</a></div>
                 </div>
-                <div id="waiting">
-                    <div class="info">Waiting for GPS 3D fix…</span>
+                <div id="waiting" >
+                    <div class="info" i18n="gpsMapMessage2"></span>
                 </div>
             </div>
                 <div id="loadmap">