diff --git a/modules/contrib/geolocation/css/geolocation-widget-googlegeocoder.css b/modules/contrib/geolocation/css/geolocation-widget-googlegeocoder.css
index ead6650..9351c8f 100644
--- a/modules/contrib/geolocation/css/geolocation-widget-googlegeocoder.css
+++ b/modules/contrib/geolocation/css/geolocation-widget-googlegeocoder.css
@@ -1,3 +1,4 @@
+
 /**
  * @file
  * CSS for Google Map widget of Geolocation field.
@@ -19,13 +20,10 @@
 }
 
 .geocode-controlls-wrapper {
-  display: flex;
-  font-size: 12px;
-  padding: 0.3em;
-  margin: 0.2em;
-  background-color: #fff;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
-  text-overflow: ellipsis;
+  display: block;
+  width: 100%;
+  font-size: 14px;
+  margin: 1em 0 0 1em;
 }
 
 .geocode-controlls-wrapper input,
@@ -33,8 +31,11 @@
   position: relative;
   padding: 0;
   font-size: inherit;
+  height: 32px;
   outline: none;
   vertical-align: top;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
+  text-overflow: ellipsis;
   border: 1px solid transparent;
   -webkit-box-sizing: content-box;
   -moz-box-sizing: content-box;
@@ -48,7 +49,8 @@
   padding: 0 1em;
   border-radius: 2px 0 0 2px;
   background-color: #fff;
-  max-width: 50vw !important;
+  width: 40%;
+  max-width: 350px;
   z-index: 3;
 }
 .geocode-controlls-wrapper input:focus {
@@ -65,48 +67,54 @@
 
 .geocode-controlls-wrapper .geolocation-map-indicator {
   z-index: 1;
+  position: relative;
   background-color: rgba(174, 213, 129, 0.75);
+  -webkit-transition: all 0.5s ease;
+  -moz-transition: all 0.5s ease;
+  -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
+  text-align: right;
+  margin-left: 10%;
+  width: 40%;
+  border-radius: 0px 0px 2px 2px;
+  padding: 0px 2%;
+  top: -20px;
   color: rgb(255,255,255);
 }
 .geocode-controlls-wrapper .geolocation-map-indicator.has-location {
   top: 0px;
   box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.3);
 }
-button.submit,button.clear , button.getposition{
-  margin: 0 0.5em 0 0;
+
+button.submit {
   background-color: #4d90fe;
   background-image: -webkit-linear-gradient(top,#4d90fe,#4787ed);
-  border-radius: 2px;
-  padding:0 .1em
-}
-button.submit {
   border-radius: 0 2px 2px 0;
+  width: 72px;
 }
 button.submit::before {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAABVUlEQVRYw+2YQRGEMAxFkVAJlYAEJCABCUhAQiWshJWABCRUAg7+XsrMTkibNDBdDvtnek0fSfqToQPQPeE8AuK5IDkBGAC8AESctQEIAHxXKTUIgB7ACr0CAHcrCIAJNm0A+ltALkAc2jWlKoKkcnCKCdCR0i3p4lNmroJwPRGEgC6VhGo2gaTXUQUhwEQryKsmUOaZU40WEOoTk8Eb3iTGYgGhcgaQmcRYL4N0BjHl+RnIeDuI1iFJ8EBivC0gm7bRCsGj1ktKIIGx6pohNjNZ9RYQnxliTgHRM1a/XrH4kIEZhEzstT0mgeTmBpJZzemJjgk65naTO9aAPvOFtavAWMqKdjHyhcxIW9quGRVVO2uh/lTr8fWMqbEw1cvzV/AlXXico2c884IgwZhADMY2STBNQDQwzUAkmKYgAoxvClKAGZqDMDBb89IwRjlI0/f/W+ID3tQLQPib2qQAAAAASUVORK5CYII=);
-  background-size: 28px;
+  background-size: 17px;
   content: "";
   display: block;
-  height: 28px;
+  height: 17px;
   margin: 0 auto;
-  width: 28px;
+  width: 17px;
 }
-button.clear::before {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABVklEQVRYhc3XOU4EMRBAUR8AiV0iYIeQhJSI+xGQcwQSCDkDww4iYF9zhEgQwSOYaRi2abvdUlNp2/W/2kuVQwghYAlbeMYlVtAXagqMYQ0PeMImFoqPy3j1Mw4xWgN8Fre/5H/BYkDrl4+1SGDmD3gRGwFvPQZUlsA0bkpyPwbtdS+LJAlM4Toi72nAesTAaAlM4ioy52rAKM7rkEiE76C/mDihffwqSyTm2MFAjv0XCYzjInLuLgZzN8+HRAceu4R7GCrbRDHHp4gjnEWO3cdwT3hFiVj4SBS8S6LsFouNg2R4l8Qs7jLg+fUEc7ivAD/OhndJzCdKnNQG7wiMi9/tsK245WqCx57zeiUy4PkS0q7XXtFKlqgRni6RCE+5issltEtqLLxKMWr5XoZz4BX/2k+JHPi3HLENyaeEplsy/6Apbbwtb/xh0vjTrNnHaWdQY8/zdyVR5C7T2pSEAAAAAElFTkSuQmCC');
-  background-size: 24px;
-  content: "";
-  display: block;
-  height: 24px;
-  margin: 0 auto;
-  width: 24px;
+
+button.clear {
+  margin: 0 0.5em;
+  background-color: #736648;
+  background-image: -webkit-linear-gradient(top,#736648,#685C41);
+  border-radius: 2px;
+  width: 36px;
 }
-button.getposition::before {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAMAAAAocOYLAAABXFBMVEVNkP5OkP5Okf5Pkf5Qkv5Rk/5Sk/5Tk/5TlP5UlP5Vlf5Wlv5Xlv5Xl/5Yl/5amP5bmf5cmf5cmv5dmv5emv5knv5noP5oof5qov5ro/5spP5upP5vpf5wpv5xp/5yp/5zqP50qP51qf52qv54q/55q/58rf58rv5+rv6Csf6Dsv6Ktv6Lt/6Mt/6Puf6Quv6Ruv6Su/6Wvv6Zv/6cwf6dwv6gxP6hxP6nyP+oyf+ry/+sy/+00P+10f+81f+91v++1/+/1//A2P/C2f/D2v/E2v/H3P/N4P/O4f/Q4f/S4//U5P/W5f/X5v/Z5//a6P/b6P/b6f/c6f/d6v/e6//f6//g6//i7f/k7v/l7//m7//n8P/o8f/p8v/q8v/r8v/r8//t9P/u9P/v9f/w9f/x9v/y9//0+P/1+P/1+f/3+v/5+//5/P/6/P/7/P/8/f/9/v/+/v/+//////8GZRwmAAABl0lEQVR42q1TZ1PCQBC9XIJRBFHsHRV7L2DvBSug0QCCvaOEJPv/Z9yLCTpHxvGDmy+7+y57u+/ekn80gcoKQJxK7jDLnwMkCZEEFxhRbygLkG6TWcCbSOrn9nKaYWiZ3RkfhtzdZDoOJTsaJfwVSxoYANnjkxygk49yxRcAIL/SGvBVBzrWC3gkislveKJggtLhxP0ZgNcRQp3BSIMKcNbAXFFkFzdfYg9ewW5NJPNgvrVgS9SK8QtrxseUPSUl/gPDXLbyck9ItI5sGLDpEawKVZ6BR9NsoniwK3Zzvd1I0A2BmeqUKxiuXlzpkPITQQjsA9qWhP/XPYGWVRWGY6oI+16cYvBZL2r6bRe6NSqjA0p4jMcvSriSzLrXT58mvvrv/e7v/m6n1F+zTQ+tiZn2fJXhPsmZb80jUZveSDk/ZmGSSA6/QcXhV5Icfg8dflmB8Xf+fZ6HCOXfd7W91uer62bvq89yElrMs4Hv44kHQOclUqavsZ/6GsYEr88g6rP4pc9qDH/Vt+i2Ptx+uO0Xw3GP/m6fYzZ1EQBGuaQAAAAASUVORK5CYII=);
-  background-size: 24px;
+button.clear::before {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADcAAAA3CAYAAACo29JGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MEEyNTM1QjBBMjA2ODExODA4MzkzODI3MjczQzA3MCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoyNzhDRDg3QTQ5MEExMUU0QTdGMkM1NzMyMDlBMjJBNSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyNzhDRDg3OTQ5MEExMUU0QTdGMkM1NzMyMDlBMjJBNSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzBBMjUzNUIwQTIwNjgxMTgwODM5MzgyNzI3M0MwNzAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzBBMjUzNUIwQTIwNjgxMTgwODM5MzgyNzI3M0MwNzAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5jChSGAAAB2UlEQVR42tTaS07DQAwG4JANCSu4AuIstN3BJWFJyYaUy3ACRFclrAYPZKRplMfMxPbYln5VSh3JX9W6UZTCGFN42UL2kGpwXHou+7m3/vEh7Nv8V6sIaGFv/dydD3QNGw9mFAF9mBkCp2AagGOwM6BtejXzJRE4B3PV2MYaclAEDIFZz5U7QQuwCoUNt6V0YBRsiHPAViAwGjaGkwhMgk3hJAGTYXM4CcBVsCVcDLCWBgvB5QCiwEJxnEA0WAyOA4gKi8VRAtFhKTgKIAksFYcJJIOtwWEASWFrcWuA5DAMXAqQBYaFiwHecMEwcaHALy6YzcWfEK8qyB6ySTj3HfIIOWENUxa41UEeIIfcMApcCpAEZgv7a+nXNeSjf52qI+QO8kkxQEkEs7+95wWY+wCeILUWnIW9QLaB/ff9Eqql42JhpMCSGXbkBJaMMLsVbxe2KC6Q8Z6Hf23ZRvRnu/yKhRWcwBwwNmAuGAswJ4wcmBtGCpQAIwNKgZEAJcHQgdJgqMBsa5oDKBWGModk2Op5pMNWzaUBljyfFljSnJpg0cCQp/YkwWKAjXtCtlMECwFaz8417kaAkmFzwK73nG1LH6gBNgb8cbCx/zn7RqMI5gMbH2bzK8AAUThtyVYr9bAAAAAASUVORK5CYII=);
+  background-size: 12px;
   content: "";
   display: block;
-  height: 24px;
+  height: 12px;
   margin: 0 auto;
-  width: 24px;
+  width: 12px;
 }
diff --git a/modules/contrib/geolocation/js/geolocation-widget-googlegeocoder.js b/modules/contrib/geolocation/js/geolocation-widget-googlegeocoder.js
index 6c3aae2..bff4879 100644
--- a/modules/contrib/geolocation/js/geolocation-widget-googlegeocoder.js
+++ b/modules/contrib/geolocation/js/geolocation-widget-googlegeocoder.js
@@ -65,85 +65,8 @@
         // Add any missing settings.
         map.settings = $.extend(geolocation.default_settings(), map.settings);
 
-                // Set the lat / lng immediately from HTML5 getCurrentPosition if not already set.
+        // Set the lat / lng if not already set.
         if (map.lat === 0 || map.lng === 0) {
-
-     if (navigator.geolocation) {
-
-       // Get the geolocation from the browser.
-       navigator.geolocation.getCurrentPosition(
-
-   // Success handler for getCurrentPosition()
-   function (position) {
-     var lat = position.coords.latitude;
-     var lng = position.coords.longitude;
-     var accuracy = position.coords.accuracy;
-
-     // Set the values of hidden form inputs.
-     $(".geolocation-hidden-lat").val(lat);
-     $(".geolocation-hidden-lng").val(lng);
-if (typeof map.marker !== 'undefined') {
-      map.marker.setMap();
-    }
-   map.marker = new google.maps.Marker({
-     position: {lat,lng},
-     map: map.google_map,
-     title: Drupal.t('Votre position actuelle')
-   });
-                //Draw a circle representing GetCurrentPosition accuracy
-   var circle = new google.maps.Circle({
-     center: {lat,lng},
-     radius: accuracy,
-     map: map.google_map,
-     fillColor: '#4285F4',
-     fillOpacity: 0.2,
-     strokeColor: '#4285F4',
-     strokeOpacity: 0.5,
-     clickable:false,
-   });
-
-   //Set the zoom level to the accuracy circle's size
-   map.google_map.fitBounds(circle.getBounds());
-   //Delete the accuracy circle when the marker is moved elsewhere
-    google.maps.event.addListener(map.google_map, 'click', function(e){
-     circle.setMap(null);
-   });
-                //Delete the accuracy circle when the marker is moved within the circle
-    google.maps.event.addListener(circle, 'click', function(e){
-     circle.setMap(null);
-   });
-   },
- 
-     // Error handler for getCurrentPosition()
-     function(error) {
-
-       // Alert with error message.
-       switch(error.code) {
-         case error.PERMISSION_DENIED:
-           alert(Drupal.t('No location data found. Reason: PERMISSION_DENIED.'));
-           break;
-         case error.POSITION_UNAVAILABLE:
-           alert(Drupal.t('No location data found. Reason: POSITION_UNAVAILABLE.'));
-           break;
-         case error.TIMEOUT:
-           alert(Drupal.t('No location data found. Reason: TIMEOUT.'));
-           break;
-         default:
-           alert(Drupal.t('No location data found. Reason: Unknown error.'));
-           break;
-       }
-     },
-     // Options for getCurrentPosition(), commented out to prevent timeout errors and starting the GPS device. 
-     {
-      //  enableHighAccuracy: true,
-      //  timeout: 15000,
-      //  maximumAge: 5000
-     }
-         );
-         
-
-       }
-
           map.lat = $('.geolocation-hidden-lat.for-' + map.id).attr('value');
           map.lng = $('.geolocation-hidden-lng.for-' + map.id).attr('value');
         }
diff --git a/modules/contrib/geolocation/js/geolocation.js b/modules/contrib/geolocation/js/geolocation.js
index d336ada..2fe0ee4 100644
--- a/modules/contrib/geolocation/js/geolocation.js
+++ b/modules/contrib/geolocation/js/geolocation.js
@@ -86,24 +86,10 @@
     // Get the center point.
     var center = new google.maps.LatLng(map.lat, map.lng);
 
-    // Create the map object with custom settings and assign it to the map.
+    // Create the map object and assign it to the map.
     map.google_map = new google.maps.Map(map.container, {
       zoom: parseInt(map.settings.zoom),
       center: center,
-      scrollwheel: true,
-      panControl: false,
-      zoomControl: true,
-      zoomControlOptions: {
-        style: google.maps.ZoomControlStyle.LARGE,
-        position: google.maps.ControlPosition.RIGHT_CENTER
-      },
-      mapTypeControl: true,
-      mapTypeControlOptions: {
-        position: google.maps.ControlPosition.RIGHT_BOTTOM
-      },
-      scaleControl: false,
-      streetViewControl: false,
-      overviewMapControl: false,
       mapTypeId: google.maps.MapTypeId[map.settings.type]
     });
 
@@ -163,8 +149,6 @@
       .append($('<input type="text" class="input" placeholder="Enter a location" />'))
       // Create submit button
       .append($('<button class="submit" />'))
-      // Create getposition button in order to call the html5 getCurrentLocation again without having to reload form
-      .append($('<button class="getposition" />'))
       // Create clear button
       .append($('<button class="clear" />'))
       // Create clear button
@@ -181,109 +165,12 @@
 
     map.controls.index = 1;
 
-    //Center the geocoder widget map around France before any value is set
-    var bounds = new google.maps.LatLngBounds();
-    bounds.extend(new google.maps.LatLng(49.31144851208598, 5.882561523437516));
-    bounds.extend(new google.maps.LatLng(43.58174309299269, -1.025098632812501));
-    map.google_map.fitBounds(bounds);
-
     map.google_map.controls[google.maps.ControlPosition.TOP_LEFT].push(map.controls);
 
     // Add the listened for the search click event.
     google.maps.event.addDomListener($(map.controls).children('button.submit')[0], 'click', handleControlEvent);
     // Add the listened for the search click event.
     google.maps.event.addDomListener($(map.controls).children('input.input')[0], 'keyup', handleControlEvent);
-    // Add the event listener for the getposition button. This is very clumsy, but I can't seem to find how to make getCurrentPosition a global and just call it from here instead of duplicating code  
-    google.maps.event.addDomListener($(map.controls).children('button.getposition')[0], 'click', function(e) {
-      // Stop all that bubbling and form submitting.
-      e.preventDefault();
-      // Remove the coordinates.
-      $(map.controls).children('.geolocation-map-indicator').text('').removeClass('has-location');
-      // Clear the map point.
-      map.marker.setMap();
-      if (navigator.geolocation) {
-
-        // Get the geolocation from the browser.
-        navigator.geolocation.getCurrentPosition(
-
-          // Success handler for getCurrentPosition()
-          function(position) {
-            var lat = position.coords.latitude;
-            var lng = position.coords.longitude;
-            var accuracy = position.coords.accuracy;
-
-            // Set the values of hidden form inputs.
-            $(".geolocation-hidden-lat").val(lat);
-            $(".geolocation-hidden-lng").val(lng);
-
-            map.marker = new google.maps.Marker({
-              position: {
-                lat,
-                lng
-              },
-              map: map.google_map,
-              title: Drupal.t('Your current location')
-            });
-
-            var circle = new google.maps.Circle({
-              center: {
-                lat,
-                lng
-              },
-              radius: accuracy,
-              map: map.google_map,
-              fillColor: '#4285F4',
-              fillOpacity: 0.2,
-              strokeColor: '#4285F4',
-              strokeOpacity: 0.5,
-              clickable: false,
-            });
-
-            //set the zoom level to the circle's size
-            map.google_map.fitBounds(circle.getBounds());
-
-            google.maps.event.addListener(map.google_map, 'click', function(e) {
-              circle.setMap(null);
-            });
-            google.maps.event.addListener(circle, 'click', function(e) {
-              circle.setMap(null);
-            });
-          },
-
-          // Error handler for getCurrentPosition()
-          function(error) {
-
-            // Alert with error message.
-            switch (error.code) {
-              case error.PERMISSION_DENIED:
-                alert(Drupal.t('No location data found. Reason: PERMISSION_DENIED.'));
-                break;
-              case error.POSITION_UNAVAILABLE:
-                alert(Drupal.t('No location data found. Reason: POSITION_UNAVAILABLE.'));
-                break;
-              case error.TIMEOUT:
-                alert(Drupal.t('No location data found. Reason: TIMEOUT.'));
-                break;
-              default:
-                alert(Drupal.t('No location data found. Reason: Unknown error.'));
-                break;
-            }
-          },
-          // Options for getCurrentPosition()
-          {
-            //  enableHighAccuracy: true,
-            //  timeout: 15000,
-            //  maximumAge: 5000
-          }
-        );
-
-      }
-
-      map.lat = $('.geolocation-hidden-lat.for-' + map.id).attr('value');
-      map.lng = $('.geolocation-hidden-lng.for-' + map.id).attr('value');
-
-    });
-
     // Add the event listener for the remove button.
     google.maps.event.addDomListener($(map.controls).children('button.clear')[0], 'click', function(e) {
       // Stop all that bubbling and form submitting.