diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index bafef0c45f..96a9badeff 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -27,10 +27,10 @@
             {% endblock favicon %}
 
             {% block header_stylesheet %}
+                <link rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/geonames/geonames.css' }) }}">
                 <link rel="stylesheet" href="{{ path('minifier', { 'g' : 'authentication_css' }) }}">
-
                 <!--[if lte IE 8]>
-                    <link rel="stylesheet" href="{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome-ie7.min.css' }) }}">
+                    <link rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/font-awesome/css/font-awesome-ie7.min.css' }) }}">
                 <![endif]-->
             {% endblock header_stylesheet %}
 
diff --git a/www/skins/geonames/geonames.css b/www/skins/geonames/geonames.css
index 3a222d174f..32d94235d9 100644
--- a/www/skins/geonames/geonames.css
+++ b/www/skins/geonames/geonames.css
@@ -3,6 +3,7 @@
     overflow-y: auto;
     /* prevent horizontal scrollbar */
     overflow-x: hidden;
+    list-style-type: none;
 }
 
 .geocompleter-menu .region {
diff --git a/www/skins/login/less/skin.less b/www/skins/login/less/skin.less
index 12ff749e7a..a835ec6e6e 100644
--- a/www/skins/login/less/skin.less
+++ b/www/skins/login/less/skin.less
@@ -802,10 +802,6 @@ form[name=registerForm] .multiselect-group {
     .glow(@sideBarGlow);
 }
 
-.geocompleter-menu .ui-menu-item.selected {
-        border: 2px solid @green;
-}
-
 .geocompleter-menu .ui-menu-item a.ui-state-focus,
 .geocompleter-menu .ui-menu-item a.ui-state-hover,
 .geocompleter-menu .ui-menu-item a.ui-state-active {
@@ -818,6 +814,15 @@ form[name=registerForm] .multiselect-group {
 
 .geocompleter-menu .ui-menu-item:nth-child(odd) {
      background: lighten(@backgroundSideBar, 25%);
+     border: 1px solid lighten(@backgroundSideBar, 25%);
+}
+
+.geocompleter-menu .ui-menu-item:nth-child(even) {
+     border: 1px solid @backgroundSideBar;
+}
+
+.geocompleter-menu .ui-menu-item.selected {
+        border: 1px solid @green;
 }
 
 .geocompleter-menu .region {