Merge remote-tracking branch 'upstream/pull/4735'

diff --combined app/assets/stylesheets/common.scss
index 84d78814bc6635f4afc5ccb07c32af97167ab974,eba3df61be6ca6e4b13012cd65b812b6904e2d78..17d20c812fde63b1b9fec1b5b237f5448dbdaf2e
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1,4 -1,6 +1,6 @@@
+ @use "sass:map";
  @import "parameters";
+ @import "browse";
  @import "bootstrap";
  @import "rails_bootstrap_forms";
  
@@@ -474,13 -476,6 +476,13 @@@ body.small-nav 
    }
  }
  
 +@include color-mode(dark) {
 +  .leaflet-tile-container,
 +  .mapkey-table-entry td:first-child > * {
 +    filter: brightness(.8);
 +  }
 +}
 +
  /* Rules for attribution text under the main map shown on printouts */
  
  .donate-attr { color: darken($green, 10%) !important; }
@@@ -1017,4 -1012,32 +1019,32 @@@ img.trace_image 
    }
  }
  
- @import 'browse';
+ /* Rules for map sidebar icons */
+ 
+ .browse-section {
+   .node::before,
+   .way::before,
+   .relation::before {
+     display: inline-block;
+     width: 25px;
+     margin-left: -25px;
+   }
+ 
+   .node, .way, .relation {
+     margin-left: 25px;
+   }
+ }
+ 
+ @each $class, $item in $map-sidebar-icons {
+   .browse-section #{$class}::before {
+     content: image-url('browse/#{map.get($item, "filename")}');
+   }
+ 
+   @if map.get($item, "invert") {
+     @include color-mode(dark) {
+       .browse-section #{$class}::before {
+         filter: invert(.8) hue-rotate(180deg);
+       }
+     }
+   }
+ }