Merge branch 'master' into conflict-resolution-ui

css/app.css

@@ -2047,10 +2047,12 @@ img.wiki-image {
 }
 
 .map-data-control .map-overlay,
-.background-control .map-overlay {
+.background-control .map-overlay,
+.help-control .map-overlay {
     z-index: -1;
 }
 
+
 /* Geolocator */
 
 .geolocate-control {
@@ -2668,6 +2670,7 @@ img.wiki-image {
 
 .tooltip-inner {
     display: inline-block;
+    border-radius: 3px;
     max-width: 200px;
     min-width: 80px;
     padding: 10px;
@@ -2700,6 +2703,7 @@ img.wiki-image {
 }
 
 .tail div {
+    border-radius: 3px;
     padding: 10px;
     background: white;
     position: absolute;
@@ -2767,6 +2771,7 @@ img.wiki-image {
     background: #F6F6F6;
     padding: 10px;
     margin: 10px -10px -10px;
+    border-radius: 0 0 3px 3px;
 }
 
 .tooltip-inner .keyhint {