X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/970e1a99d7dce64f0631e88c5b9f060fb48d75fe..2142ff02c2442d28580ff99080bc1219c2bfe59f:/vendor/assets/iD/iD.css.erb?ds=inline

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 2f22d247c..8fed86e62 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -161,31 +161,106 @@ input::-moz-focus-inner {
 .cf:after {
     clear: both;
 }
+/* base styles */
+.layer-osm path {
+    fill: none;
+}
 
-use { pointer-events: none; }
+/* IE/Edge needs these overrides for markers to show up */
+.layer-osm path.oneway-marker-path          { fill: #000; }
+.layer-osm path.sided-marker-natural-path   { fill: rgb(140, 208, 95); }
+.layer-osm path.sided-marker-coastline-path { fill: #77dede; }
+.layer-osm path.sided-marker-barrier-path   { fill: #ddd; }
+.layer-osm path.sided-marker-man_made-path  { fill: #fff; }
 
-/* base styles */
-.layer-osm path:not(.oneway) { fill: none; }     /* IE needs :not(.oneway) */
+/* IE/Edge rule for <use> marker style */
+.layer-osm path.viewfield-marker-path {
+    fill: #333;
+    fill-opacity: 0.75;
+    stroke: #fff;
+    stroke-width: 0.5px;
+    stroke-opacity: 0.75;
+}
+.fill-wireframe .layer-osm path.viewfield-marker-path {   /* IE/Edge rule for <use> marker style */
+    fill: none;
+}
 
 /* the above fill: none rule affects paths in <use> shadow dom only in Firefox */
 .layer-osm use.icon path { fill: #333; }                       /* FF svg Maki icons */
 .layer-osm .turn use path { fill: #000; }                      /* FF turn restriction icons */
-#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; }  /* FF turn-only, turn-only-u */
-#turn-no-shape2, #turn-no-u-shape2     { fill: #E06D5F; }  /* FF turn-no, turn-no-u */
-#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8CD05F; }  /* FF turn-yes, turn-yes-u */
+#turn-only-shape2, #turn-only-u-shape2 { fill: #7092ff; }      /* FF turn-only, turn-only-u */
+#turn-no-shape2, #turn-no-u-shape2     { fill: #e06d5f; }      /* FF turn-no, turn-no-u */
+#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8cd05f; }      /* FF turn-yes, turn-yes-u */
 
-g.point .shadow,
-g.vertex .shadow,
-g.midpoint .shadow {
-    pointer-events: all;
+
+/* No interactivity except what we specifically allow */
+.data-layer.osm *,
+.data-layer.notes *,
+.data-layer.keepRight *,
+.data-layer.improveOSM * {
+    pointer-events: none;
 }
 
-path.shadow {
+.lasso #map {
+    pointer-events: visibleStroke;
+}
+
+
+/* `.target` objects are interactive */
+/* They can be picked up, clicked, hovered, or things can connect to them */
+.qa_error.target,
+.note.target,
+.node.target,
+.turn .target {
+    pointer-events: fill;
+    fill-opacity: 0.8;
+    fill: currentColor;
+    stroke: none;
+}
+
+.way.target {
     pointer-events: stroke;
+    fill: none;
+    stroke-width: 12;
+    stroke-opacity: 0.8;
+    stroke: currentColor;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+}
+
+
+/* `.target-nope` objects are explicitly forbidden to join to */
+.surface:not(.nope-disabled) .node.target.target-nope,
+.surface:not(.nope-disabled) .way.target.target-nope {
+    cursor: not-allowed;
+}
+
+
+/* `.active` objects (currently being drawn or dragged) are not interactive */
+/* This is important to allow the events to drop through to whatever is */
+/* below them on the map, so you can still hover and connect to other things. */
+.layer-osm .active {
+    pointer-events: none !important;
 }
 
+/* points, notes & QA */
+
+/* points, notes, markers */
+g.qa_error .stroke,
+g.note .stroke {
+    stroke: #222;
+    stroke-width: 1;
+    fill: #222;
+    opacity: 0.6;
+}
 
-/* points */
+g.qa_error.active .stroke,
+g.note.active .stroke {
+    stroke: #222;
+    stroke-width: 1;
+    fill: #222;
+    opacity: 0.8;
+}
 
 g.point .stroke {
     stroke: #444;
@@ -193,42 +268,50 @@ g.point .stroke {
     fill: #fff;
 }
 
-g.point .shadow {
+g.qa_error .shadow,
+g.point .shadow,
+g.note .shadow {
     fill: none;
     stroke: #f6634f;
-    stroke-width: 8;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 
+g.qa_error.hover:not(.selected) .shadow,
+g.note.hover:not(.selected) .shadow,
 g.point.related:not(.selected) .shadow,
 g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
 
+g.qa_error.selected .shadow,
+g.note.selected .shadow,
 g.point.selected .shadow {
     stroke-opacity: 0.7;
 }
 
-g.point.active, g.point.active * {
-    pointer-events: none;
+/* g.note ellipse.stroke, */
+g.point ellipse.stroke {
+    display: none;
+}
+.mode-drag-note g.note.active ellipse.stroke,
+.mode-drag-node g.point.active ellipse.stroke {
+    display: block;
 }
 
-/* vertices and midpoints */
 
+/* vertices and midpoints */
 g.vertex .fill {
     fill: #000;
 }
-
 g.vertex .stroke {
     stroke: #666;
     stroke-width: 1;
     fill: white;
 }
-
 g.vertex.shared .stroke {
-    fill: #aaa;
+    fill: #bbb;
 }
-
 g.midpoint .fill {
     fill: #eee;
     stroke: #444;
@@ -236,38 +319,13 @@ g.midpoint .fill {
     opacity: .7;
 }
 
-g.midpoint.tag-highway-corridor .fill,
-g.midpoint.tag-highway-pedestrian .fill,
-g.midpoint.tag-highway-steps .fill,
-g.midpoint.tag-highway-path .fill,
-g.midpoint.tag-highway-footway .fill,
-g.midpoint.tag-highway-cycleway .fill,
-g.midpoint.tag-highway-bridleway .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}
-
 g.vertex .shadow,
 g.midpoint .shadow {
+    stroke-width: 6;
     fill: #f6634f;
     fill-opacity: 0;
 }
 
-g.vertex.vertex-hover {
-    display: none;
-}
-
-.mode-draw-area g.vertex.vertex-hover,
-.mode-draw-line g.vertex.vertex-hover,
-.mode-add-area  g.vertex.vertex-hover,
-.mode-add-line  g.vertex.vertex-hover,
-.mode-add-point g.vertex.vertex-hover,
-.mode-drag-node g.vertex.vertex-hover {
-    display: block;
-}
-
 g.vertex.related:not(.selected) .shadow,
 g.vertex.hover:not(.selected) .shadow,
 g.midpoint.related:not(.selected) .shadow,
@@ -279,24 +337,18 @@ g.vertex.selected .shadow {
     fill-opacity: 0.7;
 }
 
-.mode-draw-area g.midpoint,
-.mode-draw-line g.midpoint,
-.mode-add-area g.midpoint,
-.mode-add-line g.midpoint,
-.mode-add-point g.midpoint {
-  display: none;
-}
 
 /* lines */
-
-.preset-icon .icon.other-line {
-    color: #fff;
-    fill: #777;
+.preset-icon .icon.iD-other-line {
+    color: #989898;
+}
+.preset-icon-line path.casing {
+    stroke: #afafaf;
 }
 
 path.line {
     stroke-linecap: round;
-    stroke-linejoin: bevel;
+    stroke-linejoin: round;
 }
 
 path.stroke {
@@ -306,7 +358,7 @@ path.stroke {
 
 path.shadow {
     stroke: #f6634f;
-    stroke-width: 10;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 
@@ -324,8 +376,121 @@ path.line.stroke {
     stroke-width: 2;
 }
 
-path.area.stroke {
+
+/* Labels / Markers */
+text {
+    font-size: 10px;
+    color: #222;
+    opacity: 1;
+}
+
+.oneway .textpath.tag-waterway {
+    fill: #002F35;
+}
+
+.onewaygroup path.oneway,
+.viewfieldgroup path.viewfield,
+.sidedgroup path.sided {
+    stroke-width: 6px;
+}
+
+text.arealabel-halo,
+text.linelabel-halo,
+text.pointlabel-halo,
+text.arealabel,
+text.linelabel,
+text.pointlabel {
+    dominant-baseline: middle;
+    text-anchor: middle;
+    font-size: 12px;
+    font-weight: bold;
+    fill: #333;
+    -webkit-transition: opacity 100ms linear;
+    transition: opacity 100ms linear;
+    -moz-transition: opacity 100ms linear;
+}
+
+/* Opera doesn't support dominant-baseline. See #715 */
+/* Safari 10 seems to have regressed too */
+.linelabel-halo .textpath,
+.linelabel .textpath {
+  baseline-shift: -33%;
+  dominant-baseline: auto;
+}
+
+.labels-group.halo text {
+    opacity: 0.7;
     stroke: #fff;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+
+text.nolabel {
+    opacity: 0 !important;
+}
+text.point {
+    font-size: 10px;
+}
+
+.icon.areaicon-halo {
+    opacity: 0.6;
+    stroke: #999;
+    stroke-width: 2px;
+    stroke-miterlimit: 1;
+}
+.icon.areaicon {
+    fill: #222;
+    opacity: 0.8;
+}
+
+/* Highlighting */
+g.point.highlighted .shadow,
+path.shadow.highlighted {
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
+g.vertex.highlighted .shadow {
+    stroke-width: 7;
+    stroke-opacity: 0.95;
+    stroke: #7092ff;
+}
+
+/* Turn Restrictions */
+.points-group.turns g.turn rect,
+.points-group.turns g.turn circle {
+    fill: none;
+}
+
+/* Turn restriction paths and vertices */
+.surface.tr .way.target,
+.surface.tr path.shadow.selected,
+.surface.tr path.shadow.related {
+    stroke-width: 25px;
+}
+
+.surface.tr path.shadow.selected,
+.surface.tr path.shadow.related,
+.surface.tr g.vertex.selected .shadow,
+.surface.tr g.vertex.related .shadow {
+    stroke-opacity: 0.7;
+    stroke: #777;
+}
+.surface.tr path.shadow.related.allow,
+.surface.tr g.vertex.related.allow .shadow {
+    stroke: #5b3;
+}
+.surface.tr path.shadow.related.restrict,
+.surface.tr g.vertex.related.restrict .shadow {
+    stroke: #d53;
+}
+.surface.tr path.shadow.related.only,
+.surface.tr g.vertex.related.only .shadow {
+    stroke: #68f;
+}
+
+/* Default - light gray */
+path.area.stroke {
+    stroke: rgb(170, 170, 170);
     stroke-width: 1;
 }
 path.area.fill {
@@ -339,242 +504,270 @@ path.area.fill {
     background-color: rgba(170, 170, 170, 0.3);
 }
 
-path.stroke.tag-natural {
-    stroke: rgb(182, 225, 153);
-}
-path.fill.tag-natural {
-    stroke: rgba(182, 225, 153, 0.3);
-    fill: rgba(182, 225, 153, 0.3);
-}
-.preset-icon-fill-area.tag-natural {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.3);
+path.shadow.old-multipolygon,
+path.stroke.old-multipolygon {
+    stroke-dasharray: 100, 5;
+    stroke-linecap: butt;
 }
 
+
+/* Green things */
 path.stroke.tag-landuse,
-path.stroke.tag-natural-wood,
-path.stroke.tag-natural-tree,
-path.stroke.tag-natural-grassland,
-path.stroke.tag-natural-grass,
+path.stroke.tag-natural,
 path.stroke.tag-leisure-nature_reserve,
 path.stroke.tag-leisure-pitch,
-path.stroke.tag-leisure-park {
+path.stroke.tag-leisure-track,
+path.stroke.tag-leisure-golf_course,
+path.stroke.tag-leisure-garden,
+path.stroke.tag-leisure-park,
+path.stroke.tag-landuse-forest,
+path.stroke.tag-landuse-wood,
+path.stroke.tag-landuse-grass,
+path.stroke.tag-barrier-hedge {
     stroke: rgb(140, 208, 95);
 }
 path.fill.tag-landuse,
-path.fill.tag-natural-wood,
-path.fill.tag-natural-tree,
-path.fill.tag-natural-grassland,
-path.fill.tag-natural-grass,
+path.fill.tag-natural,
 path.fill.tag-leisure-nature_reserve,
 path.fill.tag-leisure-pitch,
-path.fill.tag-leisure-park {
+path.fill.tag-leisure-track,
+path.fill.tag-leisure-golf_course,
+path.fill.tag-leisure-garden,
+path.fill.tag-leisure-park,
+path.fill.tag-landuse-forest,
+path.fill.tag-natural-wood,
+path.fill.tag-landuse-grass,
+path.fill.tag-barrier-hedge {
     stroke: rgba(140, 208, 95, 0.3);
     fill: rgba(140, 208, 95, 0.3);
 }
 .preset-icon-fill-area.tag-landuse,
-.preset-icon-fill-area.tag-natural-wood,
-.preset-icon-fill-area.tag-natural-tree,
-.preset-icon-fill-area.tag-natural-grassland,
-.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-natural,
 .preset-icon-fill-area.tag-leisure-nature_reserve,
 .preset-icon-fill-area.tag-leisure-pitch,
-.preset-icon-fill-area.tag-leisure-park {
+.preset-icon-fill-area.tag-leisure-track,
+.preset-icon-fill-area.tag-leisure-golf_course,
+.preset-icon-fill-area.tag-leisure-garden,
+.preset-icon-fill-area.tag-leisure-park,
+.preset-icon-fill-area.tag-landuse-forest,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-landuse-grass {
     border-color: rgb(140, 208, 95);
     background-color: rgba(140, 208, 95, 0.3);
 }
+.pattern-color-forest,
+.pattern-color-forest_broadleaved,
+.pattern-color-forest_needleleaved,
+.pattern-color-forest_leafless,
+.pattern-color-wood,
+.pattern-color-grass {
+    fill: rgba(140, 208, 95, 0.3);
+}
 
+
+/* Blue things */
+path.stroke.tag-amenity-fountain,
 path.stroke.tag-amenity-swimming_pool,
 path.stroke.tag-leisure-swimming_pool,
-path.stroke.tag-natural-water,
+path.stroke.tag-landuse-aquaculture,
 path.stroke.tag-landuse-basin,
-path.stroke.tag-landuse-reservoir {
+path.stroke.tag-landuse-harbour,
+path.stroke.tag-landuse-reservoir,
+path.stroke.tag-natural-water {
     stroke: rgb(119, 211, 222);
 }
+path.fill.tag-amenity-fountain,
 path.fill.tag-amenity-swimming_pool,
 path.fill.tag-leisure-swimming_pool,
+path.fill.tag-landuse-aquaculture,
 path.fill.tag-landuse-basin,
+path.fill.tag-landuse-harbour,
 path.fill.tag-landuse-reservoir,
 path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
+.preset-icon-fill-area.tag-amenity-fountain,
 .preset-icon-fill-area.tag-amenity-swimming_pool,
 .preset-icon-fill-area.tag-leisure-swimming_pool,
+.preset-icon-fill-area.tag-landuse-aquaculture,
 .preset-icon-fill-area.tag-landuse-basin,
+.preset-icon-fill-area.tag-landuse-harbour,
 .preset-icon-fill-area.tag-landuse-reservoir,
 .preset-icon-fill-area.tag-natural-water {
     border-color: rgb(119, 211, 222);
     background-color: rgba(119, 211, 222, 0.3);
 }
+.pattern-color-waves,
+.pattern-color-water_standing,
+.pattern-color-pond {
+    fill: rgba(119, 211, 222, 0.3);
+}
+
 
+/* Yellow things */
+path.stroke.tag-leisure-pitch.tag-sport-beachvolleyball,
+path.stroke.tag-leisure-pitch.tag-sport-baseball,
+path.stroke.tag-leisure-pitch.tag-sport-softball,
+path.stroke.tag-leisure-track,
+path.stroke.tag-natural-beach,
+path.stroke.tag-natural-sand,
+path.stroke.tag-natural-scrub,
 path.stroke.tag-amenity-childcare,
 path.stroke.tag-amenity-kindergarten,
 path.stroke.tag-amenity-school,
 path.stroke.tag-amenity-college,
 path.stroke.tag-amenity-university {
-    stroke: rgb(255, 255, 148);
-}
+    stroke: rgba(255, 255, 148, 0.75);
+}
+path.fill.tag-leisure-pitch.tag-sport-beachvolleyball,
+path.fill.tag-leisure-pitch.tag-sport-baseball,
+path.fill.tag-leisure-pitch.tag-sport-softball,
+path.fill.tag-leisure-track,
+path.fill.tag-natural-beach,
+path.fill.tag-natural-sand,
+path.fill.tag-natural-scrub,
 path.fill.tag-amenity-childcare,
 path.fill.tag-amenity-kindergarten,
 path.fill.tag-amenity-school,
 path.fill.tag-amenity-college,
 path.fill.tag-amenity-university {
-    stroke: rgba(255, 255, 148, 0.15);
-    fill: rgba(255, 255, 148, 0.15);
-}
+    stroke: rgba(255, 255, 148, 0.25);
+    fill: rgba(255, 255, 148, 0.25);
+}
+.preset-icon-fill-area.tag-leisure-pitch.tag-sport-beachvolleyball,
+.preset-icon-fill-area.tag-leisure-pitch.tag-sport-baseball,
+.preset-icon-fill-area.tag-leisure-pitch.tag-sport-softball,
+.preset-icon-fill-area.tag-leisure-track,
+.preset-icon-fill-area.tag-natural-beach,
+.preset-icon-fill-area.tag-natural-sand,
+.preset-icon-fill-area.tag-natural-scrub,
 .preset-icon-fill-area.tag-amenity-childcare,
 .preset-icon-fill-area.tag-amenity-kindergarten,
 .preset-icon-fill-area.tag-amenity-school,
 .preset-icon-fill-area.tag-amenity-college,
 .preset-icon-fill-area.tag-amenity-university {
-    border-color: rgb(255, 255, 148);
-    background-color: rgba(255, 255, 148, 0.15);
+    border-color: rgb(232, 232, 0);
+    background-color: rgba(255, 255, 148, 0.25);
+}
+.pattern-color-beach,
+.pattern-color-sand,
+.pattern-color-scrub {
+    fill: rgba(255, 255, 148, 0.2);
 }
 
-path.stroke.tag-landuse-residential {
+
+/* Gold things */
+path.stroke.tag-landuse-residential,
+path.stroke.tag-status-construction {
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
     stroke: rgba(196, 189, 25, 0.3);
     fill: rgba(196, 189, 25, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-residential {
+.preset-icon-fill-area.tag-landuse-residential,
+.preset-icon-fill-area.tag-status-construction {
     border-color: rgb(196, 189, 25);
     background: rgba(196, 189, 25, 0.3);
 }
+.pattern-color-construction {
+    fill: rgba(196, 189, 25, 0.3);
+}
 
+
+/* Orange things */
 path.stroke.tag-landuse-retail,
-path.stroke.tag-landuse-commercial {
+path.stroke.tag-landuse-commercial,
+path.stroke.tag-landuse-landfill,
+path.stroke.tag-military,
+path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }
 path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
+path.fill.tag-landuse-commercial,
+path.fill.tag-landuse-landfill,
+path.fill.tag-military,
+path.fill.tag-landuse-military {
     stroke: rgba(214, 136, 26, 0.3);
     fill: rgba(214, 136, 26, 0.3);
 }
 .preset-icon-fill-area.tag-landuse-retail,
-.preset-icon-fill-area.tag-landuse-commercial {
+.preset-icon-fill-area.tag-landuse-commercial,
+.preset-icon-fill-area.tag-landuse-landfill,
+.preset-icon-fill-area.tag-military,
+.preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.3);
 }
+.pattern-color-landfill {
+    fill: rgba(214, 136, 26, 0.3);
+}
 
-path.stroke.tag-landuse-industrial {
+
+/* Pink things */
+path.stroke.tag-landuse-industrial,
+path.stroke.tag-power-plant {
     stroke: rgb(228, 164, 245);
 }
-path.fill.tag-landuse-industrial {
+path.fill.tag-landuse-industrial,
+path.fill.tag-power-plant {
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-industrial {
+.preset-icon-fill-area.tag-landuse-industrial,
+.preset-icon-fill-area.tag-power-plant {
     border-color: rgb(228, 164, 245);
     background-color: rgba(228, 164, 245, 0.3);
 }
 
-path.stroke.tag-landuse-quarry {
-    stroke: rgb(166, 149, 123);
-}
-path.fill.tag-landuse-quarry {
-    stroke: rgba(166, 149, 123, 0.2);
-    fill: rgba(166, 149, 123, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-quarry {
-    border-color: rgb(166, 149, 123);
-    background-color: rgba(166, 149, 123, 0.2);
-}
-
-path.stroke.tag-landuse-landfill {
-    stroke: rgb(255, 153, 51);
-}
-path.fill.tag-landuse-landfill {
-    stroke: rgba(255, 153, 51, 0.2);
-    fill: rgba(255, 153, 51, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-landfill {
-    border-color: rgb(255, 153, 51);
-    background-color: rgba(255, 153, 51, 0.2);
-}
-
-.pattern-color-construction {
-    fill: rgba(196, 189, 25, 0.2);
-}
-path.stroke.tag-landuse.tag-status {
-    stroke: rgb(196, 189, 25);
-}
-.preset-icon-fill-area.tag-landuse.tag-status {
-    border-color: rgb(196, 189, 25);
-    background-color: rgba(196, 189, 25, 0.2);
-}
-
-path.stroke.tag-landuse-military {
-    stroke: rgb(214, 136, 26);
-}
-path.fill.tag-landuse-military {
-    stroke: rgba(214, 136, 26, 0.2);
-    fill: rgba(214, 136, 26, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-military {
-    border-color: rgb(214, 136, 26);
-    background-color: rgba(214, 136, 26, 0.2);
-}
 
-.pattern-color-wetland {
-    fill: rgba(182, 225, 153, 0.2);
-}
+/* Teal things */
 path.stroke.tag-natural-wetland {
-    stroke: rgb(182, 225, 153);
+    stroke: rgb(153, 225, 170);
 }
 .preset-icon-fill-area.tag-natural-wetland {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.2);
-}
-
-.pattern-color-meadow {
-    fill: rgba(182, 225, 153, 0.2);
-}
-path.stroke.tag-landuse-meadow {
-    stroke: rgb(182, 225, 153);
-}
-.preset-icon-fill-area.tag-landuse-meadow {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.2);
-}
-
-.pattern-color-beach {
-    fill: rgba(255, 255, 126, 0.2);
-}
-path.stroke.tag-natural-beach {
-    stroke: rgb(255, 255, 126);
+    border-color: rgb(153, 225, 170);
+    background-color: rgba(153, 225, 170, 0.2);
 }
-.preset-icon-fill-area.tag-natural-beach {
-    border-color: rgb(255, 255, 126);
-    background-color: rgba(255, 255, 126, 0.2);
+.pattern-color-wetland,
+.pattern-color-wetland_marsh,
+.pattern-color-wetland_swamp,
+.pattern-color-wetland_bog,
+.pattern-color-wetland_reedbed {
+    fill: rgba(153, 225, 170, 0.3);
 }
 
-.pattern-color-scrub {
-    fill: rgba(219, 240, 139, 0.2);
-}
-path.stroke.tag-natural-scrub {
-    stroke: rgb(219, 240, 139);
-}
-.preset-icon-fill-area.tag-natural-scrub {
-    border-color: rgb(219, 240, 139);
-    background-color: rgba(219, 240, 139, 0.2);
-}
 
-.pattern-color-farm,
-.pattern-color-farmland {
-    fill: rgba(140, 208, 95, 0.2);
-}
-path.stroke.tag-landuse-farm,
+/* Light Green things */
+path.stroke.tag-landuse-cemetery,
+path.stroke.tag-landuse-orchard,
+path.stroke.tag-landuse-vineyard,
+path.stroke.tag-landuse-meadow,
 path.stroke.tag-landuse-farmland {
-    stroke: rgb(140, 208, 95);
+    stroke: rgb(191, 232, 63);
 }
-.preset-icon-fill-area.tag-landuse-farm,
+.preset-icon-fill-area.tag-landuse-cemetery,
+.preset-icon-fill-area.tag-landuse-orchard,
+.preset-icon-fill-area.tag-landuse-vineyard,
+.preset-icon-fill-area.tag-landuse-meadow,
 .preset-icon-fill-area.tag-landuse-farmland {
-    background-color: rgba(140, 208, 95, 0.2);
+    background-color: rgba(191, 232, 63, 0.2);
+}
+.pattern-color-cemetery,
+.pattern-color-cemetery_christian,
+.pattern-color-cemetery_buddhist,
+.pattern-color-cemetery_muslim,
+.pattern-color-cemetery_jewish,
+.pattern-color-orchard,
+.pattern-color-vineyard,
+.pattern-color-meadow,
+.pattern-color-farmland {
+    fill: rgba(191, 232, 63, 0.2);
 }
 
+
+/* Tan things */
 path.stroke.tag-landuse-farmyard {
     stroke: rgb(245, 220, 186);
 }
@@ -583,556 +776,708 @@ path.fill.tag-landuse-farmyard {
     fill: rgba(245, 220, 186, 0.3);
 }
 .preset-icon-fill-area.tag-landuse-farmyard {
-    border-color: rgb(245, 220, 186);
+    border-color: rgb(226, 177, 111);
     background: rgba(245, 220, 186, 0.3);
 }
+.pattern-color-farmyard {
+    fill: rgba(245, 220, 186, 0.3);
+}
 
-.pattern-color-cemetery,
-.pattern-color-orchard {
-    fill: rgba(140, 208, 95, 0.2);
+
+/* Dark Gray things */
+path.stroke.tag-amenity-parking,
+path.stroke.tag-landuse-railway,
+path.stroke.tag-landuse-quarry,
+path.stroke.tag-leisure-pitch.tag-sport-basketball,
+path.stroke.tag-leisure-pitch.tag-sport-skateboard,
+path.stroke.tag-man_made-groyne,
+path.stroke.tag-man_made-breakwater,
+path.stroke.tag-natural-bare_rock,
+path.stroke.tag-natural-scree,
+path.stroke.tag-waterway-dam,
+path.stroke.tag-waterway-weir {
+    stroke: rgb(170, 170, 170);
 }
-path.stroke.tag-landuse-cemetery,
-path.stroke.tag-landuse-orchard {
-    stroke: rgb(140, 208, 95);
+path.fill.tag-amenity-parking,
+path.fill.tag-landuse-railway,
+path.fill.tag-landuse-quarry,
+path.fill.tag-leisure-pitch.tag-sport-basketball,
+path.fill.tag-leisure-pitch.tag-sport-skateboard,
+path.fill.tag-man_made-groyne,
+path.fill.tag-man_made-breakwater,
+path.fill.tag-natural-bare_rock,
+path.fill.tag-natural-scree,
+path.fill.tag-waterway-dam,
+path.fill.tag-waterway-weir {
+    stroke: rgba(140, 140, 140, 0.5);
+    fill: rgba(140, 140, 140, 0.5);
+}
+.preset-icon-fill-area.tag-amenity-parking,
+.preset-icon-fill-area.tag-landuse-railway,
+.preset-icon-fill-area.tag-landuse-quarry,
+.preset-icon-fill-area.tag-leisure-pitch.tag-sport-basketball,
+.preset-icon-fill-area.tag-leisure-pitch.tag-sport-skateboard,
+.preset-icon-fill-area.tag-natural-bare_rock,
+.preset-icon-fill-area.tag-natural-scree,
+.preset-icon-fill-area.tag-waterway-dam,
+.preset-icon-fill-area.tag-waterway-weir {
+    border-color: rgb(170, 170, 170);
+    background-color: rgba(140, 140, 140, 0.5);
 }
-.preset-icon-fill-area.tag-landuse-cemetery,
-.preset-icon-fill-area.tag-landuse-orchard {
-    background-color: rgba(140, 208, 95, 0.2);
+.pattern-color-quarry {
+    fill: rgba(140, 140, 140, 0.5);
 }
 
-path.stroke.tag-amenity-parking {
+
+/* Light gray overrides */
+path.stroke.tag-natural-cave_entrance,
+path.stroke.tag-natural-glacier {
     stroke: rgb(170, 170, 170);
 }
-path.fill.tag-amenity-parking {
-    stroke: rgba(170, 170, 170, 0.3);
-    fill: rgba(170, 170, 170, 0.3);
+path.fill.tag-natural-cave_entrance,
+path.fill.tag-natural-glacier {
+    stroke: rgba(255, 255, 255, 0.3);
+    fill: rgba(255, 255, 255, 0.3);
 }
-.preset-icon-fill-area.tag-amenity-parking {
+.preset-icon-fill-area.tag-natural-cave_entrance,
+.preset-icon-fill-area.tag-natural-glacier {
     border-color: rgb(170, 170, 170);
-    background-color: rgba(170, 170, 170, 0.3);
-}
-
-
-/* highway areas */
-
-path.stroke.area.tag-highway {
-    stroke:#fff;
-    stroke-dasharray: none;
-    stroke-width: 2;
+    background: rgba(170, 170, 170, 0.3);
 }
+/* highways */
 
-/* wide highways */
-
+/* defaults */
 .preset-icon .icon.tag-highway.other-line {
     color: #fff;
     fill: #777;
 }
-
-path.shadow.tag-highway {
-    stroke-width:16;
-}
-path.casing.tag-highway {
-    stroke:#444;
-    stroke-width:10;
+path.line.casing.tag-highway {
+    stroke: #444;
 }
-path.stroke.tag-highway {
-    stroke:#ccc;
-    stroke-width:8;
+path.line.stroke.tag-highway {
+    stroke: #ccc;
 }
 
-.low-zoom path.shadow.tag-highway {
-    stroke-width:12;
+/* wide highways */
+path.line.shadow.tag-highway {
+    stroke-width: 20;
+}
+path.line.casing.tag-highway {
+    stroke-width: 10;
+}
+path.line.stroke.tag-highway {
+    stroke-width: 8;
+}
+.low-zoom path.line.shadow.tag-highway {
+    stroke-width: 16;
 }
-.low-zoom path.casing.tag-highway {
-    stroke-width:6;
+.low-zoom path.line.casing.tag-highway {
+    stroke-width: 7;
 }
-.low-zoom path.stroke.tag-highway {
-    stroke-width:4;
+.low-zoom path.line.stroke.tag-highway {
+    stroke-width: 5;
 }
 
-.preset-icon .icon.highway-motorway,
-.preset-icon .icon.highway-motorway-link {
+.preset-icon .icon.tag-highway-motorway,
+.preset-icon .icon.tag-highway-motorway_link {
     color: #CF2081;
     fill: #70372f;
 }
-path.stroke.tag-highway-motorway,
-path.stroke.tag-highway-motorway_link,
-path.stroke.tag-motorway {
-    stroke:#CF2081;
+path.line.stroke.tag-highway-motorway,
+path.line.stroke.tag-highway-motorway_link,
+path.line.stroke.tag-motorway {
+    stroke: #CF2081;
 }
-path.casing.tag-highway-motorway,
-path.casing.tag-highway-motorway_link,
-path.casing.tag-motorway {
-    stroke:#70372f;
+path.line.casing.tag-highway-motorway,
+path.line.casing.tag-highway-motorway_link,
+path.line.casing.tag-motorway {
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-trunk,
-.preset-icon .icon.highway-trunk-link {
+.preset-icon .icon.tag-highway-trunk,
+.preset-icon .icon.tag-highway-trunk_link {
     color: #DD2F22;
     fill: #70372f;
 }
-path.stroke.tag-highway-trunk,
-path.stroke.tag-highway-trunk_link,
-path.stroke.tag-trunk {
-    stroke:#DD2F22;
+path.line.stroke.tag-highway-trunk,
+path.line.stroke.tag-highway-trunk_link,
+path.line.stroke.tag-trunk {
+    stroke: #DD2F22;
 }
-path.casing.tag-highway-trunk,
-path.casing.tag-highway-trunk_link,
-path.casing.tag-trunk {
-    stroke:#70372f;
+path.line.casing.tag-highway-trunk,
+path.line.casing.tag-highway-trunk_link,
+path.line.casing.tag-trunk {
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-primary,
-.preset-icon .icon.highway-primary-link {
+.preset-icon .icon.tag-highway-primary,
+.preset-icon .icon.tag-highway-primary_link {
     color: #F99806;
     fill: #70372f;
 }
-path.stroke.tag-highway-primary,
-path.stroke.tag-highway-primary_link,
-path.stroke.tag-primary {
-    stroke:#F99806;
+path.line.stroke.tag-highway-primary,
+path.line.stroke.tag-highway-primary_link,
+path.line.stroke.tag-primary {
+    stroke: #F99806;
 }
-path.casing.tag-highway-primary,
-path.casing.tag-highway-primary_link,
-path.casing.tag-primary {
-    stroke:#70372f;
+path.line.casing.tag-highway-primary,
+path.line.casing.tag-highway-primary_link,
+path.line.casing.tag-primary {
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-secondary,
-.preset-icon .icon.highway-secondary-link {
+.preset-icon .icon.tag-highway-secondary,
+.preset-icon .icon.tag-highway-secondary_link {
     color: #F3F312;
     fill: #70372f;
 }
-path.stroke.tag-highway-secondary,
-path.stroke.tag-highway-secondary_link,
-path.stroke.tag-secondary {
-    stroke:#F3F312;
+path.line.stroke.tag-highway-secondary,
+path.line.stroke.tag-highway-secondary_link,
+path.line.stroke.tag-secondary {
+    stroke: #F3F312;
 }
-path.casing.tag-highway-secondary,
-path.casing.tag-highway-secondary_link,
-path.casing.tag-secondary {
-    stroke:#70372f;
+path.line.casing.tag-highway-secondary,
+path.line.casing.tag-highway-secondary_link,
+path.line.casing.tag-secondary {
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-tertiary,
-.preset-icon .icon.highway-tertiary-link {
+.preset-icon .icon.tag-highway-tertiary,
+.preset-icon .icon.tag-highway-tertiary_link {
     color: #FFF9B3;
     fill: #70372f;
 }
-path.stroke.tag-highway-tertiary,
-path.stroke.tag-highway-tertiary_link,
-path.stroke.tag-tertiary {
-    stroke:#FFF9B3;
+path.line.stroke.tag-highway-tertiary,
+path.line.stroke.tag-highway-tertiary_link,
+path.line.stroke.tag-tertiary {
+    stroke: #FFF9B3;
 }
-path.casing.tag-highway-tertiary,
-path.casing.tag-highway-tertiary_link,
-path.casing.tag-tertiary {
-    stroke:#70372f;
+path.line.casing.tag-highway-tertiary,
+path.line.casing.tag-highway-tertiary_link,
+path.line.casing.tag-tertiary {
+    stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.highway-motorway,
-.legacy-carto .preset-icon .icon.highway-motorway-link {
+.legacy-carto .preset-icon .icon.tag-highway-motorway,
+.legacy-carto .preset-icon .icon.tag-highway-motorway_link {
     color: #58a9ed;
     fill: #2c5476;
 }
-.legacy-carto path.stroke.tag-highway-motorway,
-.legacy-carto path.stroke.tag-highway-motorway_link,
-.legacy-carto path.stroke.tag-motorway {
-    stroke:#58a9ed;
+.legacy-carto path.line.stroke.tag-highway-motorway,
+.legacy-carto path.line.stroke.tag-highway-motorway_link,
+.legacy-carto path.line.stroke.tag-motorway {
+    stroke: #58a9ed;
 }
-.legacy-carto path.casing.tag-highway-motorway,
-.legacy-carto path.casing.tag-highway-motorway_link,
-.legacy-carto path.casing.tag-motorway {
-    stroke:#2c5476;
+.legacy-carto path.line.casing.tag-highway-motorway,
+.legacy-carto path.line.casing.tag-highway-motorway_link,
+.legacy-carto path.line.casing.tag-motorway {
+    stroke: #2c5476;
 }
 
-.legacy-carto .preset-icon .icon.highway-trunk,
-.legacy-carto .preset-icon .icon.highway-trunk-link {
+.legacy-carto .preset-icon .icon.tag-highway-trunk,
+.legacy-carto .preset-icon .icon.tag-highway-trunk_link {
     color: #8cd05f;
     fill: #46682f;
 }
-.legacy-carto path.stroke.tag-highway-trunk,
-.legacy-carto path.stroke.tag-highway-trunk_link,
-.legacy-carto path.stroke.tag-trunk {
-    stroke:#8cd05f;
+.legacy-carto path.line.stroke.tag-highway-trunk,
+.legacy-carto path.line.stroke.tag-highway-trunk_link,
+.legacy-carto path.line.stroke.tag-trunk {
+    stroke: #8cd05f;
 }
-.legacy-carto path.casing.tag-highway-trunk,
-.legacy-carto path.casing.tag-highway-trunk_link,
-.legacy-carto path.casing.tag-trunk {
-    stroke:#46682f;
+.legacy-carto path.line.casing.tag-highway-trunk,
+.legacy-carto path.line.casing.tag-highway-trunk_link,
+.legacy-carto path.line.casing.tag-trunk {
+    stroke: #46682f;
 }
 
-.legacy-carto .preset-icon .icon.highway-primary,
-.legacy-carto .preset-icon .icon.highway-primary-link {
+.legacy-carto .preset-icon .icon.tag-highway-primary,
+.legacy-carto .preset-icon .icon.tag-highway-primary_link {
     color: #e06d5f;
     fill: #70372f;
 }
-.legacy-carto path.stroke.tag-highway-primary,
-.legacy-carto path.stroke.tag-highway-primary_link,
-.legacy-carto path.stroke.tag-primary {
-    stroke:#e06d5f;
+.legacy-carto path.line.stroke.tag-highway-primary,
+.legacy-carto path.line.stroke.tag-highway-primary_link,
+.legacy-carto path.line.stroke.tag-primary {
+    stroke: #e06d5f;
 }
-.legacy-carto path.casing.tag-highway-primary,
-.legacy-carto path.casing.tag-highway-primary_link,
-.legacy-carto path.casing.tag-primary {
-    stroke:#70372f;
+.legacy-carto path.line.casing.tag-highway-primary,
+.legacy-carto path.line.casing.tag-highway-primary_link,
+.legacy-carto path.line.casing.tag-primary {
+    stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.highway-secondary,
-.legacy-carto .preset-icon .icon.highway-secondary-link {
+.legacy-carto .preset-icon .icon.tag-highway-secondary,
+.legacy-carto .preset-icon .icon.tag-highway-secondary_link {
     color: #eab056;
     fill: #75582b;
 }
-.legacy-carto path.stroke.tag-highway-secondary,
-.legacy-carto path.stroke.tag-highway-secondary_link,
-.legacy-carto path.stroke.tag-secondary {
-    stroke:#eab056;
+.legacy-carto path.line.stroke.tag-highway-secondary,
+.legacy-carto path.line.stroke.tag-highway-secondary_link,
+.legacy-carto path.line.stroke.tag-secondary {
+    stroke: #eab056;
 }
-.legacy-carto path.casing.tag-highway-secondary,
-.legacy-carto path.casing.tag-highway-secondary_link,
-.legacy-carto path.casing.tag-secondary {
-    stroke:#75582b;
+.legacy-carto path.line.casing.tag-highway-secondary,
+.legacy-carto path.line.casing.tag-highway-secondary_link,
+.legacy-carto path.line.casing.tag-secondary {
+    stroke: #75582b;
 }
 
-.legacy-carto .preset-icon .icon.highway-tertiary,
-.legacy-carto .preset-icon .icon.highway-tertiary-link {
+.legacy-carto .preset-icon .icon.tag-highway-tertiary,
+.legacy-carto .preset-icon .icon.tag-highway-tertiary_link {
     color: #ffff7e;
     fill: #7f7f3f;
 }
-.legacy-carto path.stroke.tag-highway-tertiary,
-.legacy-carto path.stroke.tag-highway-tertiary_link,
-.legacy-carto path.stroke.tag-tertiary {
-    stroke:#ffff7e;
+.legacy-carto path.line.stroke.tag-highway-tertiary,
+.legacy-carto path.line.stroke.tag-highway-tertiary_link,
+.legacy-carto path.line.stroke.tag-tertiary {
+    stroke: #ffff7e;
 }
-.legacy-carto path.casing.tag-highway-tertiary,
-.legacy-carto path.casing.tag-highway-tertiary_link,
-.legacy-carto path.casing.tag-tertiary {
-    stroke:#7f7f3f;
+.legacy-carto path.line.casing.tag-highway-tertiary,
+.legacy-carto path.line.casing.tag-highway-tertiary_link,
+.legacy-carto path.line.casing.tag-tertiary {
+    stroke: #7f7f3f;
 }
 
-.preset-icon .icon.highway-residential {
+.preset-icon .icon.tag-highway-residential {
     color: #fff;
     fill: #444;
 }
-path.stroke.tag-highway-residential,
-path.stroke.tag-residential {
-    stroke:#fff;
+path.line.stroke.tag-highway-residential,
+path.line.stroke.tag-residential {
+    stroke: #fff;
 }
-path.casing.tag-highway-residential,
-path.casing.tag-residential {
-    stroke:#444;
+path.line.casing.tag-highway-residential,
+path.line.casing.tag-residential {
+    stroke: #444;
 }
 
-.preset-icon .icon.highway-unclassified {
-    color: #dcd9b9;
+.preset-icon .icon.tag-highway-unclassified {
+    color: #dca;
     fill: #444;
 }
-path.stroke.tag-highway-unclassified,
-path.stroke.tag-unclassified {
-    stroke:#dcd9b9;
+path.line.stroke.tag-highway-unclassified,
+path.line.stroke.tag-unclassified {
+    stroke: #dca;
 }
-path.casing.tag-highway-unclassified,
-path.casing.tag-unclassified {
-    stroke:#444;
+path.line.casing.tag-highway-unclassified,
+path.line.casing.tag-unclassified {
+    stroke: #444;
 }
 
 
 /* narrow highways */
-path.stroke.tag-highway-living_street,
-path.stroke.tag-highway-service,
-path.stroke.tag-highway-track,
-path.stroke.tag-highway-path,
-path.stroke.tag-highway-footway,
-path.stroke.tag-highway-cycleway,
-path.stroke.tag-highway-bridleway,
-path.stroke.tag-highway-corridor,
-path.stroke.tag-highway-pedestrian,
-path.stroke.tag-highway-steps,
-path.stroke.tag-highway-road,
-path.stroke.tag-living_street,
-path.stroke.tag-service,
-path.stroke.tag-track,
-path.stroke.tag-path,
-path.stroke.tag-footway,
-path.stroke.tag-cycleway,
-path.stroke.tag-bridleway,
-path.stroke.tag-corridor,
-path.stroke.tag-pedestrian,
-path.stroke.tag-steps,
-path.stroke.tag-road {
-    stroke-width:4;
-}
-path.casing.tag-highway-living_street,
-path.casing.tag-highway-service,
-path.casing.tag-highway-track,
-path.casing.tag-highway-path,
-path.casing.tag-highway-footway,
-path.casing.tag-highway-cycleway,
-path.casing.tag-highway-bridleway,
-path.casing.tag-highway-corridor,
-path.casing.tag-highway-pedestrian,
-path.casing.tag-highway-steps,
-path.casing.tag-highway-road,
-path.casing.tag-living_street,
-path.casing.tag-service,
-path.casing.tag-track,
-path.casing.tag-path,
-path.casing.tag-footway,
-path.casing.tag-cycleway,
-path.casing.tag-bridleway,
-path.casing.tag-corridor,
-path.casing.tag-pedestrian,
-path.casing.tag-steps,
-path.casing.tag-road {
-    stroke-width:6;
-}
-
-.low-zoom path.stroke.tag-highway-living_street,
-.low-zoom path.stroke.tag-highway-service,
-.low-zoom path.stroke.tag-highway-track,
-.low-zoom path.stroke.tag-highway-path,
-.low-zoom path.stroke.tag-highway-footway,
-.low-zoom path.stroke.tag-highway-cycleway,
-.low-zoom path.stroke.tag-highway-bridleway,
-.low-zoom path.stroke.tag-highway-corridor,
-.low-zoom path.stroke.tag-highway-pedestrian,
-.low-zoom path.stroke.tag-highway-steps,
-.low-zoom path.stroke.tag-highway-road,
-.low-zoom path.stroke.tag-living_street,
-.low-zoom path.stroke.tag-service,
-.low-zoom path.stroke.tag-track,
-.low-zoom path.stroke.tag-path,
-.low-zoom path.stroke.tag-footway,
-.low-zoom path.stroke.tag-cycleway,
-.low-zoom path.stroke.tag-bridleway,
-.low-zoom path.stroke.tag-corridor,
-.low-zoom path.stroke.tag-pedestrian,
-.low-zoom path.stroke.tag-steps,
-.low-zoom path.stroke.tag-road {
-    stroke-width:2;
-}
-.low-zoom path.casing.tag-highway-living_street,
-.low-zoom path.casing.tag-highway-service,
-.low-zoom path.casing.tag-highway-track,
-.low-zoom path.casing.tag-highway-path,
-.low-zoom path.casing.tag-highway-footway,
-.low-zoom path.casing.tag-highway-cycleway,
-.low-zoom path.casing.tag-highway-bridleway,
-.low-zoom path.casing.tag-highway-corridor,
-.low-zoom path.casing.tag-highway-pedestrian,
-.low-zoom path.casing.tag-highway-steps,
-.low-zoom path.casing.tag-highway-road,
-.low-zoom path.casing.tag-living_street,
-.low-zoom path.casing.tag-service,
-.low-zoom path.casing.tag-track,
-.low-zoom path.casing.tag-path,
-.low-zoom path.casing.tag-footway,
-.low-zoom path.casing.tag-cycleway,
-.low-zoom path.casing.tag-bridleway,
-.low-zoom path.casing.tag-corridor,
-.low-zoom path.casing.tag-pedestrian,
-.low-zoom path.casing.tag-steps,
-.low-zoom path.casing.tag-road {
-    stroke-width:4;
-}
-
-.preset-icon .icon.highway-living-street {
-    color: #ccc;
-    fill: #fff;
+path.line.shadow.tag-highway-living_street,
+path.line.shadow.tag-highway-bus_guideway,
+path.line.shadow.tag-highway-service,
+path.line.shadow.tag-highway-track,
+path.line.shadow.tag-highway-road {
+    stroke-width: 16;
+}
+path.line.casing.tag-highway-living_street,
+path.line.casing.tag-highway-bus_guideway,
+path.line.casing.tag-highway-service,
+path.line.casing.tag-highway-track,
+path.line.casing.tag-highway-road {
+    stroke-width: 7;
+}
+path.line.stroke.tag-highway-living_street,
+path.line.stroke.tag-highway-bus_guideway,
+path.line.stroke.tag-highway-service,
+path.line.stroke.tag-highway-track,
+path.line.stroke.tag-highway-road {
+    stroke-width: 5;
+}
+
+path.line.shadow.tag-highway-path,
+path.line.shadow.tag-highway-footway,
+path.line.shadow.tag-highway-cycleway,
+path.line.shadow.tag-highway-bridleway,
+path.line.shadow.tag-highway-corridor,
+path.line.shadow.tag-highway-pedestrian,
+path.line.shadow.tag-highway-steps {
+    stroke-width: 16;
+}
+path.line.casing.tag-highway-path,
+path.line.casing.tag-highway-footway,
+path.line.casing.tag-highway-cycleway,
+path.line.casing.tag-highway-bridleway,
+path.line.casing.tag-highway-corridor,
+path.line.casing.tag-highway-pedestrian,
+path.line.casing.tag-highway-steps {
+    stroke-width: 5;
+}
+path.line.stroke.tag-highway-path,
+path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway-cycleway,
+path.line.stroke.tag-highway-bridleway,
+path.line.stroke.tag-highway-corridor,
+path.line.stroke.tag-highway-pedestrian,
+path.line.stroke.tag-highway-steps {
+    stroke-width: 3;
+}
+
+.low-zoom path.line.shadow.tag-highway-living_street,
+.low-zoom path.line.shadow.tag-highway-bus_guideway,
+.low-zoom path.line.shadow.tag-highway-service,
+.low-zoom path.line.shadow.tag-highway-track,
+.low-zoom path.line.shadow.tag-highway-road {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-highway-living_street,
+.low-zoom path.line.casing.tag-highway-bus_guideway,
+.low-zoom path.line.casing.tag-highway-service,
+.low-zoom path.line.casing.tag-highway-track,
+.low-zoom path.line.casing.tag-highway-road {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-highway-living_street,
+.low-zoom path.line.stroke.tag-highway-bus_guideway,
+.low-zoom path.line.stroke.tag-highway-service,
+.low-zoom path.line.stroke.tag-highway-track,
+.low-zoom path.line.stroke.tag-highway-road {
+    stroke-width: 3;
+}
+
+.low-zoom path.line.shadow.tag-highway-path,
+.low-zoom path.line.shadow.tag-highway-footway,
+.low-zoom path.line.shadow.tag-highway-cycleway,
+.low-zoom path.line.shadow.tag-highway-bridleway,
+.low-zoom path.line.shadow.tag-highway-corridor,
+.low-zoom path.line.shadow.tag-highway-pedestrian,
+.low-zoom path.line.shadow.tag-highway-steps {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-highway-path,
+.low-zoom path.line.casing.tag-highway-footway,
+.low-zoom path.line.casing.tag-highway-cycleway,
+.low-zoom path.line.casing.tag-highway-bridleway,
+.low-zoom path.line.casing.tag-highway-corridor,
+.low-zoom path.line.casing.tag-highway-pedestrian,
+.low-zoom path.line.casing.tag-highway-steps {
+    stroke-width: 3;
+}
+.low-zoom path.line.stroke.tag-highway-path,
+.low-zoom path.line.stroke.tag-highway-footway,
+.low-zoom path.line.stroke.tag-highway-cycleway,
+.low-zoom path.line.stroke.tag-highway-bridleway,
+.low-zoom path.line.stroke.tag-highway-corridor,
+.low-zoom path.line.stroke.tag-highway-pedestrian,
+.low-zoom path.line.stroke.tag-highway-steps {
+    stroke-width: 1;
+}
+
+
+.preset-icon .icon.tag-highway-living-street {
+    color: #bbb;
+    fill: #ddd;
 }
-path.stroke.tag-highway-living_street,
-path.stroke.tag-living_street {
-    stroke:#ccc;
+path.line.stroke.tag-highway-living_street,
+path.line.stroke.tag-living_street {
+    stroke: #ccc;
 }
-path.casing.tag-highway-living_street,
-path.casing.tag-living_street {
-    stroke:#fff;
+path.line.casing.tag-highway-living_street,
+path.line.casing.tag-living_street {
+    stroke: #fff;
 }
 
-.preset-icon .icon.highway-footway.tag-highway-corridor,
-.preset-icon .icon.highway-footway.tag-highway-pedestrian {
+.preset-icon .icon.tag-highway-corridor,
+.preset-icon .icon.tag-highway-pedestrian {
     color: #8cd05f;
     fill: #fff;
 }
-path.stroke.tag-highway-corridor,
-path.stroke.tag-highway-pedestrian,
-path.stroke.tag-corridor,
-path.stroke.tag-pedestrian {
-    stroke:#fff;
+path.line.stroke.tag-highway-corridor,
+path.line.stroke.tag-highway-pedestrian,
+path.line.stroke.tag-corridor,
+path.line.stroke.tag-pedestrian {
+    stroke: #fff;
     stroke-dasharray: 2, 8;
 }
-path.casing.tag-highway-corridor,
-path.casing.tag-highway-pedestrian,
-path.casing.tag-corridor,
-path.casing.tag-pedestrian,
-path.casing.tag-highway-corridor.tag-unpaved,
-path.casing.tag-highway-pedestrian.tag-unpaved,
-path.casing.tag-corridor.tag-unpaved,
-path.casing.tag-pedestrian.tag-unpaved {
+.low-zoom path.line.stroke.tag-highway-corridor,
+.low-zoom path.line.stroke.tag-highway-pedestrian,
+.low-zoom path.line.stroke.tag-corridor,
+.low-zoom path.line.stroke.tag-pedestrian {
+    stroke-dasharray: 1, 4;
+}
+path.line.casing.tag-highway-corridor,
+path.line.casing.tag-highway-pedestrian,
+path.line.casing.tag-corridor,
+path.line.casing.tag-pedestrian,
+path.line.casing.tag-highway-corridor.tag-unpaved,
+path.line.casing.tag-highway-pedestrian.tag-unpaved,
+path.line.casing.tag-corridor.tag-unpaved,
+path.line.casing.tag-pedestrian.tag-unpaved {
     stroke: #8cd05f;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
 
-.preset-icon .icon.highway-road {
+.preset-icon .icon.tag-highway-road {
     color: #9e9e9e;
     fill: #666;
 }
-path.stroke.tag-highway-road,
-path.stroke.tag-road {
-    stroke:#9e9e9e;
+path.line.stroke.tag-highway-road,
+path.line.stroke.tag-road {
+    stroke: #9e9e9e;
 }
-path.casing.tag-highway-road,
-path.casing.tag-road {
-    stroke:#666;
+path.line.casing.tag-highway-road,
+path.line.casing.tag-road {
+    stroke: #666;
 }
 
-.preset-icon .icon.highway-service {
+.preset-icon .icon.tag-highway-service {
     color: #fff;
     fill: #666;
 }
-path.stroke.tag-highway-service,
-path.stroke.tag-service {
-    stroke:#fff;
+path.line.stroke.tag-highway-service,
+path.line.stroke.tag-service {
+    stroke: #fff;
+}
+path.line.casing.tag-highway-service,
+path.line.casing.tag-service {
+    stroke: #666;
+}
+
+/* special service roads and bus guideways */
+/* with `service=* tag`  (e.g. parking_aisle, alley, drive-through) */
+.preset-icon .icon.tag-highway-bus_guideway,
+.preset-icon .icon.tag-highway-service.tag-service {
+    color: #dca;
+    fill: #666;
+}
+path.line.stroke.tag-highway-bus_guideway,
+path.line.stroke.tag-highway-service.tag-service,
+path.line.stroke.tag-service.tag-service {
+    stroke: #dca;
 }
-path.casing.tag-highway-service,
-path.casing.tag-service {
-    stroke:#666;
+path.line.casing.tag-highway-bus_guideway,
+path.line.casing.tag-highway-service.tag-service,
+path.line.casing.tag-service.tag-service {
+    stroke: #666;
 }
 
-.preset-icon .icon.highway-track {
+.preset-icon .icon.tag-highway-track {
     color: #eaeaea;
     fill: #c5b59f;
 }
-path.stroke.tag-highway-track,
-path.stroke.tag-track {
+path.line.stroke.tag-highway-track,
+path.line.stroke.tag-track {
     stroke: #c5b59f;
 }
-path.casing.tag-highway-track,
-path.casing.tag-track {
+path.line.casing.tag-highway-track,
+path.line.casing.tag-track {
     stroke: #746f6f;
 }
 
-path.stroke.tag-highway-path,
-path.stroke.tag-highway-footway,
-path.stroke.tag-highway-cycleway,
-path.stroke.tag-highway-bridleway {
+path.line.stroke.tag-highway-path,
+path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway-cycleway,
+path.line.stroke.tag-highway-bridleway {
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
+.low-zoom path.line.stroke.tag-highway-path,
+.low-zoom path.line.stroke.tag-highway-footway,
+.low-zoom path.line.stroke.tag-highway-cycleway,
+.low-zoom path.line.stroke.tag-highway-bridleway {
+    stroke-linecap: butt;
+    stroke-dasharray: 3, 3;
+}
 
-path.casing.tag-highway-path,
-path.casing.tag-highway-path.tag-unpaved {
-    stroke: #c5b59f;
+path.line.casing.tag-highway-path,
+path.line.casing.tag-highway-path.tag-unpaved {
+    stroke: #dca;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
-path.casing.tag-highway-footway,
-path.casing.tag-highway-cycleway,
-path.casing.tag-highway-bridleway,
-path.casing.tag-highway-footway.tag-unpaved,
-path.casing.tag-highway-cycleway.tag-unpaved,
-path.casing.tag-highway-bridleway.tag-unpaved {
+path.line.casing.tag-highway-footway,
+path.line.casing.tag-highway-cycleway,
+path.line.casing.tag-highway-bridleway,
+path.line.casing.tag-highway-footway.tag-unpaved,
+path.line.casing.tag-highway-cycleway.tag-unpaved,
+path.line.casing.tag-highway-bridleway.tag-unpaved {
     stroke: #fff;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
 
-.preset-icon .icon.category-path,
-.preset-icon .icon.highway-path {
-    color: #746f6f;
-    fill: #c5b59f;
+.preset-icon .icon.iD-category-path,
+.preset-icon .icon.tag-highway-path {
+    color: #988;
+    fill: #dca;
 }
-path.stroke.tag-highway-path {
-    stroke: #746f6f;
+path.line.stroke.tag-highway-path {
+    stroke: #988;
 }
 
 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
-.preset-icon .icon.highway-footway {
-    color: #ae8681;
+.preset-icon .icon.tag-highway-footway {
+    color: #988;
     fill: #fff;
 }
-path.stroke.tag-highway-footway {
-    stroke: #ae8681;
-}
-
-.preset-icon .icon.highway-footway.tag-crossing {
-    color: #444;
+path.line.stroke.tag-highway-footway,
+.preset-icon-line path.casing.tag-highway-footway {
+    stroke: #988;
 }
-path.stroke.tag-highway-footway.tag-crossing {
-    stroke: #444;
-    stroke-dasharray: 6, 4;
+.preset-icon-line path.stroke.tag-highway-footway {
+    stroke: #fff;
 }
 
 .preset-icon .icon.tag-route-bicycle,
-.preset-icon .icon.highway-cycleway {
+.preset-icon .icon.tag-highway-cycleway {
     color: #58a9ed;
     fill: #fff;
 }
-path.stroke.tag-highway-cycleway {
+path.line.stroke.tag-highway-cycleway,
+.preset-icon-line path.casing.tag-highway-cycleway {
     stroke: #58a9ed;
 }
+.preset-icon-line path.stroke.tag-highway-cycleway {
+    stroke: #fff;
+}
 
 .preset-icon .icon.tag-route-horse,
-.preset-icon .icon.highway-bridleway {
+.preset-icon .icon.tag-highway-bridleway {
     color: #e06d5f;
     fill: #fff;
 }
-path.stroke.tag-highway-bridleway {
+path.line.stroke.tag-highway-bridleway,
+.preset-icon-line path.casing.tag-highway-bridleway {
     stroke: #e06d5f;
 }
+.preset-icon-line path.stroke.tag-highway-bridleway {
+    stroke: #fff;
+}
 
-.preset-icon .icon.highway-steps {
+.preset-icon .icon.tag-highway-steps {
     color: #81d25c;
     fill: #fff;
 }
-path.stroke.tag-highway-steps {
-    stroke: #81d25c;
+path.line.stroke.tag-highway-steps {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
-path.casing.tag-highway-steps,
-path.casing.tag-highway-steps.tag-unpaved {
+.low-zoom path.line.stroke.tag-highway-steps {
+    stroke-dasharray: 2, 2;
+}
+path.line.casing.tag-highway-steps,
+path.line.casing.tag-highway-steps.tag-unpaved {
     stroke: #fff;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
+path.line.stroke.tag-highway-steps,
+.preset-icon-line path.line.casing.tag-highway-steps {
+    stroke: #81d25c;
+}
+.preset-icon-line path.line.stroke.tag-highway-steps {
+    stroke: #fff;
+}
 
-
+/* highway midpoints */
+g.midpoint.tag-highway-corridor .fill,
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
+}
 /* aeroways */
-path.stroke.tag-aeroway-taxiway {
-    stroke: #805C80;
-    stroke-width: 4;
+
+/* areas */
+path.area.stroke.tag-aeroway,
+.low-zoom path.area.stroke.tag-aeroway {
+    stroke: #fff;
+    stroke-dasharray: none;
+    stroke-width: 1;
+}
+path.area.fill.tag-aeroway-runway {
+    stroke: rgba(0, 0, 0, 0.6);
+    fill: rgba(0, 0, 0, 0.6);
 }
-path.shadow.tag-aeroway-runway {
+
+/* lines */
+/* narrow aeroways (taxiway) */
+path.line.shadow.tag-aeroway-taxiway,
+path.line.shadow.tag-taxiway {
+    stroke-width: 16;
+}
+path.line.casing.tag-aeroway-taxiway,
+path.line.casing.tag-taxiway {
+    stroke-width: 7;
+}
+path.line.stroke.tag-aeroway-taxiway,
+path.line.stroke.tag-taxiway {
+    stroke-width: 5;
+}
+.low-zoom path.line.shadow.tag-aeroway-taxiway,
+.low-zoom path.line.shadow.tag-taxiway {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-aeroway-taxiway,
+.low-zoom path.line.casing.tag-taxiway {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-aeroway-taxiway,
+.low-zoom path.line.stroke.tag-taxiway {
+    stroke-width: 3;
+}
+
+.preset-icon .icon.tag-aeroway-taxiway,
+.preset-icon .icon.tag-taxiway {
+    color: #ff0;
+    fill: #666;
+}
+path.line.stroke.tag-aeroway-taxiway,
+path.line.stroke.tag-taxiway {
+    stroke: #ff0;
+}
+path.line.casing.tag-aeroway-taxiway,
+path.line.casing.tag-taxiway {
+    stroke: #666;
+}
+
+/* wide aeroways (runway) */
+.preset-icon .icon.tag-aeroway-runway,
+.preset-icon .icon.tag-runway {
+    color: #444;
+    fill: #000;
+}
+path.line.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
-path.stroke.tag-aeroway-runway {
+path.line.casing.tag-aeroway-runway {
+    stroke-width: 10;
+    stroke: #000;
+    stroke-linecap: square;
+}
+path.line.stroke.tag-aeroway-runway {
     stroke: #fff;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 24, 48;
 }
-path.casing.tag-aeroway-runway {
-    stroke-width: 10;
-    stroke: #000;
-    stroke-linecap: square;
+.low-zoom path.line.shadow.tag-aeroway-runway {
+    stroke-width: 16;
 }
-path.fill.tag-aeroway-runway {
-    stroke: rgba(0, 0, 0, 0.6);
-    fill: rgba(0, 0, 0, 0.6);
+.low-zoom path.line.casing.tag-aeroway-runway {
+    stroke-width: 7;
 }
-path.stroke.tag-aeroway-apron {
-    stroke: #805C80;
+.low-zoom path.line.stroke.tag-aeroway-runway {
+    stroke-width: 2;
+    stroke-dasharray: 12, 24;
 }
-path.fill.tag-aeroway-apron {
-    stroke: rgba(128, 92, 128, 0.2);
-    fill: rgba(128, 92, 128, 0.2);
+.preset-icon-line path.line.stroke.tag-aeroway-runway {
+    stroke-dasharray: 0, 14, 8, 14;
 }
-
-
 /* railways */
+
+/* defaults */
 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;
@@ -1141,104 +1486,80 @@ path.fill.tag-aeroway-apron {
     color: #555;
     fill: #eee;
 }
-path.stroke.tag-railway {
-    stroke: #eee;
+
+/* lines */
+/* narrow widths */
+path.line.shadow.tag-railway {
+    stroke-width: 16;
+}
+path.line.casing.tag-railway {
+    stroke-width: 7;
+}
+path.line.stroke.tag-railway {
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-path.casing.tag-railway {
+.low-zoom path.line.shadow.tag-railway {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-railway {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-railway {
+    stroke-width: 2;
+    stroke-dasharray: 6,6;
+}
+.preset-icon-line path.line.stroke.tag-railway:not(.tag-status) {
+    stroke-dasharray: 6;
+}
+
+/* styles */
+path.line.casing.tag-railway {
     stroke: #555;
-    stroke-width: 4;
+}
+path.line.stroke.tag-railway {
+    stroke: #eee;
 }
 
+
 .preset-icon .icon.tag-railway-disused,
 .preset-icon .icon.tag-railway-abandoned {
     color: #999;
     fill: #eee;
 }
-path.stroke.tag-railway-abandoned {
-    stroke: #eee;
-}
-path.casing.tag-railway-abandoned {
+path.line.casing.tag-railway-disused,
+path.line.casing.tag-railway-abandoned {
     stroke: #999;
 }
-
-.preset-icon .icon.tag-railway-subway {
-    color: #222;
-    fill: #bbb;
-}
-path.stroke.tag-railway-subway {
-    stroke: #bbb;
-}
-path.casing.tag-railway-subway {
-    stroke: #222;
+path.line.stroke.tag-railway-disused,
+path.line.stroke.tag-railway-abandoned {
+    stroke: #eee;
 }
 
-path.stroke.tag-railway-platform {
-    stroke: #999;
-    stroke-width: 4;
-    stroke-dasharray: none;
-}
-path.casing.tag-railway-platform {
-    stroke: none;
-}
 
-.area.stroke.tag-railway {
-    stroke: white;
-    stroke-width: 1;
-    stroke-dasharray: none;
+path.line.casing.tag-railway-subway {
+    stroke: #222;
 }
-.area.casing.tag-railway {
-    stroke: none;
+path.line.stroke.tag-railway-subway {
+    stroke: #bbb;
 }
-
-
 /* waterways */
+
+/* defaults */
 .preset-icon .icon.tag-waterway.other-line {
-    color: #77d3de;
-    fill: #77d3de;
+    color: #7dd;
+    fill: #7dd;
 }
-.preset-icon .icon.category-water,
-.preset-icon .icon.tag-route-ferry,
+.preset-icon .icon.iD-category-water,
+.preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
-    color: #77d3de;
+    color: #7dd;
     fill: #fff;
 }
 
-path.fill.tag-waterway {
-    stroke: rgba(119, 211, 222, 0.3);
-    fill: rgba(119, 211, 222, 0.3);
-}
-
-path.stroke.tag-waterway {
-    stroke: #77d3de;
-    stroke-width: 2;
-}
-path.casing.tag-waterway {
-    stroke: #77d3de;
-    stroke-width: 4;
-}
-
-path.stroke.tag-waterway-river {
-    stroke-width: 4;
-}
-path.casing.tag-waterway-river {
-    stroke-width: 6;
-}
-
-.preset-icon .icon.tag-waterway-ditch {
-    color: #6591ff;
-}
-path.stroke.tag-waterway-ditch {
-    stroke: #6591ff;
-    stroke-width: 1;
-}
-path.casing.tag-waterway-ditch {
-    stroke: #6591ff;
-    stroke-width: 3;
-}
 
+/* areas */
 path.area.stroke.tag-waterway-dock,
 path.area.stroke.tag-waterway-boatyard,
 path.area.stroke.tag-waterway-fuel {
@@ -1257,287 +1578,611 @@ path.area.fill.tag-waterway-fuel {
     fill: rgba(255, 255, 255, 0.3);
 }
 
-
-/* power */
-.preset-icon .icon.tag-man_made-pipeline,
-.preset-icon .icon.tag-power {
-    color: #939393;
-    fill: #939393;
+/* lines */
+path.line.fill.tag-waterway {
+    stroke: rgba(119, 211, 222, 0.3);
+    fill: rgba(119, 211, 222, 0.3);
 }
-
-path.stroke.tag-power {
-    stroke: #939393;
-    stroke-width: 2;
+path.line.casing.tag-waterway {
+    stroke: #444;
 }
-path.casing.tag-power {
-    stroke: none;
+path.line.stroke.tag-waterway {
+    stroke: #7dd;
 }
 
 
-/* boundaries */
-path.stroke.tag-boundary {
-    stroke: #fff;
-    stroke-width: 2;
-    stroke-linecap: butt;
-    stroke-dasharray: 20, 5, 5, 5;
+/* narrow waterways (default) */
+path.line.shadow.tag-waterway {
+    stroke-width: 16;
 }
-path.casing.tag-boundary {
-    stroke: #82B5FE;
-    stroke-width: 6;
+path.line.casing.tag-waterway {
+    stroke-width: 7;
 }
-
-path.casing.tag-boundary-protected_area,
-path.casing.tag-boundary-national_park {
-    stroke: #b0e298;
+path.line.stroke.tag-waterway {
+    stroke-width: 5;
 }
 
-
-/* barriers */
-path.stroke.tag-barrier {
-    stroke: #ddd;
-    stroke-width: 3px;
-    stroke-linecap: round;
-    stroke-dasharray: 15, 5, 1, 5;
+.low-zoom path.line.shadow.tag-waterway {
+    stroke-width: 12;
 }
-.low-zoom path.stroke.tag-barrier {
-    stroke-width: 2px;
-    stroke-linecap: butt;
-    stroke-dasharray: 8, 2, 2, 2;
+.low-zoom path.line.casing.tag-waterway {
+    stroke-width: 5;
 }
-
-
-/* bridges */
-path.casing.tag-bridge {
-    stroke-width: 16;
-    stroke-opacity: 0.6;
-    stroke: #000;
-    stroke-linecap: butt;
-    stroke-dasharray: none;
+.low-zoom path.line.stroke.tag-waterway {
+    stroke-width: 3;
 }
 
-path.shadow.tag-bridge {
-    stroke-width: 22;
-}
-path.casing.line.tag-railway.tag-bridge,
-path.casing.tag-highway-living_street.tag-bridge,
-path.casing.tag-highway-path.tag-bridge,
-path.casing.tag-highway-corridor.tag-bridge,
-path.casing.line.tag-highway-pedestrian.tag-bridge,
-path.casing.tag-highway-service.tag-bridge,
-path.casing.tag-highway-track.tag-bridge,
-path.casing.tag-highway-steps.tag-bridge,
-path.casing.tag-highway-footway.tag-bridge,
-path.casing.tag-highway-cycleway.tag-bridge,
-path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 10;
+
+/* wide waterways (river) */
+path.line.shadow.tag-waterway-river {
+    stroke-width: 20;
 }
-path.shadow.line.tag-railway.tag-bridge,
-path.shadow.tag-highway-living_street.tag-bridge,
-path.shadow.tag-highway-path.tag-bridge,
-path.shadow.tag-highway-corridor.tag-bridge,
-path.shadow.line.tag-highway-pedestrian.tag-bridge,
-path.shadow.tag-highway-service.tag-bridge,
-path.shadow.tag-highway-track.tag-bridge,
-path.shadow.tag-highway-steps.tag-bridge,
-path.shadow.tag-highway-footway.tag-bridge,
-path.shadow.tag-highway-cycleway.tag-bridge,
-path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 17;
-}
-.low-zoom path.casing.tag-bridge {
+path.line.casing.tag-waterway-river {
     stroke-width: 10;
 }
-.low-zoom path.shadow.tag-bridge {
-    stroke-width: 14;
+path.line.stroke.tag-waterway-river {
+    stroke-width: 8;
 }
 
-.low-zoom path.casing.line.tag-railway.tag-bridge,
-.low-zoom path.casing.tag-highway-living_street.tag-bridge,
-.low-zoom path.casing.tag-highway-path.tag-bridge,
-.low-zoom path.casing.tag-highway-corridor.tag-bridge,
-.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
-.low-zoom path.casing.tag-highway-service.tag-bridge,
-.low-zoom path.casing.tag-highway-track.tag-bridge,
-.low-zoom path.casing.tag-highway-steps.tag-bridge,
-.low-zoom path.casing.tag-highway-footway.tag-bridge,
-.low-zoom path.casing.tag-highway-cycleway.tag-bridge,
-.low-zoom path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 6;
+.low-zoom path.line.shadow.tag-waterway-river {
+    stroke-width: 16;
 }
-
-.low-zoom path.shadow.line.tag-railway.tag-bridge,
-.low-zoom path.shadow.tag-highway-living_street.tag-bridge,
-.low-zoom path.shadow.tag-highway-path.tag-bridge,
-.low-zoom path.shadow.tag-highway-corridor.tag-bridge,
-.low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
-.low-zoom path.shadow.tag-highway-service.tag-bridge,
-.low-zoom path.shadow.tag-highway-track.tag-bridge,
-.low-zoom path.shadow.tag-highway-steps.tag-bridge,
-.low-zoom path.shadow.tag-highway-footway.tag-bridge,
-.low-zoom path.shadow.tag-highway-cycleway.tag-bridge,
-.low-zoom path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 13;
+.low-zoom path.line.casing.tag-waterway-river {
+    stroke-width: 7;
+}
+.low-zoom path.line.stroke.tag-waterway-river {
+    stroke-width: 5;
 }
 
 
-/* tunnels */
-path.stroke.tag-tunnel {
-    stroke-opacity: 0.3;
+/* ditch */
+.preset-icon .icon.tag-waterway-ditch {
+    color: #39a;
 }
-path.casing.tag-tunnel {
-    stroke-opacity: 0.5;
-    stroke-linecap: butt;
-    stroke-dasharray: none;
+path.line.stroke.tag-waterway-ditch {
+    stroke: #39a;
 }
 
 
-/* embankments / cuttings */
-path.casing.tag-embankment,
-path.casing.tag-cutting {
-    stroke-opacity: 0.5;
-    stroke: #000;
-    stroke-width: 22;
-    stroke-dasharray: 2, 4;
+/* narrow width miscellanous things */
+path.line.shadow.tag-aerialway,
+path.line.shadow.tag-attraction-summer_toboggan,
+path.line.shadow.tag-attraction-water_slide,
+path.line.shadow.tag-golf-cartpath,
+path.line.shadow.tag-man_made-pipeline,
+path.line.shadow.tag-natural-tree_row,
+path.line.shadow.tag-piste {
+    stroke-width: 16;
+}
+path.line.casing.tag-aerialway,
+path.line.casing.tag-attraction-summer_toboggan,
+path.line.casing.tag-attraction-water_slide,
+path.line.casing.tag-golf-cartpath,
+path.line.casing.tag-man_made-pipeline,
+path.line.casing.tag-natural-tree_row,
+path.line.casing.tag-piste {
+    stroke-width: 7;
+}
+path.line.stroke.tag-aerialway,
+path.line.stroke.tag-attraction-summer_toboggan,
+path.line.stroke.tag-attraction-water_slide,
+path.line.stroke.tag-golf-cartpath,
+path.line.stroke.tag-man_made-pipeline,
+path.line.stroke.tag-natural-tree_row,
+path.line.stroke.tag-piste {
+    stroke-width: 5;
+}
+
+.low-zoom path.line.shadow.tag-aerialway,
+.low-zoom path.line.shadow.tag-attraction-summer_toboggan,
+.low-zoom path.line.shadow.tag-attraction-water_slide,
+.low-zoom path.line.shadow.tag-golf-cartpath,
+.low-zoom path.line.shadow.tag-man_made-pipeline,
+.low-zoom path.line.shadow.tag-natural-tree_row,
+.low-zoom path.line.shadow.tag-piste {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-aerialway,
+.low-zoom path.line.casing.tag-attraction-summer_toboggan,
+.low-zoom path.line.casing.tag-attraction-water_slide,
+.low-zoom path.line.casing.tag-golf-cartpath,
+.low-zoom path.line.casing.tag-man_made-pipeline,
+.low-zoom path.line.casing.tag-natural-tree_row,
+.low-zoom path.line.casing.tag-piste {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-aerialway,
+.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
+.low-zoom path.line.stroke.tag-attraction-water_slide,
+.low-zoom path.line.stroke.tag-golf-cartpath,
+.low-zoom path.line.stroke.tag-man_made-pipeline,
+.low-zoom path.line.stroke.tag-natural-tree_row,
+.low-zoom path.line.stroke.tag-piste {
+    stroke-width: 3;
+}
+
+
+/* ferry routes  */
+.preset-icon .icon.tag-route-ferry {
+    color: #58a9ed;
+    fill: #fff;
+}
+path.line.shadow.tag-route-ferry {
+    stroke-width: 16;
+}
+path.line.stroke.tag-route-ferry {
+    stroke-width: 3;
     stroke-linecap: butt;
+    stroke-dasharray: 12,8;
+}
+.low-zoom path.line.shadow.tag-route-ferry {
+    stroke-width: 12;
+}
+.low-zoom path.line.stroke.tag-route-ferry,
+.preset-icon-line path.line.stroke.tag-route-ferry {
+    stroke-width: 2;
+    stroke-dasharray: 6,4;
+}
+path.line.stroke.tag-route-ferry {
+    stroke: #58a9ed;
+}
+path.line.casing.tag-route-ferry {
+    stroke: none;
 }
 
-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
-    stroke-width: 28;
+
+/* aerialways */
+path.line.stroke.tag-aerialway {
+    stroke: #c55;
+}
+path.line.casing.tag-aerialway {
+    stroke: #444;
+}
+
+
+/* pistes */
+path.line.stroke.tag-piste {
+    stroke: #a9d;
+}
+path.line.casing.tag-piste {
+    stroke: #444;
+}
+
+
+/* Attractions */
+path.line.stroke.tag-attraction-summer_toboggan {
+    stroke: #9e9e9e;
+}
+path.line.casing.tag-attraction-summer_toboggan {
+    stroke: #666;
+}
+
+path.line.stroke.tag-attraction-water_slide {
+    stroke: #aae0cb;
+}
+path.line.casing.tag-attraction-water_slide {
+    stroke: #3d6c71;
+}
+
+
+/* golf cartpaths (like service roads) */
+.preset-icon .icon.tag-golf-cartpath {
+    color: #dca;
+    fill: #666;
+}
+path.line.stroke.tag-golf-cartpath {
+    stroke: #dca;
+}
+path.line.casing.tag-golf-cartpath {
+    stroke: #666;
+}
+
+
+/* power and pipeline */
+.preset-icon .icon.tag-man_made-pipeline,
+.preset-icon .icon.tag-power {
+    color: #939393;
+    fill: #939393;
+}
+
+
+/* power */
+path.line.stroke.tag-power {
+    stroke: #939393;
+    stroke-width: 2;
+}
+path.line.casing.tag-power {
+    stroke: none;
+}
+
+
+/* pipeline */
+path.line.stroke.tag-man_made-pipeline {
+    stroke: #cbd0d8;
+    stroke-linecap: butt;
+    stroke-dasharray: 80, 1.25;
+}
+path.line.casing.tag-man_made-pipeline {
+    stroke: #666;
+}
+.low-zoom path.line.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 40, 1;
+}
+.preset-icon-line path.line.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 19, 1;
+}
+
+
+/* boundaries */
+path.line.stroke.tag-boundary {
+    stroke: #fff;
+    stroke-width: 2;
+    stroke-linecap: butt;
+    stroke-dasharray: 20, 5, 5, 5;
+}
+path.line.casing.tag-boundary {
+    stroke: #82b5fe;
+    stroke-width: 6;
+}
+
+path.line.casing.tag-boundary-protected_area,
+path.line.casing.tag-boundary-national_park {
+    stroke: #b0e298;
+}
+
+
+/* barriers and similar */
+path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
+    stroke: #ddd;
+}
+.preset-icon-line path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
+    stroke: rgb(170, 170, 170);
+}
+path.line.casing.tag-natural,
+path.line.casing.tag-barrier,
+path.line.casing.tag-man_made-groyne,
+path.line.casing.tag-man_made-breakwater {
+    stroke: none;
+}
+path.line.stroke.tag-barrier,
+path.line.stroke.tag-man_made-groyne,
+path.line.stroke.tag-man_made-breakwater {
+    stroke-width: 3px;
+    stroke-linecap: round;
+    stroke-dasharray: 15, 5, 1, 5;
+}
+.low-zoom path.line.stroke.tag-barrier,
+.low-zoom path.line.stroke.tag-man_made-groyne,
+.low-zoom path.line.stroke.tag-man_made-breakwater {
+    stroke-width: 2px;
+    stroke-linecap: butt;
+    stroke-dasharray: 8, 2, 2, 2;
+}
+.preset-icon-line path.line.stroke.tag-barrier,
+.preset-icon-line path.line.stroke.tag-man_made-groyne,
+.preset-icon-line path.line.stroke.tag-man_made-breakwater {
+    stroke-dasharray: 1, 4, 6, 4;
+}
+
+
+/* bridges */
+path.line.casing.tag-bridge {
+    stroke-opacity: 0.6;
+    stroke: #000 !important;
+    stroke-linecap: butt;
+    stroke-dasharray: none;
+}
+path.line.shadow.tag-bridge {
+    stroke-width: 24;
+}
+path.line.casing.tag-bridge {
+    stroke-width: 16;
+}
+.low-zoom path.line.shadow.tag-bridge {
+    stroke-width: 16;
+}
+.low-zoom path.line.casing.tag-bridge {
+    stroke-width: 10;
 }
 
-.low-zoom path.casing.tag-embankment,
-.low-zoom path.casing.tag-cutting {
+path.line.shadow.tag-railway.tag-bridge,
+path.line.shadow.tag-highway-living_street.tag-bridge,
+path.line.shadow.tag-highway-path.tag-bridge,
+path.line.shadow.tag-highway-corridor.tag-bridge,
+path.line.shadow.tag-highway-pedestrian.tag-bridge,
+path.line.shadow.tag-highway-service.tag-bridge,
+path.line.shadow.tag-highway-track.tag-bridge,
+path.line.shadow.tag-highway-steps.tag-bridge,
+path.line.shadow.tag-highway-footway.tag-bridge,
+path.line.shadow.tag-highway-cycleway.tag-bridge,
+path.line.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 18;
+}
+path.line.casing.tag-railway.tag-bridge,
+path.line.casing.tag-highway-living_street.tag-bridge,
+path.line.casing.tag-highway-path.tag-bridge,
+path.line.casing.tag-highway-corridor.tag-bridge,
+path.line.casing.tag-highway-pedestrian.tag-bridge,
+path.line.casing.tag-highway-service.tag-bridge,
+path.line.casing.tag-highway-track.tag-bridge,
+path.line.casing.tag-highway-steps.tag-bridge,
+path.line.casing.tag-highway-footway.tag-bridge,
+path.line.casing.tag-highway-cycleway.tag-bridge,
+path.line.casing.tag-highway-bridleway.tag-bridge {
     stroke-width: 10;
 }
 
-.low-zoom path.shadow.tag-embankment,
-.low-zoom path.shadow.tag-cutting {
+.low-zoom path.line.shadow.tag-railway.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-living_street.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-path.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-corridor.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-service.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-track.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-steps.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-footway.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-cycleway.tag-bridge,
+.low-zoom path.line.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 14;
+}
+.low-zoom path.line.casing.tag-railway.tag-bridge,
+.low-zoom path.line.casing.tag-highway-living_street.tag-bridge,
+.low-zoom path.line.casing.tag-highway-path.tag-bridge,
+.low-zoom path.line.casing.tag-highway-corridor.tag-bridge,
+.low-zoom path.line.casing.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.line.casing.tag-highway-service.tag-bridge,
+.low-zoom path.line.casing.tag-highway-track.tag-bridge,
+.low-zoom path.line.casing.tag-highway-steps.tag-bridge,
+.low-zoom path.line.casing.tag-highway-footway.tag-bridge,
+.low-zoom path.line.casing.tag-highway-cycleway.tag-bridge,
+.low-zoom path.line.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 6;
+}
+
+
+/* tunnels */
+path.line.stroke.tag-tunnel,
+path.line.stroke.tag-location-underground,
+path.line.stroke.tag-location-underwater {
+    stroke-opacity: 0.3;
+}
+path.line.casing.tag-tunnel,
+path.line.casing.tag-location-underground,
+path.line.stroke.tag-location-underwater {
+    stroke-opacity: 0.5;
+    stroke-linecap: butt;
+    stroke-dasharray: none;
+}
+
+
+/* embankments / cuttings */
+path.line.shadow.tag-embankment,
+path.line.shadow.tag-cutting {
+    stroke-width: 28;
+}
+path.line.casing.tag-embankment,
+path.line.casing.tag-cutting {
+    stroke-opacity: 0.5;
+    stroke: #000;
+    stroke-width: 22;
+    stroke-dasharray: 2, 4;
+    stroke-linecap: butt;
+}
+
+.low-zoom path.line.shadow.tag-embankment,
+.low-zoom path.line.shadow.tag-cutting {
     stroke-width: 14;
 }
+.low-zoom path.line.casing.tag-embankment,
+.low-zoom path.line.casing.tag-cutting {
+    stroke-width: 10;
+}
 
 
 /* Surface - unpaved */
-path.casing.tag-unpaved {
+path.line.casing.tag-unpaved {
     stroke: #ccc;
     stroke-linecap: butt;
     stroke-dasharray: 4, 3;
 }
-.low-zoom path.casing.tag-unpaved {
+.low-zoom path.line.casing.tag-unpaved {
     stroke-dasharray: 3, 2;
 }
-path.casing.tag-bridge.tag-unpaved {
+path.line.casing.tag-bridge.tag-unpaved {
     stroke: #000;
     stroke-dasharray: 4, 3;
 }
-.low-zoom path.casing.tag-bridge.tag-unpaved {
+.low-zoom path.line.casing.tag-bridge.tag-unpaved {
     stroke: #000;
     stroke-dasharray: 3, 2;
 }
 
 
-/* Status (e.g. construction, proposed, abandoned) */
-path.stroke.tag-status,
-path.casing.tag-status {
+/* Status (e.g. proposed, abandoned) */
+path.area.stroke.tag-status,
+path.line.stroke.tag-status,
+path.area.casing.tag-status,
+path.line.casing.tag-status {
     stroke-linecap: butt;
     stroke-dasharray: 7, 3;
 }
-.low-zoom path.stroke.tag-status,
-.low-zoom path.casing.tag-status {
+.low-zoom path.area.stroke.tag-status,
+.low-zoom path.line.stroke.tag-status,
+.low-zoom path.area.casing.tag-status,
+.low-zoom path.line.casing.tag-status {
     stroke-dasharray: 5, 2;
 }
 
+/* Road Closed Status */
+.preset-icon .icon.tag-highway.tag-status-construction {
+    color: #fc6c14;
+    fill: #fff;
+}
+path.line.shadow.tag-status.tag-status-construction {
+    stroke-width: 20;
+}
+path.line.casing.tag-status.tag-status-construction {
+    stroke-width: 10;
+    stroke-linecap: butt;
+    stroke-dasharray: none
+}
+path.line.stroke.tag-status.tag-status-construction {
+    stroke-width: 8;
+    stroke-linecap: butt;
+    stroke-dasharray: 10, 10;
+}
+path.line.casing.tag-status.tag-status-construction,
+.preset-icon-line path.line.stroke.tag-status.tag-status-construction {
+    stroke: #fff;
+}
+path.line.stroke.tag-status.tag-status-construction,
+.preset-icon-line path.line.casing.tag-status.tag-status-construction {
+    stroke: #fc6c14;
+}
+.low-zoom path.line.shadow.tag-status.tag-status-construction {
+    stroke-width: 16;
+}
+.low-zoom path.line.casing.tag-status.tag-status-construction {
+    stroke-width: 7;
+}
+.low-zoom path.line.stroke.tag-status.tag-status-construction {
+    stroke-width: 5;
+    stroke-dasharray: 8, 8;
+}
+
 
 /* Buildings */
-path.stroke.tag-building,
-path.stroke.tag-amenity-shelter {
+path.stroke.tag-building {
     stroke: rgb(224, 110, 95);
 }
-path.fill.tag-building,
-path.fill.tag-amenity-shelter {
+path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
-.preset-icon-fill-area.tag-building,
-.preset-icon-fill-area.tag-amenity-shelter {
+.preset-icon-fill-area.tag-parking-multi-storey,
+.preset-icon-fill-area.tag-building {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }
 
 
-/* Labels / Markers */
-
-text {
-    font-size:10px;
-    pointer-events: none;
-    color: #222;
-    opacity: 1;
+/* "Special" paths - platforms, piers, crossings */
+.preset-icon .icon.tag-golf-path,
+.preset-icon .icon.tag-public_transport-platform,
+.preset-icon .icon.tag-railway-platform,
+.preset-icon .icon.tag-man_made-pier,
+.preset-icon .icon.tag-footway.tag-footway-crossing,
+.preset-icon .icon.tag-crossing {
+    color: #988;
+    fill: #dca;
 }
 
-.oneway .textpath.tag-waterway {
-    fill: #002F35;
+.preset-icon-fill-area.tag-golf-path,
+.preset-icon-fill-area.tag-public_transport-platform,
+.preset-icon-fill-area.tag-railway-platform,
+.preset-icon-fill-area.tag-man_made-pier,
+.preset-icon-fill-area.tag-footway.tag-footway-crossing,
+.preset-icon-fill-area.tag-crossing {
+    border-color: #988;
+    background-color: #dca;
 }
 
-path.oneway {
-    stroke-width: 6px;
+path.line.shadow.tag-golf-path,
+path.line.shadow.tag-public_transport-platform,
+path.line.shadow.tag-railway-platform,
+path.line.shadow.tag-man_made-pier,
+path.line.shadow.tag-footway.tag-footway-crossing,
+path.line.shadow.tag-crossing {
+    stroke-width: 16;
 }
-
-
-text.arealabel-halo,
-text.linelabel-halo,
-text.pointlabel-halo,
-text.arealabel,
-text.linelabel,
-text.pointlabel {
-    dominant-baseline: middle;
-    text-anchor: middle;
-    font-size: 12px;
-    font-weight: bold;
-    fill: #333;
-    pointer-events: none;
-    -webkit-transition: opacity 100ms linear;
-    transition: opacity 100ms linear;
-    -moz-transition: opacity 100ms linear;
+path.line.casing.tag-golf-path,
+path.line.casing.tag-public_transport-platform,
+path.line.casing.tag-railway-platform,
+path.line.casing.tag-man_made-pier,
+path.line.casing.tag-footway.tag-footway-crossing,
+path.line.casing.tag-crossing {
+    stroke: #dca;
+    stroke-width: 5;
+    stroke-linecap: round;
+    stroke-dasharray: none;
 }
-
-/* Opera doesn't support dominant-baseline. See #715 */
-/* Safari 10 seems to have regressed too */
-.linelabel-halo .textpath,
-.linelabel .textpath {
-  baseline-shift: -33%;
-  dominant-baseline: auto;
+path.line.stroke.tag-golf-path,
+path.line.stroke.tag-public_transport-platform,
+path.line.stroke.tag-railway-platform,
+path.line.stroke.tag-man_made-pier,
+path.line.stroke.tag-footway.tag-footway-crossing,
+path.line.stroke.tag-crossing {
+    stroke: #988;
+    stroke-width: 3;
+    stroke-linecap: butt;
+    stroke-dasharray: 6, 6;
 }
 
-.layer-halo text {
-    opacity: 0.7;
-    stroke: #fff;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
+.low-zoom path.line.shadow.tag-golf-path,
+.low-zoom path.line.shadow.tag-public_transport-platform,
+.low-zoom path.line.shadow.tag-railway-platform,
+.low-zoom path.line.shadow.tag-man_made-pier,
+.low-zoom path.line.shadow.tag-footway.tag-footway-crossing,
+.low-zoom path.line.shadow.tag-crossing {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-golf-path,
+.low-zoom path.line.casing.tag-public_transport-platform,
+.low-zoom path.line.casing.tag-railway-platform,
+.low-zoom path.line.casing.tag-man_made-pier,
+.low-zoom path.line.casing.tag-footway.tag-footway-crossing,
+.low-zoom path.line.casing.tag-crossing {
+    stroke-width: 3;
 }
-
-text.proximate {
-    opacity: 0;
+.low-zoom path.line.stroke.tag-golf-path,
+.low-zoom path.line.stroke.tag-public_transport-platform,
+.low-zoom path.line.stroke.tag-railway-platform,
+.low-zoom path.line.stroke.tag-man_made-pier,
+.low-zoom path.line.stroke.tag-footway.tag-footway-crossing,
+.low-zoom path.line.stroke.tag-crossing {
+    stroke-width: 1;
+    stroke-linecap: butt;
+    stroke-dasharray: 3, 3;
 }
 
-text.point {
-    font-size: 10px;
+g.midpoint.tag-golf-path .fill,
+g.midpoint.tag-public_transport-platform .fill,
+g.midpoint.tag-railway-platform .fill,
+g.midpoint.tag-man_made-pier .fill,
+g.midpoint.tag-footway.tag-footway-crossing .fill,
+g.midpoint.tag-crossing .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
 }
 
-/* Turns */
-
-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
+/* marked crossings, zebras */
+.preset-icon .icon.tag-crossing.tag-crossing-marked,
+.preset-icon .icon.tag-crossing.tag-crossing-zebra {
+    color: #444;
+    fill: #dca;
 }
-
-.form-field-restrictions .vertex {
-    pointer-events: none;
-    cursor: auto !important;
+path.line.casing.tag-crossing.tag-crossing-marked,
+path.line.casing.tag-crossing.tag-crossing-zebra {
+    stroke: #dca;
+}
+path.line.stroke.tag-crossing.tag-crossing-marked,
+path.line.stroke.tag-crossing.tag-crossing-zebra {
+    stroke: #444;
+    stroke-dasharray: 6, 4;
+}
+.low-zoom path.line.stroke.tag-crossing.tag-crossing-marked,
+.low-zoom path.line.stroke.tag-crossing.tag-crossing-zebra {
+    stroke-dasharray: 3, 2;
 }
-
 /* Cursors */
 
+.nope,
+.nope * {
+    cursor: not-allowed !important;
+}
+
 .map-in-map,
 #map {
     cursor: auto; /* Opera */
@@ -1587,44 +2232,36 @@ g.turn circle {
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
 }
 
-#map .point:active,
-#map .vertex:active,
-#map .line:active,
-#map .area:active,
-#map .midpoint:active,
-#map .mode-select .selected {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-acting.png") %>), pointer; /* FF */
-}
-
 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,
 .mode-add-area  #map,
-.mode-drag-node #map {
+.mode-drag-node #map,
+.mode-drag-note #map {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .way.hover,
-.mode-draw-area .way.hover,
-.mode-add-line  .way.hover,
-.mode-add-area  .way.hover,
-.mode-drag-node .way.hover {
+.mode-draw-line .way.target,
+.mode-draw-area .way.target,
+.mode-add-line  .way.target,
+.mode-add-area  .way.target,
+.mode-drag-node .way.target {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .vertex.hover,
-.mode-draw-area .vertex.hover,
-.mode-add-line  .vertex.hover,
-.mode-add-area  .vertex.hover,
-.mode-drag-node .vertex.hover {
+.mode-draw-line .vertex.target,
+.mode-draw-area .vertex.target,
+.mode-add-line  .vertex.target,
+.mode-add-area  .vertex.target,
+.mode-drag-node .vertex.target {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */
 }
 
 .mode-add-point #map,
+.mode-add-note #map,
 .mode-browse.lasso #map,
 .mode-browse.lasso .way,
 .mode-browse.lasso .vertex,
@@ -1637,277 +2274,728 @@ g.turn circle {
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }
 
+.mode-browse .note,
+.mode-browse .qa_error,
+.mode-select .note,
+.mode-select .qa_error,
 .turn rect,
 .turn circle {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
-}
-
-.lasso #map {
-    pointer-events: visibleStroke;
+    cursor: pointer;
 }
 
-/* GPX Paths */
-.layer-gpx {
-    pointer-events: none;
+/* photo viewer div */
+#photoviewer {
+    position: absolute;
+    bottom: 40px;
+    left: 10px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
 }
-
-path.gpx {
-    stroke: #FF26D4;
-    stroke-width: 2;
-    fill: none;
+[dir='rtl'] #photoviewer {
+    left: auto;
+    right: 10px;
 }
 
-text.gpx {
-    fill: #FF26D4;
+@media screen and (min-width: 1600px) {
+    #photoviewer {
+        width: 490px;
+        height: 370px;
+    }
 }
 
-/* Mapillary Image Layer */
+#photoviewer button.thumb-hide {
+    border-radius: 0;
+    padding: 5px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    z-index: 50;
+}
 
-.layer-mapillary-images {
-    pointer-events: none;
+#photoviewer button.resize-handle-xy {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 49;
+    cursor: nesw-resize;
+    height: 25px;
+    width: 25px;
+}
+
+#photoviewer button.resize-handle-x {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 48;
+    cursor: ew-resize;
+    height: auto;
+    width: 6px;
+}
+
+#photoviewer button.resize-handle-y {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 48;
+    cursor: ns-resize;
+    height: 6px;
+    width: 100%;
+}
+
+
+.photo-wrapper,
+.photo-wrapper img {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    object-fit: cover;
+}
+
+.photo-wrapper .photo-attribution {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    font-size: 10px;
+    text-align: right;
+    line-height: 1.1em;
+    padding: 4px 2px;
+    z-index: 10;
 }
 
-.layer-mapillary-images .viewfield-group {
+.photo-attribution a,
+.photo-attribution a:visited,
+.photo-attribution span {
+    padding: 4px 2px;
+    color: #fff;
+}
+
+/* markers and sequences */
+.viewfield-group {
+    pointer-events: none;
+}
+.mode-browse .viewfield-group,
+.mode-select .viewfield-group {
     pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
+    cursor: pointer;
 }
 
-.layer-mapillary-images .viewfield-group * {
-    stroke-width: 1;
-    stroke: #444;
-    fill: #ffc600;
-    z-index: 50;
+.viewfield-group.currentView * {
+    fill: #ffee00 !important;
+}
+.viewfield-group.hovered * {
+    fill: #eebb00 !important;
 }
 
-.layer-mapillary-images .viewfield-group:hover * {
+.viewfield-group circle {
+    stroke: #555;
     stroke-width: 1;
-    stroke: #333;
-    fill: #ff9900;
-    z-index: 60;
+    stroke-opacity: 0.4;
+    fill-opacity: 0.4;
 }
-
-.layer-mapillary-images .viewfield-group.selected  * {
+.viewfield-group.highlighted circle {
+    stroke: #222;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.hovered circle {
+    stroke: #222;
     stroke-width: 2;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.currentView circle {
     stroke: #222;
-    fill: #ff5800;
-    z-index: 60;
+    stroke-width: 2;
+    stroke-opacity: 1;
+    fill-opacity: 1;
 }
 
-.layer-mapillary-images .viewfield-group:hover path.viewfield,
-.layer-mapillary-images .viewfield-group.selected path.viewfield,
-.layer-mapillary-images .viewfield-group path.viewfield {
+.viewfield-group .viewfield {
     stroke-width: 0;
-    fill-opacity: 0.6;
+    stroke: #222;
+    fill-opacity: 0.4;
 }
-
-/* Mapillary Sign Layer */
-
-.layer-mapillary-signs {
-    pointer-events: none;
+.viewfield-group.highlighted .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.hovered .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.currentView .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.9;
 }
 
-.layer-mapillary-signs .icon-sign .icon-sign-body {
-    min-width: 20px;
-    height: 28px;
-    width: 28px;
-    border: 2px solid transparent;
-    pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
-    z-index: 70;
-    overflow: visible;
+.viewfield-group.currentView .viewfield-scale {
+    transform: scale(2,2);
 }
 
-.layer-mapillary-signs .icon-sign:hover .icon-sign-body {
-    border: 2px solid rgba(255,198,0,0.8);
-    z-index: 80;
- }
+.sequence {
+    fill: none;
+    stroke-width: 2;
+    stroke-opacity: 0.4;
+}
+.sequence.highlighted,
+.sequence.currentView {
+    stroke-width: 4;
+    stroke-opacity: 1;
+}
 
-.layer-mapillary-signs .icon-sign.selected .icon-sign-body {
-    border: 2px solid rgba(255,0,0,0.8);
-    z-index: 80;
- }
 
-.layer-mapillary-signs .icon-sign .t {
-    font-size: 28px;
-    z-index: 70;
+/* Streetside Image Layer */
+.layer-streetside-images {
+    pointer-events: none;
 }
-
-.layer-mapillary-signs .icon-sign:hover .t,
-.layer-mapillary-signs .icon-sign.selected .t {
-    z-index: 80;
+.layer-streetside-images .viewfield-group * {
+    fill: #0fffc4;
+}
+.layer-streetside-images .sequence {
+    stroke: #0fffc4;
+    stroke-opacity: 0.85;  /* bump opacity - only one per road */
 }
 
-/* Modes */
 
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
-    display: none;
+/* Mapillary Image Layer */
+.layer-mapillary-images {
+    pointer-events: none;
 }
+.layer-mapillary-images .viewfield-group * {
+    fill: #55ff22;
+}
+.layer-mapillary-images .sequence {
+    stroke: #55ff22;
+}
+
 
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
+/* Mapillary Sign Layer */
+.layer-mapillary-signs {
     pointer-events: none;
 }
+.layer-mapillary-signs .icon-sign {
+    outline: 2px solid transparent;
+    pointer-events: visible;
+    cursor: pointer;
+}
+.layer-mapillary-signs .icon-sign:hover {
+    outline: 5px solid #eebb00;
+    background-color: #eebb00;
+}
+.layer-mapillary-signs .icon-sign.currentView {
+    outline: 5px solid #ffee00;
+    background-color: #ffee00;
+}
+
 
-/* Ensure drawing doesn't interact with area fills. */
-.mode-add-point .area.fill,
-.mode-draw-line .area.fill,
-.mode-draw-area .area.fill,
-.mode-add-line .area.fill,
-.mode-add-area .area.fill,
-.mode-drag-node .area.fill {
+/* OpenStreetCam Image Layer */
+.layer-openstreetcam-images {
     pointer-events: none;
 }
+.layer-openstreetcam-images .viewfield-group * {
+    fill: #20c4ff;
+}
+.layer-openstreetcam-images .sequence {
+    stroke: #20c4ff;
+}
 
 
-/* Fill Styles */
-.low-zoom.fill-wireframe path.stroke,
-.fill-wireframe path.stroke {
-    stroke-width: 1;
-    stroke-opacity: 0.5;
-    stroke-dasharray: none;
-    fill: none;
+/* Streetside Viewer (pannellum) */
+.ms-wrapper .photo-attribution .image-link {
+    display: block;
+}
+.ms-wrapper .photo-attribution .attribution-row {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 5px;
+}
+.ms-wrapper .photo-attribution .image-view-link {
+    text-align: left;
+    margin: 0 5px;
+}
+.ms-wrapper .photo-attribution .image-report-link {
+    text-align: right;
 }
 
-.low-zoom.fill-wireframe path.shadow,
-.fill-wireframe path.shadow {
-    stroke-width: 8;
+.ms-wrapper .photo-attribution a:active,
+.ms-wrapper .photo-attribution a:hover {
+    color: #0fffc4;
 }
 
-.fill-wireframe path.shadow.related:not(.selected),
-.fill-wireframe path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.4;
+.ms-wrapper .pnlm-compass.pnlm-control {
+    width: 26px;
+    height: 26px;
+    left: 4px;
+    top: 60px;
+    background-size: contain;
+    background-repeat: no-repeat no-repeat;
 }
-.fill-wireframe path.shadow.selected {
-    stroke-opacity: 0.6;
+
+label.streetside-hires {
+    cursor: pointer;
+}
+.streetside-hires span {
+    margin-top: 2px;
+}
+.streetside-hires input[type="checkbox"] {
+    float: left;
+    width: 12px;
+    height: 12px;
+    margin: 0 5px;
 }
 
-.fill-wireframe .point,
-.fill-wireframe .areaicon,
-.fill-wireframe path.casing,
-.fill-wireframe path.fill,
-.fill-wireframe path.oneway {
+
+/* Mapillary viewer */
+#mly .domRenderer .TagSymbol {
+    font-size: 10px;
+    background-color: rgba(0,0,0,0.4);
+    padding: 0 4px;
+    border-radius: 4px;
+    top: -25px;
+}
+#mly .domRenderer .Attribution {
+    /* we will roll our own to avoid async update issues like #4526 */
     display: none;
 }
 
-.fill-partial path.fill {
-    fill-opacity: 0;
-    stroke-width: 60px;
-    pointer-events: visibleStroke;
+.mly-wrapper .photo-attribution a:active,
+.mly-wrapper .photo-attribution a:hover {
+    color: #35af6d;
 }
-/* Basics
-------------------------------------------------------- */
 
-/*
-  Opera misbehaves when the window is resized vertically unless 100% width + height are
-  applied to both html and body. https://gist.github.com/jfirebaugh/bd225bcfdd3a633850c4
-*/
-html, body {
-    width: 100%;
-    height: 100%;
+.mly-wrapper .mapillary-js-dom {
+    z-index: 9;
 }
 
-body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
-    margin:0;
-    padding:0;
-    min-width: 768px;
-    color:#333;
-    overflow: hidden;
+
+/* OpenStreetCam viewer */
+.osc-wrapper {
+    position: relative;
+    background-color: #000;
+    background-image: url(<%= asset_path("iD/img/loader-black.gif") %>);
+    background-position: center;
+    background-repeat: no-repeat;
 }
 
-.unsupported {
-    text-align: center;
-    vertical-align: middle;
-    padding-top: 100px;
-    font-size: 15px;
+.osc-wrapper .photo-attribution a:active,
+.osc-wrapper .photo-attribution a:hover {
+    color: #20c4ff;
 }
 
-.id-container {
+.osc-image-wrap {
+    width: 100%;
     height: 100%;
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+}
+
+
+/* photo-controls (step forward, back, rotate) */
+.photo-controls-wrap {
+    text-align: center;
+    position: absolute;
+    top: 10px;
     width: 100%;
-    min-width: 768px;
+    z-index: 10;
 }
 
-#content {
-    position: relative;
-    overflow: hidden;
-    height: 100%;
+.photo-controls {
+    display: inline-block;
+    z-index: 10;
 }
 
-#defs {
-    /* Can't be display: none or the clippaths are ignored. */
-    position: absolute;
-    width: 0;
-    height: 0;
+.photo-controls button,
+.photo-controls button:focus {
+    height: 18px;
+    width: 18px;
+    background: rgba(0,0,0,0.65);
+    color: #eee;
+    border-radius: 0;
+}
+.photo-controls button:first-of-type {
+    border-radius: 3px 0 0 3px;
+}
+.photo-controls button:last-of-type {
+    border-radius: 0 3px 3px 0;
+}
+.photo-controls button:hover,
+.photo-controls button:active {
+    background: rgba(0,0,0,0.85);
+    color: #fff;
 }
 
-.spacer {
-    height: 40px;
-    margin-right: 10px;
+/* OSM Notes and KeepRight Layers */
+
+.error-header-icon .qa_error-fill,
+.layer-keepRight .qa_error .qa_error-fill,
+.layer-improveOSM .qa_error .qa_error-fill {
+    stroke: #333;
+    stroke-width: 1.3px;  /* NOTE: likely a better way to scale the icon stroke */
 }
 
-.limiter {
-    position: relative;
-    max-width: 1200px;
+.note-header-icon .note-fill,
+.layer-notes .note .note-fill {
+    color: #f30;
+    stroke: #333;
+    stroke-width: 40px;
+}
+.note-header-icon.new .note-fill,
+.layer-notes .note.new .note-fill {
+    color: #fe0;
+    stroke: #333;
+    stroke-width: 40px;
+}
+.note-header-icon.closed .note-fill,
+.layer-notes .note.closed .note-fill {
+    color: #5d0;
+    stroke: #333;
+    stroke-width: 40px;
 }
 
-.spinner {
-    opacity: .5;
-    float: right;
+/* slight adjustments to preset icon for note icons */
+.note-header-icon .preset-icon-28 {
+    top: 18px;
+}
+.note-header-icon .note-icon-annotation {
+    position: absolute;
+    top: 22px;
+    left: 22px;
+    margin: auto;
+}
+.note-header-icon .note-icon-annotation .icon {
+    width: 15px;
+    height: 15px;
 }
 
-.spinner img {
-    height: 40px;
-    width: 40px;
-    border-radius: 4px;
-    margin-right: 10px;
-    background: black;
+/* adjustment for error icon */
+
+.error-header-icon .preset-icon-28 {
+    top: auto;
+    left: auto;
 }
 
-div, textarea, label, input, form, span, ul, li, ol, a, button, h1, h2, h3, h4, h5, p, img {
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+.error-header-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
-a, button, input, textarea {
-    -webkit-tap-highlight-color:rgba(0,0,0,0);
-    -webkit-touch-callout:none;
+/* Keep Right Errors
+------------------------------------------------------- */
+.keepRight.error_type-20,     /* multiple nodes on same spot */
+.keepRight.error_type-40,     /* impossible oneways */
+.keepRight.error_type-210,    /* self intersecting ways */
+.keepRight.error_type-270,    /* unusual motorway connection */
+.keepRight.error_type-310,    /* roundabout issues */
+.keepRight.error_type-320,    /* improper _link */
+.keepRight.error_type-350 {   /* improper bridge tag */
+    color: #ff9;
 }
 
-a,
-button,
-.checkselect label:hover,
-.opacity-options li,
-.radial-menu-item {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
+.keepRight.error_type-50 {    /* almost junctions */
+    color: #88f;
 }
 
-h2 {
-    font-size: 25px;
-    line-height: 1.25;
-    font-weight: bold;
-    margin-bottom: 20px;
+.keepRight.error_type-60,     /* deprecated tags */
+.keepRight.error_type-70,     /* tagging issues */
+.keepRight.error_type-90,     /* motorway without ref */
+.keepRight.error_type-100,    /* place of worship without religion */
+.keepRight.error_type-110,    /* poi without name */
+.keepRight.error_type-150,    /* railway crossing without tag */
+.keepRight.error_type-220,    /* misspelled tag */
+.keepRight.error_type-380 {   /* non-physical sport tag */
+    color: #5d0;
 }
 
-h3:last-child,
-h2:last-child,
-h4:last-child { margin-bottom: 0;}
+.keepRight.error_type-130 {   /* disconnected ways */
+    color: #fa3;
+}
 
-h3 {
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: bold;
-    margin-bottom: 10px;
+.keepRight.error_type-170 {   /* FIXME tag */
+    color: #ff0;
 }
 
+.keepRight.error_type-190 {   /* intersection without junction */
+    color: #f33;
+}
+
+.keepRight.error_type-200 {   /* overlapping ways */
+    color: #fdbf6f;
+}
+
+.keepRight.error_type-160,    /* railway layer conflict */
+.keepRight.error_type-230 {   /* layer conflict */
+    color: #b60;
+}
+
+.keepRight.error_type-280 {   /* boundary issues */
+    color: #5f47a0;
+}
+
+.keepRight.error_type-180,    /* relation without type */
+.keepRight.error_type-290 {   /* turn restriction issues */
+    color: #ace;
+}
+
+.keepRight.error_type-300,    /* missing maxspeed */
+.keepRight.error_type-390 {   /* missing tracktype */
+    color: #090;
+}
+
+.keepRight.error_type-360,    /* language unknown */
+.keepRight.error_type-370,    /* doubled places */
+.keepRight.error_type-410 {   /* website issues */
+    color: #f9b;
+}
+
+.keepRight.error_type-120,    /* way without nodes */
+.keepRight.error_type-400 {   /* geometry / turn angles */
+    color: #c35;
+}
+
+/* ImproveOSM Errors
+------------------------------------------------------- */
+
+.improveOSM.error_type-ow {   /* missing one way */
+    color: #1E90FF;
+}
+
+.improveOSM.error_type-mr-road {   /* missing road */
+    color: #B452CD;
+}
+.improveOSM.error_type-mr-path {   /* missing path */
+    color: #A0522D;
+}
+.improveOSM.error_type-mr-parking {   /* missing parking */
+    color: #EEEE00;
+}
+.improveOSM.error_type-mr-both {   /* missing road+parking */
+    color: #FFA500;
+}
+
+.improveOSM.error_type-tr {   /* missing turn restriction */
+    color: #EC1C24;
+}
+
+
+/* Custom Map Data (geojson, gpx, kml, vector tile) */
+.layer-mapdata {
+    pointer-events: none;
+}
+
+.layer-mapdata path.shadow {
+    pointer-events: stroke;
+    stroke: #f6634f;
+    stroke-width: 16;
+    stroke-opacity: 0;
+    fill: none;
+}
+.layer-mapdata path.MultiPoint.shadow,
+.layer-mapdata path.Point.shadow {
+    pointer-events: fill;
+    fill: #f6634f;
+    fill-opacity: 0;
+}
+.layer-mapdata path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4;
+}
+.layer-mapdata path.shadow.selected {
+    stroke-opacity: 0.7;
+}
+
+.layer-mapdata path.stroke {
+    stroke: #ff26d4;
+    stroke-width: 2;
+    fill: none;
+}
+
+.layer-mapdata path.fill {
+    stroke-width: 0;
+    stroke-opacity: 0.3;
+    stroke: #ff26d4;
+    fill: #ff26d4;
+    fill-opacity: 0.3;
+    fill-rule: evenodd;
+}
+
+.layer-mapdata text.label-halo,
+.layer-mapdata text.label {
+    font-size: 10px;
+    font-weight: bold;
+    dominant-baseline: middle;
+}
+.layer-mapdata text.label {
+    fill: #ff26d4;
+}
+.layer-mapdata text.label.hover,
+.layer-mapdata text.label.selected {
+    fill: #f6634f;
+}
+.layer-mapdata text.label-halo {
+    opacity: 0.7;
+    stroke: #000;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+/* Fill Styles */
+
+.low-zoom.fill-wireframe path.stroke,
+.fill-wireframe path.stroke {
+    stroke-width: 1 !important;
+    stroke-opacity: 0.5 !important;
+    stroke-dasharray: none !important;
+    fill: none !important;
+}
+.low-zoom.fill-wireframe .layer-mapdata path.stroke,
+.fill-wireframe .layer-mapdata path.stroke {
+    stroke-width: 2 !important;
+    stroke-opacity: 1 !important;
+}
+
+.low-zoom.fill-wireframe path.shadow,
+.fill-wireframe path.shadow {
+    stroke-width: 12;
+}
+
+.fill-wireframe path.shadow.related:not(.selected),
+.fill-wireframe path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4;
+}
+.fill-wireframe path.shadow.selected {
+    stroke-opacity: 0.6;
+}
+
+.fill-wireframe .point,
+.fill-wireframe .areaicon,
+.fill-wireframe .areaicon-halo,
+.fill-wireframe path.casing,
+.fill-wireframe path.fill,
+.fill-wireframe path.oneway {
+    display: none !important;
+}
+
+.fill-partial path.area.fill {
+    fill-opacity: 0;
+    stroke-width: 60px;
+    pointer-events: none;
+}
+.mode-browse .fill-partial path.area.fill,
+.mode-select .fill-partial path.area.fill {
+    pointer-events: visibleStroke;
+}
+/* Basics
+------------------------------------------------------- */
+/*
+  Opera misbehaves when the window is resized vertically unless 100% width + height are
+  applied to both html and body. https://gist.github.com/jfirebaugh/bd225bcfdd3a633850c4
+*/
+html, body {
+    width: 100%;
+    height: 100%;
+}
+
+body {
+    font: normal 12px/1.6667 "-apple-system", BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
+    margin: 0;
+    padding: 0;
+    color: #333;
+    overflow: hidden;
+    -ms-user-select: none;
+    -ms-content-zooming: none;
+}
+
+.unsupported {
+    text-align: center;
+    vertical-align: middle;
+    padding-top: 100px;
+    font-size: 15px;
+}
+
+.id-container {
+    height: 100%;
+    width: 100%;
+}
+
+#content {
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+}
+
+#content.active {
+    -webkit-filter: none !important;
+    filter: none !important;
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+#content.inactive {
+    -webkit-filter: grayscale(80%) brightness(80%);
+    filter: grayscale(80%) brightness(80%);
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+#defs {
+    /* Can't be display: none or the clippaths are ignored. */
+    position: absolute;
+    width: 0;
+    height: 0;
+}
+
+div, textarea, label, input, form, span, ul, li, ol, a, button, h1, h2, h3, h4, h5, p, img {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+a, button, input, textarea {
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-touch-callout: none;
+}
+
+ul li {
+    list-style: none;
+}
+
+a,
+button,
+.radial-menu-item {
+    cursor: pointer;
+}
+
+h2 {
+    font-size: 25px;
+    line-height: 1.25;
+    font-weight: bold;
+    margin-bottom: 20px;
+}
+
+h3:last-child,
+h2:last-child,
+h4:last-child { margin-bottom: 0;}
+
+h3 {
+    font-size: 16px;
+    line-height: 1.25;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
 h4, h5 {
     font-size: 12px;
     font-weight: bold;
@@ -1919,38 +3007,46 @@ h4, h5 {
     outline-style: none;
 }
 
+::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: #aaa;
+    opacity: 1; /* Firefox */
+}
+:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: #aaa;
+}
+::-ms-input-placeholder { /* Microsoft Edge */
+    color: #aaa;
+}
+
 p {
     font-size: 12px;
-    margin:0;
-    padding:0;
+    margin: 0;
+    padding: 0;
 }
-
 p:last-child {
     padding-bottom: 0;
 }
-
 em {
     font-style: italic;
 }
-
 strong {
     font-weight: bold;
 }
-
 a:visited, a {
     color: #7092ff;
 }
-
 a:hover {
-    color:#597be7;
+    color: #597be7;
 }
 
 /* Forms
 ------------------------------------------------------- */
-
 textarea  {
     resize: vertical;
-    font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/20px "-apple-system", BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
 }
 
 textarea,
@@ -1960,19 +3056,34 @@ input[type=number],
 input[type=url],
 input[type=tel],
 input[type=email] {
-    background-color: white;
+    background-color: #fff;
     color: #333;
-    border:1px solid #ccc;
-    padding:5px 10px;
-    height:30px;
-    width: 100%;
-    border-radius:4px;
+    border: 1px solid #ccc;
+    padding: 5px 20px 5px 10px;
+    height: 30px;
+    border-radius: 4px;
     text-overflow: ellipsis;
 }
+[dir='rtl'] textarea,
+[dir='rtl'] input[type=text],
+[dir='rtl'] input[type=search],
+[dir='rtl'] input[type=number],
+[dir='rtl'] input[type=url],
+[dir='rtl'] input[type=tel],
+[dir='rtl'] input[type=email] {
+    padding: 5px 10px 5px 20px;
+}
 
 textarea:focus,
 input:focus {
-    background-color: #F1F1F1;
+    background-color: #f1f1f1;
+}
+
+textarea.disabled,
+input.disabled {
+    color: #777;
+    background-color: #eee;
+    cursor: not-allowed;
 }
 
 input[type="checkbox"],
@@ -1982,30 +3093,27 @@ input[type="radio"] {
     height: 14px;
     margin-right: 5px;
     margin-top: 3px;
+    cursor: pointer;
 }
-
-/* remove bottom border radius when combobox is open */
-.combobox + * textarea:focus,
-.combobox + * input:focus {
-    border-bottom-left-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
+[dir='rtl'] input[type="checkbox"],
+[dir='rtl'] input[type="radio"] {
+    float: right;
+    margin-left: 5px;
+    margin-right: 0;
 }
 
 /* tables */
-
 table {
-    background-color: white;
+    background-color: #fff;
     border-collapse: collapse;
-    width:100%;
-    border-spacing:0;
+    width: 100%;
+    border-spacing: 0;
 }
-
 table th {
-    text-align:left;
+    text-align: left;
 }
-
 table.tags, table.tags td, table.tags th {
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     padding: 4px;
 }
 
@@ -2015,85 +3123,32 @@ table.tags, table.tags td, table.tags th {
 
 /* Grid
 ------------------------------------------------------- */
-
-.col0    { float:left; width:04.1666%; }
-.col1    { float:left; width:08.3333%; }
-.col2    { float:left; width:16.6666%; }
-.col3    { float:left; width:25.0000%; max-width: 300px; }
-.col4    { float:left; width:33.3333%; max-width: 400px; }
-.col5    { float:left; width:41.6666%; max-width: 500px; }
-.col6    { float:left; width:50.0000%; max-width: 600px; }
-.col7    { float:left; width:58.3333%; }
-.col8    { float:left; width:66.6666%; }
-.col9    { float:left; width:75.0000%; }
-.col10   { float:left; width:83.3333%; }
-.col11   { float:left; width:91.6666%; }
-.col12   { float:left; width:100.0000%; }
-
-/* UI Lists
-------------------------------------------------------- */
-
-ul li { list-style: none;}
-
-.toggle-list > label {
-    position: relative;
-    padding: 5px 10px;
-    display: block;
-    height: 30px;
-    background-color: white;
-    color: #7092FF;
-    cursor: pointer;
-}
-
-.toggle-list > label:hover {
-    background-color: #ececec;
-}
-
-.toggle-list > label:not(:last-child) {
-    border-bottom: 1px solid #ccc;
-}
-
-.toggle-list > label:last-child {
-    border-radius: 0 0 3px 3px;
-}
-
-.toggle-list label > span {
-    display: block;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
-.toggle-list > label.active {
-    background: #E8EBFF;
-}
+.col6  { float: left; width: 50.0000%; max-width: 600px; }
+.col8  { float: left; width: 66.6666%; }
+.col12 { float: left; width: 100.0000%; }
 
 
 /* Utility Classes
 ------------------------------------------------------- */
 .fillL {
-    background: white;
+    background: #fff;
     color: #333;
 }
-
 .fillL2 {
     background: #f6f6f6;
     color: #333;
 }
-
 .fillL3 {
     background: #ececec;
     color: #333;
 }
-
 .fillD {
-    background:rgba(0,0,0,.5);
-    color: white;
+    background: rgba(0,0,0,.5);
+    color: #fff;
 }
-
 .fillD2 {
-    background:rgba(0,0,0,.75);
-    color: white;
+    background: rgba(0,0,0,.75);
+    color: #fff;
 }
 
 .fl { float: left;}
@@ -2113,187 +3168,99 @@ li.hide {
 .deemphasize {
     color: #a9a9a9;
 }
-
 .content {
     box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.25);
 }
-
 .loading {
     background: url(<%= asset_path("iD/img/loader_bg.gif") %>);
-    background-size:5px 5px;
+    background-size: 5px 5px;
 }
 
-.panewrap {
-    position:absolute;
-    width:200%;
-    height:100%;
-    right: -100%;
-}
-
-
-.pane {
-    position:absolute;
-    width:50%;
-    top: 0;
-    bottom: 30px;
-}
-
-.pane:first-child {
-    left: 0;
-}
-
-.pane:last-child {
-    right: 0;
-}
-
-/* Buttons */
 
+/* Buttons
+------------------------------------------------------- */
 button {
     text-align: center;
-    line-height:20px;
-    border:0;
-    background: white;
+    line-height: 20px;
+    border: 0;
+    background: #fff;
     font-weight: bold;
-    color:#333;
-    font-size:12px;
+    color: #333;
+    font-size: 12px;
     display: inline-block;
-    height:40px;
-    border-radius:4px;
+    height: 40px;
+    border-radius: 4px;
 }
 
 button:focus,
 button:hover {
     background-color: #ececec;
 }
-
-button[disabled],
-button.disabled {
-    background-color: rgba(255,255,255,.25);
-    color: rgba(0,0,0,.4);
-    cursor: auto;
-}
-
 button.active {
     background: #7092ff;
 }
-
-button.minor {
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 100%;
-    width: 10%;
-    border-radius: 0;
-    background-color: #fafafa;
-}
-
-button.minor .icon {
-    opacity: .5;
-}
-
-button.minor:hover {
-    background-color: #f1f1f1;
-}
-
-.button-wrap {
-    display: inline-block;
-    padding-right:10px;
-    margin: 0;
-}
-
-.button-wrap button:only-child {
-    width: 100%;
-}
-
-.button-wrap:last-of-type {
-    padding-right: 0;
+button.disabled {
+    background-color: rgba(255,255,255,.25);
+    color: rgba(0,0,0,.4);
+    cursor: not-allowed;
 }
 
 .joined button {
-    border-radius:0;
+    border-radius: 0;
     border-right: 1px solid rgba(0,0,0,.5);
 }
+[dir='rtl'] .joined button {
+    border-left: 1px solid rgba(0,0,0,.5);
+    border-right: none;
+}
 
 .fillL .joined button {
-    border-right: 1px solid white;
+    border-right: 1px solid #fff;
 }
-
 .joined button:first-child {
-    border-radius:4px 0 0 4px;
+    border-radius: 4px 0 0 4px;
+}
+[dir='rtl'] .joined button:first-child {
+    border-radius: 0 4px 4px 0;
 }
-
 .joined button:last-child {
     border-right-width: 0;
-    border-radius:0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
 }
+[dir='rtl'] .joined button:last-child {
+    border-radius: 4px 0 0 4px;
+}
+
 
+/* Action buttons */
 button.action {
     background: #7092ff;
-    color: white;
-}
-
-button[disabled].action,
-button[disabled].action:hover {
-    background: #cccccc;
-    color: #888;
+    color: #fff;
 }
-
 button.action:focus,
 button.action:hover {
-    background: #597BE7;
+    background: #597be7;
 }
-
 button.secondary-action {
     background: #ececec;
 }
-
 button.secondary-action:focus,
 button.secondary-action:hover {
     background: #cccccc;
 }
 
-button.save.has-count {
-    padding: 9px;
-}
-
-button.save .count {
-    display: none;
-}
-
-button.save.has-count .count {
-    display: block;
-    position: absolute;
-    top: 5px;
-    background: #fff;
-    border-color: #fff;
-    opacity: 0.5;
-    color: #333;
-    padding: 10px;
-    height: 30px;
-    line-height: 12px;
-    border-radius: 4px;
-    margin: auto;
-    margin-left: 8.3333%;
-}
-
-button.save.has-count .count::before {
-    content: "";
-    margin: auto;
-    width: 0;
-    height: 0;
-    position: absolute;
-    left: -6px;
-    top: 0;
-    bottom: 0;
-    border-top:    6px solid transparent;
-    border-bottom: 6px solid transparent;
-    border-right-width: 6px;
-    border-right-style: solid;
-    border-right-color: inherit;
+button.action.disabled,
+button.action.disabled:hover,
+button[disabled].action,
+button[disabled].action:hover {
+    background: #cccccc;
+    color: #888;
+    cursor: not-allowed;
 }
 
-/* Icons */
 
+/* Icons
+------------------------------------------------------- */
 .icon {
     vertical-align: top;
     width: 20px;
@@ -2308,21 +3275,27 @@ button.save.has-count .count::before {
 }
 
 .icon.pre-text {
-    margin-right: 3px;
+    margin-right: 5px;
+}
+[dir='rtl'] .icon.pre-text {
+    margin-left: 5px;
+    margin-right: 0;
+}
+
+.icon.pre-text.user-icon {
+    margin-left: 5px;
+    margin-right: 5px;
 }
 
 .icon.light {
     color: #fff;
 }
-
 .icon.created {
     color: #00ca07;
 }
-
 .icon.modified {
     color: #666;
 }
-
 .icon.deleted {
     color: #ea0000;
 }
@@ -2335,24 +3308,170 @@ button.save.has-count .count::before {
     border-radius: 3px;
 }
 
+.icon-annotation {
+    color: #333;
+}
+
+.icon-badge {
+    display: block;
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    right: 7px;
+    top: 9px;
+}
+
+.icon-badge.hide {
+    display: none;
+}
 
-/* ToolBar / Persistent UI Elements
-------------------------------------------------------- */
 
+/* Toolbar / Persistent UI Elements
+------------------------------------------------------- */
 #bar {
-    position: fixed;
-    padding: 10px 0;
-    left:0;
-    top:0;
-    right:0;
-    height:60px;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    position: absolute;
+    padding: 10px;
+    left: 0;
+    top: 0;
+    right: 0;
+    height: 60px;
     z-index: 9;
-    min-width: 768px;
 }
 
+.tool-group {
+    display: flex;
+    flex: 0 1 auto;
+    flex-flow: row nowrap;
+    width: 100%;
+}
+.tool-group.leading-area {
+    flex-shrink: 2;
+    justify-content: flex-start;
+}
+.tool-group.center-area {
+    justify-content: center;
+}
+.tool-group.trailing-area {
+    justify-content: flex-start;
+}
+
+.tool-group > div {
+    display: flex;
+    margin: 0 5px;
+}
+.tool-group button {
+    flex: 1 1 auto;
+    flex-flow: row nowrap;
+    align-items: center;
+    padding: 0 10px;
+    min-width: 30px;
+    white-space: nowrap;
+}
+.tool-group button .icon {
+    flex: 0 0 20px;
+}
+.tool-group button .label {
+    flex: 0 1 auto;
+    padding: 0 5px;
+}
+
+button.save .count {
+    display: inline-block;
+    border: 0px solid #ccc;
+    border-left-width: 1px;
+    padding: 0px 0px 0px 8px;
+    min-width: 32px;
+    text-align: center;
+}
+[dir='rtl'] button.save .count {
+    border-left-width: 0px;
+    border-right-width: 1px;
+    padding: 0px 8px 0px 0px;
+}
+button.save.disabled .count {
+    border: 0px solid rgba(0,0,0,0.25);
+    border-left-width: 1px;
+}
+[dir='rtl'] button.save.disabled .count {
+    border-left-width: 0px;
+    border-right-width: 1px;
+    padding: 0px 8px 0px 0px;
+}
+#bar.narrow button.save .count {
+    padding: 0px;
+}
+
+button.save .label {
+    margin-right: 3px;
+    margin-left: 0;
+}
+[dir='rtl'] button.save .label {
+    margin-left: 3px;
+    margin-right: 0;
+}
+
+.help-wrap svg.icon.pre-text.add-note,
+button.add-note svg.icon {
+    height: 15px;
+    width: 15px;
+    color: rgba(0,0,0,0.25);
+    stroke: #333;
+    stroke-width: 60px;
+    margin-top: 3px;
+}
+button.add-note svg.icon {
+    margin-left: unset;
+    margin-right: 4px;
+}
+[dir='rtl'] button.add-note svg.icon {
+    margin-left: 4px;
+    margin-right: unset;
+}
+.help-wrap svg.icon.pre-text.add-note {
+    margin-left: 3px;
+    margin-right: 3px;
+}
+
+.spinner {
+    opacity: .5;
+    display: flex;
+    flex-shrink: 2;
+    justify-content: flex-end;
+}
+.spinner img {
+    height: 40px;
+    width: 40px;
+    border-radius: 4px;
+    background: black;
+}
+[dir='rtl'] .spinner img {
+    -moz-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
+    -webkit-transform: scaleX(-1);
+    transform: scaleX(-1);
+    filter: FlipH;
+    -ms-filter: "FlipH";
+}
+
+
+#bar.narrow .tool-group {
+    width: unset;
+}
+#bar.narrow .spinner,
+#bar.narrow button .label {
+    display: none;
+}
+#bar.narrow button .count {
+    border-left-width: 0;
+    border-right-width: 0;
+}
+
+
 /* Header for modals / panes
 ------------------------------------------------------- */
-
 .header {
     border-bottom: 1px solid #ccc;
     height: 60px;
@@ -2360,12 +3479,12 @@ button.save.has-count .count::before {
 }
 
 .header h3 {
-    text-align: left;
+    text-align: center;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    padding: 20px 20px 20px 40px;
+    padding: 20px;
 }
 
 .header button,
@@ -2381,18 +3500,35 @@ button.save.has-count .count::before {
     height: 100%;
 }
 
+.field-help-title button.close,
+.sidebar-component .header button.data-editor-close,
+.sidebar-component .header button.note-editor-close,
+.sidebar-component .header button.error-editor-close,
 .entity-editor-pane .header button.preset-close,
 .preset-list-pane .header button.preset-choose {
     position: absolute;
     right: 0;
     top: 0;
 }
+[dir='rtl'] .field-help-title button.close,
+[dir='rtl'] .sidebar-component .header button.data-editor-close,
+[dir='rtl'] .sidebar-component .header button.note-editor-close,
+[dir='rtl'] .sidebar-component .header button.error-editor-close,
+[dir='rtl'] .entity-editor-pane .header button.preset-close,
+[dir='rtl'] .preset-list-pane .header button.preset-choose {
+    left: 0;
+    right: auto;
+}
 
 .entity-editor-pane .header button.preset-choose {
     position: absolute;
     left: 0;
     top: 0;
 }
+[dir='rtl'] .entity-editor-pane .header button.preset-choose {
+    left: auto;
+    right: 0;
+}
 
 .preset-choose {
     font-size: 16px;
@@ -2407,36 +3543,106 @@ button.save.has-count .count::before {
     height: 59px;
     z-index: 50;
 }
+[dir='rtl'] .modal > button {
+    left: 0;
+    right: unset;
+}
 
 .footer {
     position: absolute;
     bottom: 0;
+    margin: 0;
     padding: 5px 20px 5px 20px;
     border-top: 1px solid #ccc;
-    background-color: #fafafa;
+    background-color: #f6f6f6;
     width: 100%;
+    z-index: 1;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    list-style: none;
+    display: flex;
 }
 
-.sidebar-component .body {
-    width: 100%;
-    overflow: auto;
-    top: 60px;
-    bottom: 0;
-    position: absolute;
+.footer > a {
+    justify-content: center;
+}
+
+.header-container {
+    display: flex;
+    justify-content: space-between;
+}
+
+.header-block-outer {
+    width: 20%;
+}
+
+.header-block-close {
+    display: flex;
+    justify-content: flex-end;
 }
 
-/* Inspector
+/* Hide/Toggle collapsable sections (aka Disclosure)
 ------------------------------------------------------- */
+.hide-toggle .icon.pre-text {
+    vertical-align: text-top;
+    width: 16px;
+    height: 16px;
+    margin-left: -3px;
+}
+[dir='rtl'] .hide-toggle .icon.pre-text {
+    margin-left: 0;
+    margin-right: -3px;
+}
 
+a:visited.hide-toggle,
+a.hide-toggle {
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    padding-bottom: 5px;
+}
+
+
+/* Sidebar / Inspector
+------------------------------------------------------- */
 #sidebar {
     position: relative;
     float: left;
     height: 100%;
-    overflow: hidden;
     z-index: 10;
     background: #f6f6f6;
+    -ms-user-select: element;
+    border: 0px solid #ccc;
+    border-right-width: 1px;
 }
-
+[dir='rtl'] #sidebar {
+    float: right;
+    border-right-width: 0px;
+    border-left-width: 1px;
+}
+
+#sidebar-resizer {
+    position: absolute;
+    top: 0;
+    right: -6px;
+    height: 100%;
+    width: 6px;
+    cursor: col-resize;
+}
+[dir='rtl'] #sidebar-resizer {
+    right: auto;
+    left: -6px;
+}
+
+#sidebar.collapsed #sidebar-resizer {
+    /* make target wider to avoid the user accidentally resizing window */
+    width: 10px;
+    right: -10px;
+}
+[dir='rtl'] #sidebar.collapsed #sidebar-resizer {
+    left: -10px;
+}
+
 .sidebar-component {
     position: absolute;
     top: 0;
@@ -2445,9 +3651,41 @@ button.save.has-count .count::before {
     right: 0;
 }
 
+.sidebar-component .body {
+    width: 100%;
+    overflow: auto;
+    top: 60px;
+    bottom: 0;
+    position: absolute;
+}
+
+.panewrap {
+    position: absolute;
+    width: 200%;
+    height: 100%;
+    right: -100%;
+}
+
+.pane {
+    position: absolute;
+    width: 50%;
+    top: 0;
+    bottom: 30px;
+}
+
+.pane:first-child {
+    left: 0;
+}
+
+.pane:last-child {
+    right: 0;
+}
+
 .inspector-wrap {
     width: 100%;
     height: 100%;
+    overflow: hidden;
+    position: relative;
 }
 
 .inspector-hidden {
@@ -2463,27 +3701,17 @@ button.save.has-count .count::before {
     bottom: 0;
 }
 
-
-
-
-.feature-list-pane .inspector-body {
-    top: 120px;
-}
-
+.feature-list-pane .inspector-body,
 .preset-list-pane .inspector-body {
     top: 120px;
 }
-
-.entity-editor-pane .inspector-body {
-    top: 60px;
-}
-
+.entity-editor-pane .inspector-body,
 .selection-list-pane .inspector-body {
     top: 60px;
 }
 
 .inspector-inner {
-    padding: 20px;
+    padding: 20px 20px 5px 20px;
     position: relative;
 }
 
@@ -2494,6 +3722,10 @@ button.save.has-count .count::before {
     top: 80px;
     pointer-events: none;
 }
+[dir='rtl'] #sidebar .search-header .icon {
+    left: auto;
+    right: 10px;
+}
 
 #sidebar .search-header input {
     position: absolute;
@@ -2509,12 +3741,12 @@ button.save.has-count .count::before {
     font-weight: bold;
 }
 
-/* Feature list */
 
+/* Feature List / Search Results
+------------------------------------------------------- */
 .feature-list  {
-    width:100%;
+    width: 100%;
 }
-
 .no-results-item,
 .geocode-item,
 .feature-list-item {
@@ -2524,21 +3756,34 @@ button.save.has-count .count::before {
     border-radius: 0;
 }
 
+.geocode-item {
+    width: 50%;
+    background-color: #ccc;
+    left: 25%;
+    margin-top: 30px;
+    border-radius: 2px;
+}
+
+[dir='rtl'] .geocode-item {
+    left: -25%;
+}
+
+.geocode-item:hover {
+    background-color: #aaa;
+}
+
 .feature-list-item {
-    background-color: white;
+    background-color: #fff;
     font-weight: bold;
     height: 40px;
     line-height: 20px;
 }
-
 .feature-list-item:hover {
     background-color: #ececec;
 }
-
 .feature-list-item button {
     background: transparent;
 }
-
 .feature-list-item .label {
     text-align: left;
     padding: 10px 10px;
@@ -2547,49 +3792,53 @@ button.save.has-count .count::before {
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
 }
+[dir='rtl'] .feature-list-item .label {
+    text-align: right;
+}
 
 .feature-list-item .label .icon {
     opacity: .5;
 }
-
 .feature-list-item .close {
     float: right;
     padding: 10px;
 }
-
 .feature-list-item .close .icon {
     opacity: 1;
 }
-
 .feature-list-item .entity-type {
-    color:#7092ff;
+    color: #7092ff;
 }
-
 .feature-list-item:hover .entity-type {
-    color:#597be7;
+    color: #597be7;
 }
-
 .feature-list-item .entity-name {
     font-weight: normal;
     color: #666;
     padding-left: 10px;
 }
+[dir='rtl'] .feature-list-item .entity-name {
+    padding-left: 0;
+    padding-right: 10px;
+}
 
-/* Presets
-------------------------------------------------------- */
-
-/* Preset grid  */
 
+/* Preset List and Icons
+------------------------------------------------------- */
 .preset-list  {
-    width:100%;
+    width: 100%;
     padding: 20px 20px 10px 20px;
     border-bottom: 1px solid #ccc;
 }
 
+.preset-list-item {
+    margin-bottom: 10px;
+}
+
 .preset-list-button-wrap {
     position: relative;
-    margin-bottom: 10px;
     height: 60px;
+    display: flex;
 }
 
 .preset-list-button {
@@ -2598,11 +3847,45 @@ button.save.has-count .count::before {
     position: relative;
     border: 1px solid #ccc;
 }
+[dir='ltr'] .preset-list-button-wrap:not(.category) .preset-list-button {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+[dir='rtl'] .preset-list-button-wrap:not(.category) .preset-list-button {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
 
 .preset-list.filtered .preset-list-item:first-child .preset-list-button {
     background: #ececec;
 }
 
+.preset-icon-line {
+    margin: auto;
+    position: absolute;
+    top: 0;
+}
+[dir='ltr'] .preset-icon-line {
+    left: 0;
+}
+[dir='rtl'] .preset-icon-line {
+    right: 0;
+}
+.preset-icon-line path.line {
+    cursor: inherit;
+}
+.preset-icon-line circle.vertex {
+    fill: #fff;
+    stroke: rgba(0, 0, 0, 0.25);
+}
+/* use a consistent stroke width */
+.preset-icon-line path.line.stroke {
+    stroke-width: 2 !important;
+}
+.preset-icon-line path.line.casing {
+    stroke-width: 4 !important;
+}
+
 .preset-icon-fill-area {
     cursor: inherit;
     height: 40px;
@@ -2613,14 +3896,35 @@ button.save.has-count .count::before {
     top: 10px;
 }
 
+.preset-icon-fill-vertex {
+    height: 40px;
+    width: 40px;
+    margin: auto;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    border: 1.5px solid #333;
+    border-radius: 20px;
+    background-color: #efefef;
+    backface-visibility: hidden;
+}
+
+[dir='rtl'] .preset-icon-fill-vertex,
+[dir='rtl'] .preset-icon-fill-area {
+  left: auto;
+  right: 10px;
+}
+
 .preset-icon-frame {
     position: absolute;
     top: 7px;
     left: 7px;
-    height: 42px;
-    width: 42px;
     margin: auto;
 }
+[dir='rtl'] .preset-icon-frame {
+    left: auto;
+    right: 7px;
+}
 
 .preset-icon-frame .icon {
     width: 46px;
@@ -2645,25 +3949,63 @@ button.save.has-count .count::before {
     left: 8px;
     margin: auto;
 }
+.preset-icon-44.line-geom {
+    top: 2px;
+}
 
 .preset-icon-44 .icon {
     width: 44px;
     height: 44px;
 }
 
-.preset-icon-32 {
+.preset-icon-28 {
     position: absolute;
-    top: 14px;
-    left: 13px;   /* Maki icons off center? */
+    top: 16px;
+    left: 16px;
     margin: auto;
 }
 
-.preset-icon-32 .icon {
-    width: 32px;
-    height: 32px;
+.preset-icon-28 .icon {
+    width: 28px;
+    height: 28px;
+}
+
+.preset-icon-24 {
+    position: absolute;
+    top: 18px;
+    left: 18px;
+    margin: auto;
+}
+.preset-icon-24.line-geom {
+    top: 12px;
+}
+
+.preset-icon-24 .icon {
+    width: 24px;
+    height: 24px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon {
+    left: auto;
+    right: auto;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-44 {
+    right: 8px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-28 {
+    right: 16px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-24 {
+    right: 18px;
 }
 
 .preset-list-button .label {
+    display: flex;
+    flex-flow: row wrap;
+    align-items: center;
     background-color: #f6f6f6;
     text-align: left;
     position: absolute;
@@ -2672,40 +4014,76 @@ button.save.has-count .count::before {
     right: 0;
     padding: 5px 10px;
     left: 60px;
-    line-height: 50px;
+    border-left: 1px solid rgba(0, 0, 0, .1);
+}
+[dir='rtl'] .preset-list-button .label {
+    text-align: right;
+    left: 0;
+    right: 60px;
+    border-left: none;
+    border-right: 1px solid rgba(0, 0, 0, .1);
+}
+[dir='ltr'] .category .preset-list-button .label {
+    border-radius: 0px 4px 4px 0px;
+}
+[dir='rtl'] .category .preset-list-button .label {
+    border-radius: 4px 0px 0px 4px;
+}
+
+.preset-list-button .label-inner {
+    width: 100%;
+}
+.preset-list-button .label-inner .namepart {
+    height: 17px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    border-left: 1px solid rgba(0, 0, 0, .1);
-    border-radius: 0 3px 3px 0;
-    }
+}
 
-.preset-list-button:hover .label {
+.preset-list-button:hover .label,
+.preset-list-button:focus .label,
+.preset-list-button.disabled,
+.preset-list-button.disabled .label {
     background-color: #ececec;
 }
 
 .preset-list-item button.tag-reference-button {
     height: 100%;
-    border: 1px solid #CCC;
-    border-radius: 0 3px 3px 0;
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 10%;
-    background: #fafafa;
+    border: 1px solid #ccc;
+    flex: 32px;
+    background: #f6f6f6;
+}
+[dir='ltr'] .preset-list-item button.tag-reference-button {
+    border-left: none;
+    border-radius: 0 4px 4px 0;
+}
+[dir='rtl'] .preset-list-item button.tag-reference-button {
+    border-right: none;
+    border-radius: 4px 0 0 4px;
 }
 
 .preset-list-item button.tag-reference-button:hover {
     background: #f1f1f1;
 }
-
 .preset-list-item button.tag-reference-button .icon {
     opacity: .5;
 }
 
+img.tag-reference-wiki-image {
+    float: right;
+    width: 33.3333%;
+    border-radius: 4px;
+    margin: 10px 5px 15px 10px;
+}
+[dir='rtl'] img.tag-reference-wiki-image {
+    float: left;
+    margin: 10px 10px 15px 5px;
+}
+
+
 .current .preset-list-button,
 .current .preset-list-button .label {
-    background-color: #E8EBFF;
+    background-color: #e8ebff;
 }
 
 .category .preset-list-button:after,
@@ -2725,48 +4103,97 @@ button.save.has-count .count::before {
 }
 
 .subgrid .preset-list {
-    padding: 10px 10px 0 10px;
+    padding: 10px;
     margin-top: 0;
     border: 0;
     border-radius: 8px;
     width: -webkit-calc(100% + 20px);
     margin-left: -10px;
 }
+.subgrid .preset-list > *:last-child {
+    margin-bottom: 0;
+}
 
 .subgrid .arrow {
     border: solid rgba(0, 0, 0, 0);
     border-width: 10px;
-    border-bottom-color: #f1f1f1;
+    border-bottom-color: #ececec;
     width: 0;
     height: 0;
     margin-left: 50%;
     margin-left: -webkit-calc(50% - 10px);
-    margin-top: -10px;
 }
 
 
-/* preset form basics */
-
-.inspector-preset {
-    overflow: hidden;
-    padding-bottom: 10px;
+/* Quick links
+------------------------------------------------------- */
+.quick-links {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: flex-end;
+    padding: 0 20px;
+}
+.quick-link {
+    margin: 0 5px;
 }
 
-.inspector-preset a.hide-toggle {
-    margin: 0 20px 10px 20px;
+.data-editor .quick-links,
+.error-editor .quick-links,
+.note-editor .quick-links {
+    padding: 5px 0 0 0;
 }
 
-.inspector-preset .preset-form {
+
+/* Entity/Preset Editor
+------------------------------------------------------- */
+.entity-issues,
+.preset-editor {
+    overflow: hidden;
+    padding: 10px 0px 5px 0px;
+}
+.entity-issues a.hide-toggle,
+.preset-editor a.hide-toggle {
+    margin: 0 20px 5px 20px;
+}
+.entity-issues .disclosure-wrap-entity_issues,
+.preset-editor .form-fields-container {
     padding: 10px;
     margin: 0 10px 10px 10px;
     border-radius: 8px;
+    background: #ececec;
 }
-
-.entity-editor-pane .preset-list-item .preset-list-button-wrap {
+.entity-issues .disclosure-wrap-entity_issues:empty,
+.preset-editor .form-fields-container:empty {
+    display: none;
+}
+.entity-editor-pane .preset-list-item {
     margin-bottom: 0;
 }
 
+/*
+    The parts of a field:
+    - `.form-field` is a `div` wraps the entire thing
+    - `.form-field-label` is a `label` that wraps the top part, it contains;
+       - `span` classed `label-text`
+       - 0..n buttons for "remove", "modified", "tag reference"
+    - `.form-field-input-wrap` is a `label` or `div` that wraps the bottom part, it contains;
+       - usually an `input`
+       - sometimes some buttons (translate, increment, decrement)
+       - or could just be a `div` with anything really
+    - `.tag-reference-body` at the bottom (usually hidden)
+
+   .------------------.                             -
+   |  Name        | i |  <- .form-field-label        |
+   +------------------+                               |
+   |  Starbucks   | + |  <- .form-field-input-wrap     >  .form-field
+   '------------------'                               |
+     tag reference       <- .tag-reference-body      |
+                                                    -
+*/
+
 .form-field {
+    display: flex;
+    flex-flow: row wrap;
     margin-bottom: 10px;
     width: 100%;
     -webkit-transition: margin-bottom 200ms;
@@ -2775,794 +4202,1514 @@ button.save.has-count .count::before {
             transition: margin-bottom 200ms;
 }
 
-.form-field:last-child {
+.form-field.nowrap,
+.wrap-form-field:last-child .form-field {
     margin-bottom: 0;
 }
 
-.form-label {
+/* A `label` element that wraps the top section */
+.form-field-label {
+    display: flex;
+    flex-flow: row nowrap;
+    flex: 1 1 100%;
+    height: 30px;
     position: relative;
     font-weight: bold;
-    border: 1px solid #cfcfcf;
-    padding: 5px 0 5px 10px;
+    color: #333;
     background: #f6f6f6;
-    display: block;
+    border: 1px solid #ccc;
     border-radius: 4px 4px 0 0;
     overflow: hidden;
 }
-
-.form-label-button-wrap {
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 100%;
-    width: 100%;
-    background: transparent;
-    text-align: right;
-}
-
-.form-label-button-wrap .tag-reference-button {
-    border-radius: 0 3px 0 0;
+.form-field-label .label-text {
+    flex: 1 1 auto;
+    padding: 5px 0 5px 10px;
 }
-
-.form-label-button-wrap .icon {
-    opacity: .5;
+[dir='rtl'] .form-field-label .label-text {
+    padding: 5px 10px 5px 0;
 }
 
-.form-label button {
+.form-field-label button {
+    flex: 0 0 32px;
     border-left: 1px solid #ccc;
-    width: 10%;
+    width: 32px;
     height: 100%;
     border-radius: 0;
     background: #f6f6f6;
 }
-.form-label button:hover {
+[dir='rtl'] .form-field-label button {
+    border-left: none;
+    border-right: 1px solid #ccc;
+}
+.form-field-label button:hover {
     background: #f1f1f1;
 }
+.form-field-label .icon {
+    opacity: .5;
+}
 
-.form-label .modified-icon,
-.form-field .remove-icon {
+.form-field-label .modified-icon,
+.form-field-label .remove-icon {
     display: none;
 }
-
-.modified .form-label .modified-icon,
-.present .form-label .remove-icon {
+.modified .form-field-label .modified-icon,
+.present .form-field-label .remove-icon {
     display: inline-block;
 }
 
-.form-field > input,
-.form-field > textarea,
-.form-field .preset-input-wrap {
-    border: 1px solid #ccc;
+/* A `div` element that wraps the bottom section */
+.form-field-input-wrap {
+    display: flex;
+    flex-flow: row nowrap;
+    flex: 1 1 100%;
     min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
-    overflow: hidden;
 }
-
-.form-field textarea {
-    height: 65px;
-}
-
-.inspector-border {
-    border-bottom: 1px solid #ccc
+.nowrap .form-field-input-wrap {
+    border-radius: 0;
 }
 
-/* Preset form (hover mode) */
 
-.inspector-hover .checkselect label:last-of-type,
-.inspector-hover .preset-input-wrap .label,
-.inspector-hover .form-field-multicombo,
-.inspector-hover input,
-.inspector-hover label {
-    background: #ececec;
+.form-field-input-wrap > input,
+.form-field-input-wrap > label,
+.form-field-input-wrap > textarea,
+.form-field-input-wrap > ul.chiplist {
+    flex: 1 1 auto;
+    min-height: 30px;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0;
+    overflow: hidden;
+    position: relative;
+}
+.form-field-input-wrap > textarea {
+    height: 65px;
+    border-radius: 0 0 4px 4px;
 }
 
-.inspector-hover a,
-.inspector-hover .form-field-multicombo .chips,
-.inspector-hover .checkselect label:last-of-type {
-    color: #666;
+/* Buttons inside fields */
+.form-field-button {
+    flex: 0 0 32px;
+    height: 30px;
+    width: 32px;
+    position: relative;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 0;
+    border-top-width: 0;
+    border-left-width: 0;
+    vertical-align: top;
+}
+[dir='rtl'] .form-field-button {
+    border-left-width: 1px;
+    border-right-width: 0;
+}
+.form-field-button:hover {
+    background-color: #f1f1f1;
+}
+.form-field-button .icon {
+    fill: #333;
+    opacity: .5;
 }
 
-.inspector-hover .form-field-multicombo .chips {
-    background: #eee;
-    border: 1px solid #ccc;
+
+/* round corners of first/last child elements */
+.form-field-input-wrap > button:last-of-type {
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .form-field-input-wrap > button:last-of-type {
+    border-bottom-left-radius: 4px;
 }
 
-/* hide and remove from layout */
-.inspector-hidden,
-.inspector-hover label input[type="checkbox"],
-.inspector-hover label input[type="radio"],
-.inspector-hover .toggle-list label,
-.inspector-hover .toggle-list label span,
-.inspector-hover .inspector-inner .add-tag,
-.inspector-hover .inspector-inner .add-relation,
-.inspector-hover .form-field-multicombo .combobox-input,
-.inspector-hover .toggle-list label.remove .icon {
-    height: 0;
-    width: 0;
+
+/* Field - Access, Cycleway
+------------------------------------------------------- */
+.form-field-input-access,
+.form-field-input-cycleway {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
+}
+
+/* Field - lists with labeled input items
+------------------------------------------------------- */
+.form-field ul.labeled-inputs {
+    flex: 1 1 auto;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
     overflow: hidden;
-    opacity: 0 !important;
+    width: 100%;
+}
+.form-field ul.labeled-inputs li {
+    border-top: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+}
+.form-field ul.labeled-inputs li:first-child {
+    border-top: 0;
+}
+.form-field ul.labeled-inputs li > span,
+.form-field ul.labeled-inputs li > div {
+    flex: 1 1 auto;
+    width: 100%;
+    border-radius: 0;
+}
+.form-field ul.labeled-inputs li input {
+    border-radius: 0;
+    width: 100%;
+}
+.form-field ul.labeled-inputs li input,
+.form-field ul.labeled-inputs li button {
     border-width: 0;
+    border-left-width: 1px;
+}
+[dir='rtl'] .form-field ul.labeled-inputs li input,
+[dir='rtl'] .form-field ul.labeled-inputs li button {
+    border-left-width: 0;
+    border-right-width: 1px;
+}
+
+
+/* Field - Structure
+------------------------------------------------------- */
+.structure-extras-wrap {
+    width: 100%;
+    padding: 10px 10px;
+    background: #fff;
+    border: 1px solid #ccc;
+    border-top: 0px;
+    border-radius: 0 0 4px 4px;
+}
+.structure-extras-wrap > ul.labeled-inputs {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+}
+
+
+/* Field - Combo / Multicombo
+------------------------------------------------------- */
+.form-field-input-combo > input:only-of-type {
+    border-radius: 0 0 4px 4px;
+}
+.form-field-input-combo.empty-combobox input,
+.form-field-input-multicombo .empty-combobox input {
+    padding-right: 10px;
+    padding-left: 10px;
+}
+.form-field-input-combo.empty-combobox .combobox-caret,
+.form-field-input-multicombo .empty-combobox .combobox-caret {
+    display: none;
+}
+
+.form-field-input-multicombo ul.chiplist {
+    padding: 5px 7px 5px 7px;
+    background: #fff;
+    display: block;
+    border-radius: 0 0 4px 4px;
+}
+
+.form-field-input-multicombo li.chips {
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    line-height: 25px;
+    padding: 2px 0px 2px 5px;
+}
+.form-field-input-multicombo li {
+    display: inline-flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    margin: 3px;
+    border-radius: 4px;
+}
+
+.form-field-input-multicombo a {
+    font-family: Arial, Helvetica, sans-serif !important;
+    font-size: 16px !important;
+    line-height: 22px;
+    float: right;
+    padding: 0px 5px 0px 5px;
     margin: 0;
-    padding: 0;
+    cursor: pointer;
+    color: #a6b4ce;
 }
 
-/* hide but preserve in layout */
-.inspector-hover .entity-editor-pane button.minor,
-.inspector-hover .combobox-caret,
-.inspector-hover .entity-editor-pane .header button,
-.inspector-hover .spin-control,
-.inspector-hover .form-field-multicombo .chips .remove,
-.inspector-hover .hide-toggle:before,
-.inspector-hover .more-fields,
-.inspector-hover .form-label-button-wrap,
-.inspector-hover .tag-reference-button,
-.inspector-hover .view-on-osm {
+.form-field-input-multicombo .input-wrap {
+    border: 1px solid #ddd;
+    width: 100px;
+    height: 31px;
+}
+.form-field-input-multicombo input {
+    border: none;
+    width: 100%;
+    height: 100%;
+}
+
+.form-field-input-multicombo input:focus {
+    border-radius: 4px !important;
+}
+
+.form-field-input-multicombo .full-line-chips li {
+    display: block;
+}
+.form-field-input-multicombo .full-line-chips li:not(:last-child) {
+    margin-bottom: 6px;
+}
+.form-field-input-multicombo .full-line-chips .input-wrap {
+    width: auto;
+}
+
+
+/* Field - Text / Numeric
+------------------------------------------------------- */
+.form-field-input-text > input:only-of-type,
+.form-field-input-tel > input:only-of-type,
+.form-field-input-email > input:only-of-type,
+.form-field-input-url > input:only-of-type {
+    border-radius: 0 0 4px 4px;
+}
+.form-field-input-number > input:only-of-type {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .form-field-input-number > input:only-of-type {
+    border-radius: 0 0 4px 0;
+}
+.form-field-input-number > button:last-of-type {
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .form-field-input-number > button:last-of-type {
+    border-radius: 0 0 0 4px;
+}
+
+/* draw the up/down on the buttons */
+.form-field-input-number button.decrement::after,
+.form-field-input-number button.increment::after {
+    content: "";
+    height: 0; width: 0;
+    position: absolute;
+    left: 0; right: 0; bottom: 0; top: 0;
+    margin: auto;
+}
+.form-field-input-number button.decrement::after {
+    border-top: 5px solid #ccc;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+}
+.form-field-input-number button.increment::after {
+    border-bottom: 5px solid #ccc;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+}
+
+
+/* Field - Checkbox
+------------------------------------------------------- */
+.form-field-input-check {
+    display: flex;
+    align-items: end;
+    background: #fff;
+    padding: 5px 10px;
+    color: #7092ff;
+    border: 1px solid #ccc;
+    border-top: 0;
+    cursor: pointer;
+}
+.form-field-input-check > input[type="checkbox"] {
+    flex: 0 1 auto;
+    min-height: 20px;
+    width: 20px;
+}
+.form-field-input-check > span {
+    flex: 1 1 auto;
+}
+.form-field-input-check > .reverser.button {
+    flex: 0 1 auto;
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    border-radius: 2px;
+    padding: 0px 8px;
+}
+.form-field-input-check > .reverser.button.hide {
+    display: none;
+}
+
+.form-field-input-check:hover {
+    background: #f1f1f1;
+}
+.form-field-input-check .set {
+    color: inherit;
+}
+.form-field-input-check label:not(.set) input[type="checkbox"] {
+    opacity: .5;
+}
+
+
+/* Field - Radio button
+------------------------------------------------------- */
+.form-field-input-radio {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
+}
+.form-field-input-radio > label {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row nowrap;
+    width: 100%;
+    padding: 5px 10px;
+    height: 30px;
+    background-color: #fff;
+    color: #7092ff;
+    cursor: pointer;
+}
+.form-field-input-radio > label:last-child {
+    border-radius: 0 0 4px 4px;
+}
+.form-field-input-radio > label:hover {
+    background-color: #ececec;
+}
+.form-field-input-radio > label.active {
+    background-color: #e8ebff;
+}
+.form-field-input-radio > label:not(:last-of-type) {
+    border-bottom: 1px solid #ccc;
+}
+.form-field-input-radio > label > input[type="radio"] {
+    flex: 0 1 auto;
+    width: 20px;
+}
+.form-field-input-radio > label > span {
+    flex: 1 1 auto;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+/* Hide placeholder for radio buttons if another is active, or not in hover state */
+.form-field-input-radio label.active ~ .placeholder,
+.form-field-input-radio .placeholder {
+    padding: 0;
     opacity: 0;
+    width: 0;
+    line-height: 0;
+    display: block;
+    overflow: hidden;
+}
+
+
+/* Field - Maxspeed
+------------------------------------------------------- */
+.form-field-input-maxspeed > input:first-of-type {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .form-field-input-maxspeed > input:first-of-type {
+    border-radius: 0 0 4px 0;
+}
+.form-field-input-maxspeed > input:last-of-type {  /* unit field */
+    flex: 0 1 80px;
+    width: 80px;
+    border-left: 0;
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .form-field-input-maxspeed > input:last-of-type {
+    border-right: 0;
+    border-radius: 0 0 0 4px;
+}
+
+
+/* Field - Localized Name
+------------------------------------------------------- */
+.form-field-input-localized > input.localized-main {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .form-field-input-localized > input.localized-main {
+    border-radius: 0 0 4px 0;
+}
+.form-field-input-localized > button.localized-add {
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .form-field-input-localized > button.localized-add {
+    border-radius: 0 0 0 4px;
+}
+
+.form-field-input-localized button.localized-add.disabled,
+.form-field-input-localized input.localized-main.disabled,
+.form-field-input-localized input.localized-lang.disabled,
+.form-field-input-localized input.localized-value.disabled {
+    color: #777;
+    background-color: #eee;
+    cursor: not-allowed;
+}
+
+/* nested subfields for name in different languages */
+.localized-multilingual {
+    padding: 0 10px;
+    flex-basis: 100%;
+}
+.localized-multilingual .entry {
+    position: relative;
+    overflow: hidden;
+}
+
+/* draws a little line connecting the multilingual field up to the name field */
+.localized-multilingual .entry::before {
+    content: "";
+    display: block;
+    position: absolute;
+    background: #ccc;
+    height: 11px;
+    width: 1px;
+    left: 0;
+    right: 0;
+    top: -11px;
+    margin: auto;
+}
+
+.localized-multilingual .entry .localized-lang {
+    border-radius: 0;
+    border-top-width: 0;
+    width: 100%;
+}
+.localized-multilingual .entry .localized-value {
+    border-top-width: 0;
+    border-radius: 0 0 4px 4px;
+    width: 100%;
+}
+
+
+/* Field - Address
+------------------------------------------------------- */
+.form-field-input-address {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
+    border: 1px solid #ccc;
+    border-top: 0px;
+}
+
+.addr-row {
+    flex: 1 1 auto;
+    display: flex;
+    width: 100%;
+    min-height: 30px;
+}
+
+.addr-row > input {
+    flex: 1 1 auto;
+    border-radius: 0;
+    border-right: 0;
+    border-bottom: 0;
+}
+[dir='rtl'] .addr-row input {
+    border-right: 1px solid #ccc;
+    border-left: 0;
+}
+
+.addr-row:first-of-type input {
+    border-top: 0;
+}
+.addr-row input:first-of-type {
+    border-left: 0;
+}
+[dir='rtl'] .addr-row input:first-of-type {
+    border-right: 0;
+}
+.addr-row:last-of-type input:first-of-type {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .addr-row:last-of-type input:first-of-type {
+    border-radius: 0 0 4px 0;
+}
+.addr-row:last-of-type input:last-of-type {
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .addr-row:last-of-type input:last-of-type {
+    border-radius: 0 0 0 4px;
+}
+
+
+/* Field - Wikipedia
+------------------------------------------------------- */
+.form-field-input-wikipedia {
+    display: flex;
+    flex-flow: row wrap;
+    flex: 1 1 auto;
+}
+
+.wiki-lang-container,
+.wiki-title-container {
+    display: flex;
+    flex-flow: row nowrap;
+    flex: 1 1 auto;
+    width: 100%;
+}
+
+.wiki-lang-container > input.wiki-lang,
+.wiki-title-container > input.wiki-title {
+    flex: 1 1 auto;
+    border-top: 0;
+    border-radius: 0;
+}
+.wiki-title-container > input.wiki-title {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .wiki-title-container > input.wiki-title {
+    border-radius: 0 0 4px 0;
+}
+.wiki-title-container > button.wiki-link {
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .wiki-title-container > button.wiki-link {
+    border-radius: 0 0 0 4px;
+}
+
+
+/* Field - Restriction Editor
+------------------------------------------------------- */
+.form-field-input-restrictions {
+    display: block;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+}
+
+.form-field-input-restrictions .restriction-controls-container {
+    background-color: #fff;
+    width: 100%;
+    padding: 5px;
+    border-top: 1px solid #ccc;
+    border-radius: 0 0 4px 4px;
+}
+
+.restriction-controls-container .restriction-controls {
+    display: table;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.restriction-controls .restriction-control {
+    display: table-row;
+    padding: 5px 10px;
+    height: 25px;
+}
+
+.restriction-control input,
+.restriction-control span {
+    display: table-cell;
+    text-align: start;
+    padding: 0px 5px;
+}
+
+.restriction-control span.restriction-control-label {
+    text-align: end;
+}
+
+.restriction-control input {
+    width: 60px;
+    padding: 0;
+    margin: 0px 5px;
+    vertical-align: middle;
+}
+
+.form-field-input-restrictions .restriction-container {
+    position: relative;
+    height: 370px;
+}
+/* zero width space, so container takes up space */
+.form-field-input-restrictions .restriction-container:after {
+    content: '\200b';
+}
+
+.form-field-input-restrictions svg.surface {
+    width: 100%;
+    height: 100%;
+}
+
+.restriction-container .restriction-help {
+    z-index: 1;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    padding: 2px 6px;
+    background-color: rgba(255, 255, 255, .8);
+    color: #888;
+    text-align: center;
+    pointer-events: none;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.restriction-help span {
+    margin: 2px;
+}
+
+.restriction-help .qualifier {
+    color: #666;
+    font-weight: bold;
+}
+.restriction-help .qualifier.allow {
+    color: #8b5;
+}
+.restriction-help .qualifier.restrict {
+    color: #d53;
+}
+.restriction-help .qualifier.only {
+    color: #78f;
+}
+
+
+/* Field - Changeset Comment
+------------------------------------------------------- */
+.form-field-comment:not(.present) #preset-input-comment {
+    border-color: rgb(230, 100, 100);
+}
+.form-field-comment:not(.present) .form-field-label {
+    border-color: rgb(230, 100, 100);
+    background: rgba(230, 100, 100, 0.2);
+}
+.form-field-comment:not(.present) button {
+    border-color: rgb(230, 100, 100);
+}
+
+
+/* Field - Combobox
+------------------------------------------------------- */
+div.combobox {
+    z-index: 9999;
+    display: none;
+    box-shadow: 0 4px 10px 1px rgba(0,0,0,.2);
+    margin-top: -1px;
+    background: #fff;
+    max-height: 245px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    border: 1px solid #ccc;
+    border-radius: 0 0 4px 4px;
+}
+
+.combobox a {
+    display: block;
+    padding: 5px 10px;
+    border-top: 1px solid #ccc;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.combobox a.selected,
+.combobox a:hover {
+    background: #ececec;
+}
+
+.combobox a:first-child {
+    border-top: 0;
+    padding: 4px 10px;
+}
+
+.combobox-caret {
+    display: inline-block;
+    position: relative;
+    height: 30px;
+    width: 30px;
+    margin-left: -30px;
+    vertical-align: top;
+    cursor: pointer;
+}
+[dir='rtl'] .combobox-caret {
+  margin-left: 0;
+  margin-right: -30px;
+}
+
+.combobox-caret::after {
+    content: "";
+    height: 0; width: 0;
+    position: absolute;
+    left: 0; right: 0; bottom: 0; top: 0;
+    margin: auto;
+    border-top: 5px solid #ccc;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
 }
 
-/* Styles for raw tag inspector on hover */
-.inspector-hover .tag-row .key-wrap,
-.inspector-hover .tag-row .form-field.input-wrap-position {
-    width: 50%;
+/* Remove the field's bottom border radius when combobox is open */
+/* For some reason this stops the combobox from overlapping the bottom of the field */
+.combobox + * textarea:focus,
+.combobox + * input:focus {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
 }
 
-.inspector-hover .tag-row:first-child input.value {
-    border-top-right-radius: 4px;
-}
 
-.inspector-hover .tag-row:last-child input.value {
-    border-bottom-right-radius: 4px;
+/* Field Help
+------------------------------------------------------- */
+.field-help-body {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 20px;
+    right: 20px;
+    margin: 5px;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+    z-index: 20;
+    background: rgba(255,255,255,0.95);
+    box-shadow: 0 0 30px 5px rgba(0,0,0,.4);
 }
 
-.inspector-hover .tag-row:last-child input.key {
-    border-bottom-left-radius: 4px;
+.field-help-title h2 {
+    padding: 10px;
+    margin-bottom: 0px;
+    font-size: 17px;
 }
-
-.inspector-hover .more-fields {
-    max-height: 0;
-    margin-bottom: -10px;
+.field-help-title button {
+    width: 45px;
+    height: 55px;
+    border-radius: 0;
 }
 
-/* Unstyle button fields */
-.inspector-hover .toggle-list label.active,
-.inspector-hover .entity-editor-pane a.hide-toggle {
-    opacity: 1;
-    background-color: transparent;
+.field-help-nav {
+    font-size: 13px;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.field-help-nav-item {
+    display: inline-block;
+    padding: 5px 10px;
+    cursor: pointer;
     color: #666;
-    padding-left: 0;
-    border-width: 0;
+}
+.field-help-nav-item.active {
+    color: #7092ff;
+    border-bottom: 2px solid;
+}
+.field-help-nav-item:hover {
+    color: #597be7;
+    background-color: #efefef;
 }
 
-.inspector-hover .toggle-list button.active {
-    padding-left: 10px;
+.field-help-content {
+    padding: 10px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+.field-help-content h3 {
+    font-size: 12px;
+    margin-bottom: 5px;
+}
+.field-help-content p {
+    margin-bottom: 15px;
+}
+.field-help-content ul li {
+    list-style: inside;
+    margin-bottom: 5px;
 }
 
-/* Add placeholder only on hover for radio buttons */
-.inspector-hover .toggle-list .placeholder {
-    color: #a9a9a9;
-    padding: 5px 10px;
-    opacity: 1;
-    line-height: 20px;
+.field-help-content .field-help-image {
     width: 100%;
+    margin-bottom: 15px;
 }
 
-/* Hide placeholder for radio buttons if another is active, or not in hover state */
-.toggle-list label.active ~ .placeholder,
-.toggle-list .placeholder {
-    padding: 0;
-    opacity: 0;
-    width: 0;
-    line-height: 0;
-    display: block;
-    overflow: hidden;
+.field-help-content svg.turn {
+    width: 40px;
+    height: 20px;
+}
+.field-help-content svg.shadow {
+    opacity: 0.7;
+    width: 60px;
+    height: 20px;
+}
+.field-help-content svg.from {
+    color: #777;
+}
+.field-help-content svg.allow {
+    color: #5b3;
+}
+.field-help-content svg.restrict {
+    color: #d53;
+}
+.field-help-content svg.only {
+    color: #68f;
+}
+
+.field-help-content p.from_shadow,
+.field-help-content p.allow_shadow,
+.field-help-content p.restrict_shadow,
+.field-help-content p.allow_turn,
+.field-help-content p.restrict_turn {
+    margin-bottom: 5px;
 }
 
-/* adding additional preset fields */
 
+/* More Fields dropdown
+------------------------------------------------------- */
 .more-fields {
     padding: 0 20px 20px 20px;
     font-weight: bold;
 }
+.changeset-editor .more-fields {
+    padding: 15px 20px 0 20px;
+}
+
+.more-fields label {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+}
 
 .more-fields input {
     margin-left: 10px;
-    width: 50%;
+    flex: 1 1 50%;
+}
+[dir='rtl'] .more-fields input {
+    margin-left: auto;
+    margin-right: 10px;
 }
 
-/* preset form access */
-
-.preset-input-wrap .label {
+.form-field-input-wrap .label {
     height: 30px;
-    background: #F6F6F6;
+    background: #f6f6f6;
     padding: 5px 10px;
 }
 
-.form-field-access .preset-input-wrap li {
-    border-bottom: 1px solid #CCC;
+
+/* Raw Tag Editor
+------------------------------------------------------- */
+.tag-list {
+    padding-top: 10px;
 }
-.form-field-access .preset-input-wrap li:last-child {
-    border-bottom: 0;
+.tag-row {
+    width: 100%;
+    position: relative;
 }
-
-.preset-input-access-wrap input {
-    border-radius: 0;
-    border-width: 0;
-    border-left-width: 1px;
+.tag-row .inner-wrap {
+    display: flex;
+    flex-flow: row nowrap;
+    width: 100%;
+    position: relative;
 }
-
-.preset-input-wrap li:last-child input {
-    border-bottom-right-radius: 4px;
+.tag-row .key-wrap,
+.tag-row .value-wrap {
+    flex: 1 1 50%;
 }
 
-/* preset form multicombo */
-
-.form-field-multicombo {
-    border: 1px solid #cfcfcf;
-    border-top: 0px;
-    padding: 5px 0 5px 10px;
-    background: #fff;
-    display: block;
-    border-radius: 0 0 4px 4px;
-    overflow: hidden;
+.tag-row.readonly,
+.tag-row.readonly input.key,
+.tag-row.readonly input.value,
+.tag-row.readonly button.remove {
+    color: #777;
+    background-color: #eee;
+    cursor: not-allowed;
 }
 
-.form-field-multicombo:focus {
-    border-bottom: 0px;
+.tag-row input {
+    height: 31px;
+    border: 0;
+    border-radius: 0;
+    border-bottom: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    width: 100%;
 }
-
-.form-field-multicombo.active {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
+[dir='rtl'] .tag-row input {
+    border-left: none;
+    border-right: 1px solid #ccc;
 }
 
-.form-field-multicombo li {
-    background-color: #eff2f7;
-    border: 1px solid #ccd5e3;
-    border-radius: 4px;
-    line-height: 25px;
-    display: inline-block;
-    padding: 2px 5px;
-    margin: 3px;
-    height: 30px;
-}
 
-.form-field-multicombo a {
-    font-family: Arial, Helvetica, sans-serif !important;
-    font-size: 16px !important;
-    line-height: 24px;
-    float: right;
-    margin: 1px 0 0 5px;
-    padding: 0;
-    cursor: pointer;
-    color: #a6b4ce;
+.tag-row input.key {
+    font-weight: bold;
+    background-color: #f6f6f6;
 }
 
-.form-field-multicombo input {
-    border: 1px solid #ddd;
-    width: 100px;
-    margin: 3px;
+.tag-row input.value {
+    border-right: 1px solid #ccc;
 }
-
-.form-field-multicombo .combobox-caret {
-    margin: 3px 3px 3px -30px;
+[dir='rtl'] .tag-row input.value {
+    border-left: 1px solid #ccc;
 }
 
-.form-field-multicombo input:focus {
-    border-radius: 4px !important;
+.tag-row:first-child input.key {
+    border-top: 1px solid #ccc;
+    border-top-left-radius: 4px;
+}
+[dir='rtl'] .tag-row:first-child input.key {
+    border-top-left-radius: 0;
+    border-top-right-radius: 4px;
 }
 
-/* preset form cycleway */
-
-.form-field-cycleway .preset-input-wrap li {
-    border-bottom: 1px solid #CCC;
+.tag-row:first-child input.value {
+    border-top: 1px solid #ccc;
 }
-.form-field-cycleway .preset-input-wrap li:last-child {
-    border-bottom: 0;
+.tag-row button {
+    flex: 0 0 32px;
+    height: 31px;
+    width: 32px;
+    border: 1px solid #ccc;
+    border-top-width: 0;
+    border-left-width: 0;
 }
-
-.preset-input-cycleway-wrap input {
-    border-radius: 0;
-    border-width: 0;
+[dir='rtl'] .tag-row button {
     border-left-width: 1px;
+    border-right-width: 0;
 }
 
-/* preset form numbers */
+.tag-row button:hover {
+    background: #f1f1f1;
+}
+.tag-row button .icon {
+    opacity: .5;
+}
+.tag-row:first-child button {
+    border-top-width: 1px;
+}
 
-input[type=number] {
-    position: relative;
-    padding-right: 20%;
+.tag-row:first-child .tag-reference-button {
+    border-top-right-radius: 4px;
+}
+[dir='rtl'] .tag-row:first-child .tag-reference-button {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 0;
 }
 
-.spin-control {
-    width: 20%;
-    height: 29px;
-    display: inline-block;
-    margin-left: -20%;
-    margin-bottom: -11px;
-    position: relative;
+.tag-row:last-child .tag-reference-button {
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .tag-row:last-child .tag-reference-button {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 0;
 }
 
-.spin-control button {
-    right: 1px;
-    position: relative;
-    float: left;
-    height: 100%;
-    width: 50%;
-    border-left: 1px solid #CCC;
+.tag-row .tag-reference-button {
     border-radius: 0;
-    background: rgba(0, 0, 0, 0);
 }
-
-.spin-control button.decrement {
-    border-bottom-right-radius: 3px;
+[dir='rtl'] .tag-row .tag-reference-button {
+    border-left-width: 1px;
+    border-right-width: 0;
 }
 
-.spin-control button.decrement::after,
-.spin-control button.increment::after {
-    content:"";
-    height: 0; width: 0;
-    position: absolute;
-    left: 0; right: 0; bottom: 0; top: 0;
-    margin: auto;
+/* Tag reference */
+.tag-reference-loading {
+    background-color: #f5f5f5;
 }
-
-.spin-control button.decrement::after {
-    border-top: 5px solid #CCC;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
+.tag-reference-loading .icon {
+    background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
+    background-position: 0 0;
 }
 
-.spin-control button.increment::after {
-    border-bottom: 5px solid #CCC;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
+.tag-reference-body {
+    flex: 1 1 auto;
+    width: 100%;
+    overflow: hidden;
 }
-
-/* preset form checkbox */
-
-.checkselect label:last-of-type {
+.tag-reference-body.expanded {
+    padding-bottom: 10px;
+}
+.tag-reference-description {
+    margin: 10px 5px;
+}
+.tag-reference-link {
     display: block;
-    background: white;
-    padding: 5px 10px;
-    color: #7092FF;
 }
 
-.checkselect label:hover {
-    background: #f1f1f1;
+.preset-list .tag-reference-body {
+    position: relative;
+    width: 100%;
 }
-
-.checkselect .set {
-    color: inherit;
+.raw-tag-editor .tag-reference-body {
+    width: 100%;
 }
-
-.checkselect label:not(.set) input[type="checkbox"] {
-    opacity: .5;
+.raw-tag-editor .tag-row.readonly .tag-reference-body {
+    background: #f6f6f6;
+    color: #333;
 }
-
-/* Preset form radio button */
-
-.toggle-list button.remove {
-    border-radius: 0 0 3px 3px;
+.raw-tag-editor .tag-row:not(:last-child) .tag-reference-body.expanded {
+    border-bottom: 1px solid #ccc;
 }
-
-.toggle-list button.remove .icon {
-    position: absolute;
-    left: 5px;
+.raw-tag-editor .tag-row.readonly .tag-reference-body.expanded {
+    border-top: 1px solid #ccc;
 }
 
-.toggle-list button.remove::before {
-    content: none;
-}
 
-.form-field .wiki-lang {
-    border-radius: 0;
+/* Raw Member / Membership Editor
+------------------------------------------------------- */
+.raw-member-editor .member-list li:first-child,
+.raw-membership-editor .member-list li:first-child {
+    padding-top: 10px;
+}
+.raw-member-editor .member-row .member-entity-name,
+.raw-membership-editor .member-row .member-entity-name {
+    font-weight: normal;
+    padding-left: 10px;
 }
 
-.form-field .wiki-title {
-    padding-right: 10%;
+[dir='rtl'] .raw-member-editor .member-row .member-entity-name,
+[dir='rtl'] .raw-membership-editor .member-row .member-entity-name {
+    padding-left:0;
+    padding-right: 10px;
 }
 
-.form-field .wiki-title ~ .combobox-caret {
-    margin-left: -18%;
-    margin-right: 9%;
+.form-field-input-member > input.member-role {
+    border-radius: 0 0 0 4px;
 }
-
-.form-field .wiki-link {
-    float: right;
-    background: #fafafa;
-    padding: 5px;
-    text-align: center;
+[dir='rtl'] .form-field-input-member > input.member-role {
+    border-radius: 0 0 4px 0;
 }
 
-.form-field .wiki-link:hover {
-    background: #f1f1f1;
+.member-incomplete .form-field-input-member > input.member-role,
+[dir='rtl'] .member-incomplete .form-field-input-member > input.member-role {
+    border-radius: 0 0 4px 4px;
 }
 
-#preset-input-maxspeed {
-    border-right: none;
-    border-radius: 0 0 0 4px;
-    width: 80%;
+.member-incomplete .member-delete {
+    display: none;
 }
 
-.form-field .maxspeed-unit {
-    border-radius: 0 0 4px 0;
-    width: 20%;
+.member-row-new .member-entity-input {
+    flex: 1 1 100%;
+    border-radius: 4px 4px 0 0;
+    border: 0;
 }
 
-/* Name + translate form */
-
-.form-field .localized-main {
-    padding-right: 10%;
+/* preserve extra space at bottom of inspector to allow for dropdown options - #5280 */
+.raw-membership-editor.inspector-inner {
+    margin-bottom: 150px;
 }
 
-.form-field .button-input-action {
-    position: relative;
-    right: 1px;
-    width: 10%;
-    margin-left: -10%;
-    border: 1px solid #CCC;
-    border-top-width: 0;
-    border-right-width: 0;
-    border-radius: 0 0 4px 0;
-    height: 30px;
-    vertical-align: top;
+/* hidden field to prevent user from tabbing out of the sidebar */
+input.key-trap {
+    height: 0px;
+    width: 0px;
+    padding: 0px;
+    border: 1px solid rgba(0,0,0,0);
 }
 
-.form-field .localized-wrap {
-    padding: 0 10px;
-}
 
-.form-field .localized-wrap .entry {
-    position: relative;
-    overflow: hidden;
+/* add tag, add relation buttons */
+.add-row {
+    display: flex;
+    width: 100%;
+    flex-flow: row nowrap;
 }
-
-.form-field .localized-wrap .entry::before {
-    content: "";
-    display: block;
-    position: absolute;
-    background:#ccc;
-    height: 11px;
-    width: 1px;
-    left: 0;
-    right: 0;
-    top: -11px;
-    margin: auto;
+.add-row .add-tag,
+.add-row .add-relation,
+.add-row .space-value {
+    flex: 1 1 50%;
 }
-
-.form-field .localized-wrap .entry .localized-lang {
-    border-radius: 0;
-    border-top-width: 0;
+.add-row .space-buttons {
+    flex: 0 0 62px;
+}
+.add-row button {
+    height: 30px;
+    background: rgba(0,0,0,.5);
+}
+.add-row button:focus,
+.add-row button:hover {
+    background: rgba(0,0,0,.8);
 }
 
-.form-field .localized-wrap .entry .localized-value {
-    border-top-width: 0;
+.add-tag {
     border-radius: 0 0 4px 4px;
 }
-
-.form-field .localized-wrap .form-label button {
-    border-top-right-radius: 3px;
+.add-relation {
+    margin-top: 10px;
+    border-radius: 4px;
 }
 
-/* Preset form address */
 
-.addr-row input {
-    border-right: 0;
-    border-bottom: 0;
+/* Inspector (hover styles)
+------------------------------------------------------- */
+.inspector-hover .form-field-input-wrap .label,
+.inspector-hover .form-field-input-multicombo .chiplist,
+.inspector-hover .form-field-button,
+.inspector-hover .structure-extras-wrap,
+.inspector-hover .comments-container .comment,
+.inspector-hover button,
+.inspector-hover input,
+.inspector-hover textarea,
+.inspector-hover label,
+.inspector-hover .entity-issues .issue button {
+    background: #ececec;
 }
-
-.addr-row:first-of-type input {
-    border-top: 0;
+.inspector-hover .preset-list-button,
+.inspector-hover .tag-row input {
+    background: #f6f6f6;
 }
 
-.addr-row input:first-of-type {
-    border-left: 0;
+.inspector-hover .entity-issues .issue,
+.inspector-hover .entity-issues .issue li {
+    border: 1px solid #ccc;
 }
-
-.addr-row input {
-    border-radius: 0;
+.inspector-hover .entity-issues .issue .icon {
+    color: #666;
 }
 
-.addr-row:last-of-type input:first-of-type {
-    border-radius: 0 0 0 4px;
+.inspector-hover a,
+.inspector-hover .form-field-input-multicombo .chips,
+.inspector-hover .form-field-input-check span {
+    color: #666;
 }
 
-.addr-row:last-of-type input:last-of-type {
-    border-radius: 0 0 4px 0;
+.inspector-hover .form-field-input-multicombo .chips {
+    background: #eee;
+    border: 1px solid #ccc;
 }
 
-/* Restrictions editor */
-
-.form-field-restrictions .preset-input-wrap {
-    position: relative;
-    height: 300px;
+/* no scrollbars */
+.inspector-hover div {
+    overflow-x: hidden;
+    overflow-y: hidden;
 }
 
-.form-field-restrictions svg {
-    width: 100%;
-    height: 100%;
+/* hide and remove from layout */
+.inspector-hidden,
+.inspector-hover .preset-list-button-wrap .tag-reference-button,
+.inspector-hover label input[type="checkbox"],
+.inspector-hover label input[type="radio"],
+.inspector-hover .form-field-input-multicombo .input-wrap,
+.inspector-hover .form-field-input-radio label,
+.inspector-hover .form-field-input-radio label span,
+.inspector-hover .form-field-input-radio label.remove .icon,
+.inspector-hover .inspector-inner .add-row,
+.inspector-hover .entity-issues .issue ul.issue-fix-list {
+    display: none;
 }
 
-.form-field-restrictions .restriction-help {
-    z-index: 1;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    padding: 2px 6px;
-    background-color: rgba(255, 255, 255, .8);
-    color: #999;
-    text-align: center;
+/* hide but preserve in layout */
+.inspector-hover .combobox-caret,
+.inspector-hover .header button,
+.inspector-hover .quick-links,
+.inspector-hover .form-field-input-multicombo .chips .remove,
+.inspector-hover .hide-toggle:before,
+.inspector-hover .more-fields,
+.inspector-hover .form-field-label button,
+.inspector-hover .tag-row button,
+.inspector-hover .footer * {
+    opacity: 0;
 }
 
-/* combobox dropdown */
-
-div.combobox {
-    z-index: 9999;
-    display: none;
-    box-shadow: 0 0 10px 0 rgba(0,0,0,.1);
-    margin-top: -1px;
-    background: white;
-    max-height: 120px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    border: 1px solid #ccc;
-    border-radius: 0 0 4px 4px;
+/* Styles for raw tag inspector on hover */
+.inspector-hover .tag-row .key-wrap,
+.inspector-hover .tag-row .value-wrap {
+    height: 31px;
 }
 
-.combobox a {
-    display: block;
-    padding: 5px 10px;
-    border-top:1px solid #ccc;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
+.inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 4px;
 }
-
-.combobox a.selected,
-.combobox a:hover {
-    background: #ececec;
+[dir='rtl'] .inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 0;
+    border-top-left-radius: 4px;
 }
 
-.combobox a:first-child {
-    border-top: 0;
+.inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 4px;
 }
-
-.combobox-caret {
-    display: inline-block;
-    position: relative;
-    height: 30px;
-    width: 30px;
-    margin-left: -30px;
-    vertical-align: top;
+[dir='rtl'] .inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 4px;
 }
 
-.combobox-caret::after {
-    content:"";
-    height: 0; width: 0;
-    position: absolute;
-    left: 0; right: 0; bottom: 0; top: 0;
-    margin: auto;
-    border-top: 5px solid #ccc;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
+.inspector-hover .tag-row:last-child input.key {
+    border-bottom-left-radius: 4px;
+}
+[dir='rtl'] .inspector-hover .tag-row:last-child input.key {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 4px;
 }
 
-/* Raw Tag Editor */
+.inspector-hover .more-fields {
+    max-height: 0;
+    margin-bottom: -10px;
+}
 
-.tag-list {
-    padding-top: 10px;
+/* Unstyle button fields */
+.inspector-hover .form-field-input-radio label.active,
+.inspector-hover .entity-editor-pane a.hide-toggle {
+    opacity: 1;
+    background-color: transparent;
+    color: #666;
+    padding-left: 0;
+    border-width: 0;
+}
+.inspector-hover .form-field-input-radio button.active {
+    padding-left: 10px;
 }
 
-.tag-row {
+/* Show placeholder on hover for radio buttons */
+.inspector-hover .form-field-input-radio {
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+}
+.inspector-hover .form-field-input-radio .placeholder {
+    opacity: 1;
+    color: #666;
+    padding: 5px 10px;
+    line-height: 20px;
     width: 100%;
-    position: relative;
-    clear: both;
+    border: 0;
 }
-
-.tag-row input {
-    height: 31px;
+.inspector-hover .form-field-input-radio .structure-extras-wrap {
     border: 0;
-    border-radius: 0;
-    border-bottom: 1px solid #CCC;
-    border-left: 1px solid #CCC;
 }
 
-.tag-row .key-wrap,
-.tag-row .input-wrap-position {
-    width: 40%;
-    float: left;
-    height: 30px;
-}
 
-.tag-row input.key {
-    font-weight: bold;
+/* OSM Note / KeepRight Editors
+------------------------------------------------------- */
+.note-header,
+.error-header {
     background-color: #f6f6f6;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
 }
 
-.tag-row input.value {
-    border-right: 1px solid #CCC;
-}
-
-.tag-row:first-child input.key {
-    border-top: 1px solid #CCC;
-    border-top-left-radius: 4px;
+.note-header-icon,
+.error-header-icon {
+    background-color: #fff;
+    padding: 10px;
+    flex: 0 0 62px;
+    position: relative;
+    width: 60px;
+    height: 60px;
+    border-right: 1px solid #ccc;
+    border-radius: 5px 0 0 5px;
 }
-
-.tag-row:first-child input.value {
-    border-top: 1px solid #CCC;
+[dir='rtl'] .note-header-icon,
+[dir='rtl'] .error-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
 }
 
-.tag-row button {
+.note-header-icon .icon-wrap,
+.error-header-icon .icon-wrap {
     position: absolute;
-    height: 31px;
-    right: 10%;
-    border: 1px solid #CCC;
-    border-top-width: 0;
-    border-left-width: 0;
+    top: 0px;
 }
 
-.tag-row button:hover {
-    background: #f1f1f1;
+.note-header-label,
+.error-header-label {
+    background-color: #f6f6f6;
+    padding: 0 15px;
+    flex: 1 1 100%;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 0 5px 5px 0;
 }
-
-.tag-row button .icon {
-    opacity: .5;
+[dir='rtl'] .note-header-label,
+[dir='rtl'] .error-header-label {
+    border-radius: 5px 0 0 5px;
 }
 
-.tag-row:first-child button {
-    border-top-width: 1px;
+.note-category {
+    margin: 20px 0px;
 }
 
-.tag-row:first-child .tag-reference-button {
-    border-top-right-radius: 4px;
+.comments-container {
+    background: #ececec;
+    padding: 1px 10px;
+    border-radius: 8px;
+    margin-top: 20px;
 }
 
-.tag-row:last-child .tag-reference-button {
-    border-bottom-right-radius: 4px;
+.comment {
+    background-color: #fff;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin: 10px auto;
+    display: flex;
+    flex-flow: row nowrap;
 }
-
-.tag-row .tag-reference-button {
-    right: 0;
-    border-radius: 0;
-    width: 10%;
-    top: 0;
-    background: #fafafa;
+.comment-avatar {
+    padding: 10px;
+    flex: 0 0 62px;
 }
-
-/* Adding form fields to tag editor */
-
-.inspector-inner .add-tag {
-    width: 40%;
-    height: 30px;
-    border-top: 0;
-    background: rgba(0,0,0,.5);
-    border-radius: 0 0 4px 4px;
+.comment-avatar .icon.comment-avatar-icon {
+    width: 40px;
+    height: 40px;
+    object-fit: cover;
+    border: 1px solid #ccc;
+    border-radius: 20px;
+}
+.comment-main {
+    padding: 10px 10px 10px 0;
+    flex: 1 1 100%;
+    flex-flow: column nowrap;
+    overflow: hidden;
+    overflow-wrap: break-word;
+}
+[dir='rtl'] .comment-main {
+    padding: 10px 0 10px 10px;
 }
 
-.inspector-inner .add-tag:hover {
-    background: rgba(0,0,0,.8);
+.comment-metadata {
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+.comment-author {
+    font-weight: bold;
+    color: #333;
 }
-
-.inspector-inner .add-tag .label {
-    display: none;
+.comment-date {
+    color: #aaa;
 }
-
-/* Tag reference */
-
-button.minor.tag-reference-loading {
-    background-color: #f5f5f5;
+.comment-text {
+    color: #333;
+    margin-top: 10px;
+    overflow-y: auto;
+    max-height: 250px;
 }
-
-.tag-reference-loading .icon {
-    background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
-    background-position: 0 0;
+.comment-text::-webkit-scrollbar {
+    border-left: none;
 }
 
-.tag-reference-body {
-    overflow: hidden;
-    clear: both;
+.note-save,
+.error-save {
+    padding-top: 20px;
 }
 
-.tag-reference-body p,
-.tag-reference-body img {
+.error-details {
+    padding: 10px;
+}
+.error-details-container {
+    background: #ececec;
+    padding: 10px;
     margin-top: 20px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
 }
-
-.tag-reference-body p:last-child {
-    padding-bottom: 10px;
+.error-details-description {
+    margin-bottom: 10px;
 }
-
-.tag-reference-body a {
-    display: block;
-    padding-bottom: 10px;
+.error-details-description-text::first-letter {
+    text-transform: capitalize;
+}
+[dir='rtl'] .error-details-description-text::first-letter {
+    text-transform: none;  /* #5877 */
 }
 
-.preset-list .tag-reference-body {
-    position: relative;
+.note-save .new-comment-input,
+.error-save .new-comment-input {
     width: 100%;
+    height: 100px;
+    max-height: 300px;
+    min-height: 100px;
 }
 
-.preset-list .tag-reference-body a {
-    padding-bottom: 20px;
+.note-save .detail-section,
+.error-save .detail-section {
+    margin: 10px 0;
 }
 
-.preset-list .tag-reference-body p,
-.preset-list .tag-reference-body img {
-    margin-top: 10px;
+.note-report {
+    float: right;
 }
 
-.raw-tag-editor .tag-reference-body {
-    border-bottom: 1px solid #ccc;
-    float: left;
-    width: 100%;
-}
 
-.raw-tag-editor .tag-reference-body p:last-child {
-    padding-bottom: 20px;
+/* Custom Data Editor
+------------------------------------------------------- */
+.data-header {
+    background-color: #f6f6f6;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
 }
 
-.raw-tag-editor .tag-reference-body a {
-    padding-bottom: 20px;
+.data-header-icon {
+    background-color: #fff;
+    padding: 10px;
+    flex: 0 0 62px;
+    position: relative;
+    width: 60px;
+    height: 60px;
+    border-right: 1px solid #ccc;
+    border-radius: 5px 0 0 5px;
 }
-
-img.wiki-image {
-    float: right;
-    width: 33.3333%;
-    width: -webkit-calc(33.3333% - 10px);
-    width: calc(33.3333% - 10px);
-    margin-left: 20px;
-    margin-right: 10px;
-    border-radius: 4px;
-    max-height: 200px;
-    margin-bottom: 20px;
+[dir='rtl'] .data-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
 }
 
-/* Raw relation membership editor */
-
-.raw-member-editor .member-list li:first-child,
-.raw-membership-editor .member-list li:first-child {
-    padding-top: 10px;
+.data-header-icon .icon-wrap {
+    position: absolute;
+    top: 0px;
 }
 
-.raw-member-editor .member-row,
-.raw-membership-editor .member-row {
-    position: relative;
+.data-header-label {
+    background-color: #f6f6f6;
+    padding: 0 15px;
+    flex: 1 1 100%;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 0 5px 5px 0;
 }
-
-.raw-member-editor .member-row .member-entity-name,
-.raw-membership-editor .member-row .member-entity-name {
-    font-weight: normal;
-    padding-left: 10px;
+[dir='rtl'] .data-header-label {
+    border-radius: 5px 0 0 5px;
 }
 
-.member-incomplete .member-delete {
+/* tag editor - no buttons */
+.data-editor.raw-tag-editor button {
     display: none;
 }
+.data-editor.raw-tag-editor .tag-row .key-wrap,
+.data-editor.raw-tag-editor .tag-row .value-wrap {
+    width: 50%;
+}
 
-.member-row-new .member-entity-input {
-    border-radius: 4px 4px 0 0;
-    border: 1px solid #cfcfcf;
+
+/* Map Controls
+------------------------------------------------------- */
+.map-controls {
+    right: 0;
+    top: 132px;
+    width: 40px;
+    position: fixed;
+    z-index: 100;
+}
+[dir='rtl'] .map-controls {
+    left: 0;
+    right: auto;
 }
 
-.add-relation {
-    width: 40%;
-    height: 30px;
+.map-control > button {
+    position: relative;
+    width: 40px;
     background: rgba(0,0,0,.5);
-    border-radius: 4px;
-    margin-top: 10px;
+    border-radius: 0;
 }
 
-.add-relation:hover {
-    background: rgba(0,0,0,.8);
+.map-control > button:hover {
+    background: rgba(0, 0, 0, .8);
+}
+
+.map-control > button.active,
+.map-control > button.active:hover {
+    background: #7092ff;
 }
 
-/* Fullscreen button */
+
+/* Fullscreen Button (disabled)
+------------------------------------------------------- */
 div.full-screen {
-    float: right;
+    display: inline-block;
     width: 40px;
     margin-right: 10px;
+    display: none;
 }
 
 div.full-screen .tooltip {
@@ -3579,47 +5726,53 @@ div.full-screen > button:hover {
     background-color: rgba(0, 0, 0, .8);
 }
 
-/* Map Controls */
 
-.map-controls {
-    right: 0;
-    top: 70px;
-    width: 40px;
-    position: fixed;
-    z-index: 100;
+/* Zoom Buttons
+------------------------------------------------------- */
+.zoombuttons > button.zoom-in {
+    border-radius: 4px 0 0 0;
 }
-
-.map-control > button {
-    width: 40px;
-    background: rgba(0,0,0,.5);
-    border-radius: 0;
+[dir='rtl'] .zoombuttons > button.zoom-in {
+    border-radius: 0 4px 0 0;
 }
 
-.map-control > button:hover {
-    background: rgba(0, 0, 0, .8);
-}
 
-.map-control > button.active,
-.map-control > button.active:hover {
-    background: #7092ff;
+/* Geolocate Button
+------------------------------------------------------- */
+.geolocate-control {
+    margin-bottom: 10px;
+}
+.geolocate-control > button {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .geolocate-control > button {
+    border-radius: 0 0 4px 0;
 }
 
-/* Zoomer */
 
-.zoombuttons button.zoom-in {
-    border-radius: 4px 0 0 0;
+/* Background / Map Data / Help Pane buttons
+------------------------------------------------------- */
+.help-control > button {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .help-control > button {
+    border-radius: 0 0 4px 0;
 }
-
-/* Background / Map Data Settings */
 
 .map-data-control button {
     border-radius: 0;
 }
 
-.background-control button {
+.background-control > button {
     border-radius: 4px 0 0 0;
 }
+[dir='rtl'] .background-control > button {
+    border-radius: 0 4px 0 0;
+}
 
+
+/* Background / Map Data Settings
+------------------------------------------------------- */
 .map-data-control,
 .background-control {
     position: relative;
@@ -3627,24 +5780,20 @@ div.full-screen > button:hover {
 
 .imagery-faq {
     margin-bottom: 10px;
-}
-
-.map-data-control .hide-toggle,
-.background-control .hide-toggle {
-    padding-bottom: 10px;
+    white-space: nowrap;
 }
 
 .layer-list, .controls-list {
     margin-bottom: 10px;
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     border-radius: 4px;
 }
 
-.layer-list li {
-    position: relative;
+.layer-list > li {
     height: 30px;
-    background-color: white;
-    color: #7092FF;
+    background-color: #fff;
+    color: #7092ff;
+    position: relative;
 }
 
 .layer-list:empty {
@@ -3654,26 +5803,24 @@ div.full-screen > button:hover {
 .layer-list > li:first-child {
     border-radius: 3px 3px 0 0;
 }
-
 .layer-list > li:last-child {
     border-radius: 0 0 3px 3px;
 }
-
 .layer-list > li:only-child {
     border-radius: 3px;
 }
-
 .layer-list li:not(:last-child) {
     border-bottom: 1px solid #ccc;
 }
-
 .layer-list li:hover {
     background-color: #ececec;
 }
 
+.layer-list li.active button,
+.layer-list li.switch button,
 .layer-list li.active,
 .layer-list li.switch {
-    background: #E8EBFF;
+    background: #e8ebff;
 }
 
 .layer-list li.best > div.best {
@@ -3682,6 +5829,10 @@ div.full-screen > button:hover {
     float: right;
 }
 
+[dir='rtl'] .list-item-data-browse svg {
+    transform: rotateY(180deg);
+}
+
 /* make sure tooltip fits in map-control panel */
 /* if too wide, placement will be wrong the first time it displays */
 .layer-list li.best .tooltip-inner {
@@ -3701,51 +5852,239 @@ div.full-screen > button:hover {
     text-overflow: ellipsis;
 }
 
-.minimap-toggle {
-    display: block;
-    padding: 5px 10px;
-    cursor: pointer;
-    color: #7092FF;
-    border-radius: 3px;
+.map-data-pane .layer-list button,
+.background-pane .layer-list button {
+    float: right;
+    height: 100%;
+    width: 10%;
+    border-left: 1px solid #ccc;
+    border-radius: 0;
+}
+[dir='rtl'] .map-data-pane .layer-list button,
+[dir='rtl'] .background-pane .layer-list button {
+    float: left;
+    border-left: none;
+    border-right: 1px solid #ccc;
 }
 
-.minimap-toggle.active {
-    background: #E8EBFF;
+.map-data-pane .layer-list button .icon,
+.background-pane .layer-list button .icon {
+    opacity: 0.5;
 }
 
-.minimap-toggle:hover {
-    background-color: #ececec;
+.map-data-pane .layer-list button:first-of-type,
+.background-pane .layer-list button:first-of-type {
+    border-radius: 0 3px 3px 0;
+}
+[dir='rtl'] .map-data-pane .layer-list button:first-of-type,
+[dir='rtl'] .background-pane .layer-list button:first-of-type {
+    border-radius: 3px 0 0 3px;
 }
 
-.hide-toggle {
-    display: block;
-    padding-left:12px;
-    position: relative;
+.map-data-pane .vectortile-container .vectortile-header {
+    padding-bottom: 5px;
+}
+.map-data-pane .vectortile-container .vectortile-footer {
+    padding-bottom: 10px;
 }
 
-.hide-toggle:before {
-    content: '';
-    display: block;
-    position: absolute;
-    height: 0;
-    width: 0;
-    left: 0;
-    top: 5px;
-    border-top:  4px solid transparent;
-    border-bottom:  4px solid transparent;
-    border-left:  8px solid #7092ff;
+
+/* Issues
+------------------------------------------------------- */
+.issue {
+    overflow: hidden;
+}
+.issue button {
+    padding: 5px 10px 5px 5px;
+    height: auto;
+    width: 100%;
+    font-weight: inherit;
+    border-radius: 0;
+    text-align: inherit;
+    display: flex;
+    color: inherit;
+}
+[dir='rtl'] .issue button {
+    padding: 5px 5px 5px 10px;
+}
+.warnings-list,
+.issue.severity-warning,
+ li.issue.severity-warning {
+    border-color: #FFDF5C;
+}
+.icon-badge.warning {
+    color: #FFDF5C;
+}
+.errors-list,
+.issue.severity-error,
+ li.issue.severity-error {
+    border-color: #f5b0ab;
+}
+.icon-badge.error {
+    color: #ff0c05;
+}
+
+.issue.severity-warning,
+.issue.severity-warning button,
+.mode-save .warning-section {
+    background: #ffb;
+}
+.issue.severity-warning:not(.expanded) button:hover,
+.issue.severity-warning:not(.expanded) button:focus,
+.issue.severity-warning .issue-fix-item.actionable button:hover,
+.issue.severity-warning .issue-fix-item.actionable button:focus {
+    background: #FFFF99;
+}
+.issue.severity-warning .issue-icon {
+    color: #ffa900;
+    fill: #ffa900;
+}
+.issue.severity-warning .issue-fix-item.actionable {
+    color: #b15500;
+    fill: #b15500;
+}
+.issue.severity-warning .issue-fix-item.actionable:hover,
+.issue.severity-warning .issue-fix-item.actionable button:focus {
+    color: #7f3d00;
+    fill: #7f3d00;
+}
+
+.issue.severity-error,
+.issue.severity-error button,
+.mode-save .error-section {
+    background: #FFD5D4;
+}
+.issue.severity-error:not(.expanded) button:hover,
+.issue.severity-error:not(.expanded) button:focus,
+.issue.severity-error .issue-fix-item.actionable button:hover,
+.issue.severity-error .issue-fix-item.actionable button:focus {
+    background: #ffc9c7;
+}
+.issue.severity-error .issue-icon {
+    color: #DD1400;
+    fill: #DD1400;
+}
+.issue.severity-error .issue-fix-item.actionable {
+    color: #b91201;
+    fill: #b91201;
+}
+.issue.severity-error .issue-fix-item.actionable:hover,
+.issue.severity-error .issue-fix-item.actionable button:focus {
+    color: #840c00;
+    fill: #840c00;
+}
+
+/* Issues Pane */
+
+.issues-list label {
+    padding: 5px;
+}
+.issues-list label > span {
+    display: inline;
+    white-space: normal;
+}
+.issues-list li {
+    height: auto;
+    color: inherit;
+    position: static;
+}
+
+.issues-none {
+    border-radius: 4px;
+    border: 1px solid #72D979;
+    background: #C6FFCA;
+    padding: 5px !important;
+    display: flex;
+    margin-top: 5px;
+    margin-bottom: 15px;
+}
+.issues-none .icon {
+    color: #05AC10;
+}
+
+/* Entity Issues List */
+.entity-issues .issue {
+    border-radius: 4px;
+    border-width: 1px;
+    border-style: solid;
+}
+.entity-issues .issue:not(:last-of-type) {
+    margin-bottom: 10px;
+}
+.issue.expanded button.message {
+    cursor: auto;
+    padding-bottom: 0px;
+}
+ul.issue-fix-list {
+    margin-bottom: 5px;
+}
+ul.issue-fix-list button {
+    padding: 2px 10px 2px 26px;
+}
+.issue-fix-item:not(.actionable) button {
+    cursor: auto;
+
+}
+.issue-fix-item:not(.actionable) .fix-icon {
+    color: #555;
+    fill: #555;
+}
+
+.issue:not(.expanded) ul.issue-fix-list {
+    display: none;
+}
+/* don't animate right now
+.issue ul.issue-fix-list {
+    max-height: 0;
+    transition: max-height 200ms linear;
+    -moz-transition: max-height 200ms linear;
+    -webkit-transition: max-height 200ms linear;
+}
+.issue.expanded ul.issue-fix-list {
+    max-height: 180px;
+    transition: max-height 200ms linear;
+    -moz-transition: max-height 200ms linear;
+    -webkit-transition: max-height 200ms linear;
+}*/
+
+
+/* Background - Display Options Sliders
+------------------------------------------------------- */
+.display-options-container {
+    padding: 10px;
+}
+
+.display-control h5 {
+    padding-bottom: 0;
+    padding-top: 10px;
+}
+
+.display-control h5 span {
+    margin: 5px;
 }
 
-.hide-toggle.expanded:before {
-    border-top:  8px solid #7092ff;
-    border-bottom: 0;
-    border-right:  4px solid transparent;
-    border-left:  4px solid transparent;
+.display-control .display-option-input {
+    height: 20px;
+    width: 155px;
+}
+
+.display-control button {
+    height: 30px;
+    width: 30px;
+    margin-left: 5px;
+    margin-right: 0px;
+    vertical-align: text-bottom;
+    border-radius: 4px;
+}
+[dir='rtl'] .display-control button {
+    margin-left: 0px;
+    margin-right: 5px;
 }
 
-/* Adjust Alignment controls */
 
-.background-control .nudge-container {
+/* Background - Adjust Alignment
+------------------------------------------------------- */
+.background-pane .nudge-container {
     border: 1px solid #ccc;
     border-radius: 4px;
     padding: 10px;
@@ -3795,7 +6134,7 @@ div.full-screen > button:hover {
 }
 
 .nudge-container input.error {
-    border: 1px solid #FF7878;
+    border: 1px solid #ff7878;
     border-radius: 2px;
     background: #ffb;
 }
@@ -3846,141 +6185,117 @@ div.full-screen > button:hover {
    cursor: move;
 }
 
-.background-control .nudge.right::after {
-    border-top:  5px solid transparent;
-    border-bottom:  5px solid transparent;
-    border-left:  5px solid #222;
+.background-pane .nudge.right::after {
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-left: 5px solid #222;
 }
 
-.background-control .nudge.left::after {
-    border-top:  5px solid transparent;
-    border-bottom:  5px solid transparent;
-    border-right:  5px solid #222;
+.background-pane .nudge.left::after {
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-right: 5px solid #222;
 }
 
-.background-control .nudge.top::after {
-    border-right:  5px solid transparent;
-    border-left:  5px solid transparent;
-    border-bottom:  5px solid #222;
-}
-
-.background-control .nudge.bottom::after {
-    border-right:  5px solid transparent;
-    border-left:  5px solid transparent;
-    border-top:  5px solid #222;
+.background-pane .nudge.top::after {
+    border-right: 5px solid transparent;
+    border-left: 5px solid transparent;
+    border-bottom: 5px solid #222;
 }
 
-.opacity-options {
-    background: url(<%= asset_path("iD/img/background-pattern-opacity.png") %>) 0 0 repeat;
-    height:20px;
-    width:82px;
-    position: absolute;
-    right: 50px;
-    top: 20px;
-    border: 1px solid #ccc;
+.background-pane .nudge.bottom::after {
+    border-right: 5px solid transparent;
+    border-left: 5px solid transparent;
+    border-top: 5px solid #222;
 }
 
-.opacity-options li {
-    height: 100%;
-    display: block;
-    float: left;
-}
 
-.opacity-options li .select-box{
+/* Side Panes - Background / Map Data / Help
+------------------------------------------------------- */
+.map-pane {
     position: absolute;
-    width:20px;
-    height:18px;
-    z-index: 9999;
+    top: 60px;
+    bottom: 30px;
+    right: 0;
+    width: 100%;
+    max-width: 400px;
+    min-width: 180px;
+    padding-bottom: 50px;
+    overflow: hidden;
+    z-index: 10;
+}
+[dir='rtl'] .map-pane {
+    left: 0;
+    right: auto !important;
 }
 
-.map-data-control li:hover .select-box,
-.map-data-control li.selected .select-box,
-.background-control li:hover .select-box,
-.background-control li.selected .select-box {
-    border: 2px solid #7092ff;
-    background: rgba(89, 123, 231, .5);
-    opacity: .5;
+.map-pane.help-wrap {
+    max-width: 600px;
 }
 
-.map-data-control li.selected:hover .select-box,
-.map-data-control li.selected .select-box,
-.background-control li.selected:hover .select-box,
-.background-control li.selected .select-box {
-    opacity: 1;
+.pane-heading {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    border-bottom: 1px solid #ccc;
+    height: 60px;
 }
 
-.background-control .opacity {
-    background:#222;
-    display:inline-block;
-    width:20px;
-    height:18px;
+.pane-heading h2 {
+    margin: 14px 20px;
 }
 
-.map-data-control .layer-list button,
-.background-control .layer-list button {
-    float: right;
+.pane-heading button {
+    width: 40px;
     height: 100%;
-    width: 10%;
-    border-left: 1px solid #CCC;
     border-radius: 0;
 }
 
-.map-data-control .layer-list button .icon,
-.background-control .layer-list button .icon {
-    opacity: 0.5;
-}
-
-.map-data-control .layer-list button:first-of-type,
-.background-control .layer-list button:first-of-type {
-    border-radius: 0 3px 3px 0;
-}
-
-.map-data-control .map-overlay,
-.background-control .map-overlay,
-.help-control .map-overlay {
-    z-index: -1;
-}
-
-
-/* Geolocator */
-
-.geolocate-control {
-    margin-bottom: 10px;
+.pane-content {
+    height: 100%;
+    padding: 10px 50px 20px 20px;
+    overflow-x: hidden;
+    overflow-y: scroll;
 }
-
-.geolocate-control button {
-    border-radius: 0 0 0 4px;
+[dir='rtl'] .pane-content {
+    padding: 10px 20px 20px 50px;
 }
 
-.map-overlay.content {
-    position: fixed;
-    top:60px;
-    bottom: 30px;
-    padding: 20px 50px 20px 20px;
-    right: 0;
-    overflow: auto;
+.pane-content > div {
+    padding-bottom: 15px;
 }
 
-/* Help */
-
-.help-control button {
-    border-radius: 0 0 0 4px;
-}
 
+/* Help
+------------------------------------------------------- */
 .help-wrap p {
     font-size: 15px;
     margin-bottom: 20px;
 }
 
 .help-wrap .left-content .body p code {
-    padding:2px 4px;
-    background:#eee;
+    padding: 3px 4px;
+    font-size: 12px;
+    color: #555;
+    vertical-align: baseline;
+    background-color: #f6f6f6;
+    border: solid 1px #ccc;
+    margin: 0 2px;
+    border-bottom-color: #bbb;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #bbb;
+}
+
+.help-wrap .left-content .icon.pre-text {
+    vertical-align: text-top;
+    margin-right: 0;
+    margin-left: 0;
+    display: inline-block;
 }
 
 .help-wrap .toc {
-    /* This is two columns, 41.66666 x .4 = 16.6666 */
-    width:40%;
-    float:right;
+    width: 40%;
+    float: right;
     margin-left: 20px;
     margin-bottom: 20px;
     padding-left: 5px;
@@ -3989,7 +6304,7 @@ div.full-screen > button:hover {
 .help-wrap .toc li a,
 .help-wrap .nav a {
     display: block;
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     padding: 5px 10px;
 }
 
@@ -3998,23 +6313,24 @@ div.full-screen > button:hover {
 }
 
 .help-wrap .toc li a:hover,
-.help-wrap .nav a:hover  {
+.help-wrap .nav a:hover {
     background: #ececec;
 }
 
 .help-wrap .toc li a.selected {
-    background: #E8EBFF;
+    background: #e8ebff;
 }
 
 .help-wrap .toc li:first-child a {
     border-radius: 4px 4px 0 0;
 }
 
-.help-wrap .toc li:nth-last-child(2) a {
-    border-bottom: 1px solid #CCC;
+.help-wrap .toc li:nth-last-child(3) a {
+    border-bottom: 1px solid #ccc;
     border-radius: 0 0 4px 4px
 }
 
+.help-wrap .toc li.shortcuts a,
 .help-wrap .toc li.walkthrough a {
     overflow: hidden;
     margin-top: 10px;
@@ -4022,8 +6338,13 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
+.help-wrap .toc li.walkthrough a {
+    text-align: center;
+}
+
 .help-wrap .nav {
     position: relative;
+    padding-bottom: 30px;
 }
 
 .help-wrap .nav a {
@@ -4047,16 +6368,15 @@ div.full-screen > button:hover {
 }
 
 
-/* Tiles
+/* Raster Background Tiles
 ------------------------------------------------------- */
-
 img.tile {
-    position:absolute;
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
+    position: absolute;
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
 
     -moz-user-select: none;
     -webkit-user-select: none;
@@ -4066,24 +6386,35 @@ img.tile {
     opacity: 0;
 
     -webkit-transition: opacity 200ms linear;
-    transition: opacity 200ms linear;
     -moz-transition: opacity 200ms linear;
+    transition: opacity 200ms linear;
+}
+
+img.tile-loaded {
+    opacity: 1;
+}
+
+img.tile-removing {
+    opacity: 0;
 }
 
 .tile-label-debug {
+    font-size: 10px;
     background: rgba(0, 0, 0, 0.7);
     color: #fff;
     position: absolute;
     text-align: center;
-    width: 128px;
+    padding: 5px;
     border-radius: 3px;
     z-index: 2;
+    margin-left: -70px;
+    margin-top: -20px;
 
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
 
     -moz-user-select: none;
     -webkit-user-select: none;
@@ -4092,41 +6423,31 @@ img.tile {
 }
 
 img.tile-debug {
-    border: 1px solid red;
-}
-
-img.tile-loaded {
-    opacity: 1;
-}
-
-img.tile-removing {
-    opacity: 0;
+    outline: 1px solid red;
 }
 
 
 /* Map
 ------------------------------------------------------- */
-
 #map {
-    position:relative;
-    overflow:hidden;
-    height:100%;
-    background:#000;
-}
-
-#supersurface {
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
-
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+    background: #000;
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
 
+#supersurface {
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+}
+
 #supersurface, .layer {
     position: absolute;
     top: 0;
@@ -4135,6 +6456,7 @@ img.tile-removing {
     bottom: 0;
 }
 
+
 /* Map-In-Map
 ------------------------------------------------------- */
 .map-in-map {
@@ -4150,11 +6472,11 @@ img.tile-removing {
 }
 
 .map-in-map-tiles {
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
 
     -moz-user-select: none;
     -webkit-user-select: none;
@@ -4192,7 +6514,7 @@ img.tile-removing {
 }
 
 
-/* Debug
+/* Debug Data
 ------------------------------------------------------- */
 .debug {
     stroke: currentColor;
@@ -4203,9 +6525,10 @@ img.tile-removing {
     stroke-width: 1;
 }
 
+.nocolor { color: rgba(0, 0, 0, 0); }
 .red     { color: rgba(255, 0, 0, 0.75); }
 .green   { color: rgba(0, 255, 0, 0.75); }
-.blue    { color: rgba(0, 0, 255, 0.75); }
+.blue    { color: rgba(176, 176, 255, 0.75); }
 .yellow  { color: rgba(255, 255, 0, 0.75); }
 .cyan    { color: rgba(0, 255, 255, 0.75); }
 .magenta { color: rgba(255, 0, 255, 0.75); }
@@ -4230,99 +6553,269 @@ img.tile-removing {
     padding: 0 5px;
 }
 
-/* Info Box
+
+/* Information Panels
 ------------------------------------------------------- */
-.infobox {
+.info-panels {
+    display: flex;
+    flex-flow: row-reverse wrap-reverse;
     position: absolute;
     z-index: 1;
     right: 0;
     bottom: 30px;
-    width: 240px;
-    border-radius: 4px 0 0 0;
-    border-bottom: 1px solid black;
+    -ms-user-select: element;
 }
 
-.infobox .infobox-heading {
-    display: block;
-    border-radius: 4px 0 0 0;
+.info-panels h1,
+.info-panels h2,
+.info-panels h3,
+.info-panels h4,
+.info-panels h5 {
+    display: inline-block;
+    margin-bottom: 0;
+}
+
+.info-panels h1,
+.info-panels h2,
+.info-panels h3 {
+    color: #ff8;
+}
+
+.panel-container {
+    flex: 0 0 auto;
+    margin: 2px 0 0 2px;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.75);
+    padding-bottom: 10px;
+    width: 250px;
+}
+
+.panel-container .panel-title {
+    border-radius: 4px 4px 0 0;
+}
+
+.panel-title {
     padding: 5px 10px;
+}
+
+.panel-title button.close {
+    float: right;
+    height: 20px;
+    background: none;
+    color: #ddd;
+}
+[dir='rtl'] .panel-title button.close {
+    float: left;
+}
+
+.panel-title button.close:hover {
+    color: #fff;
+}
+.panel-title button.close .icon {
+    height: 20px;
+    width: 16px;
+}
+
+.panel-content {
+    padding: 5px 10px;
+    position: relative;
+}
+
+.panel-content li span {
+    display: inline-block;
+    white-space: nowrap;
+    margin: 0 8px;
+}
+
+.panel-content .button {
+    display: inline-block;
+    background: #7092ff;
+    border-radius: 2px;
+    padding: 0 4px;
+    margin-top: 10px;
+    margin-right: 10px;
+    color: #fff;
+}
+[dir='rtl'] .panel-content .button {
+    margin-right: auto;
+    margin-left: 10px;
+}
+
+.panel-content-history .links a {
+    margin-left: 8px;
+}
+[dir='rtl'] .panel-content-history .links a {
+    margin-left: auto;
+    margin-right: 8px;
+}
+
+.panel-content-history .view-history-on-osm {
+    display: block;
+    margin-top: 10px;
+}
+
+.panel-content-location .location-info {
+    margin-top: 10px;
+}
+
+
+/* About Section, Attribution, Footer
+------------------------------------------------------- */
+#about {
+    width: 100%;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    border-radius: 0;
+    pointer-events: none;
+    display: flex;
+    flex-direction: column;
+    -ms-user-select: element;
+}
+
+#attrib {
+    width: 100%;
+    height: 20px;
+    margin-bottom: 5px;
+}
+
+#attrib * { pointer-events: all; }
+
+.base-layer-attribution,
+.overlay-layer-attribution {
+    position: absolute;
+    color: #ccc;
+    font-size: 10px;
+}
+
+.base-layer-attribution {
+    left: 10px;
+}
+
+.overlay-layer-attribution {
+    right: 10px;
+}
+
+.overlay-layer-attribution .attribution:not(:last-child):after {
+    content: '; ';
+}
+
+.attribution a,
+.attribution a:visited {
+    color: #ccf;
+}
+
+.attribution a:hover {
+    color: #aaf;
+}
+
+.attribution .source-image {
+    height: 20px;
+    vertical-align: middle;
+    border-radius: 3px;
+}
+
+.attribution span {
+    margin: 0 3px;
+}
+
+#footer {
+    pointer-events: all;
+    display: block;
     height: 30px;
 }
 
-.infobox ul {
-    padding: 5px 10px;
-}
 
-.infobox .button {
+/* Footer - Flash messages
+------------------------------------------------------- */
+#flash-wrap {
+    display: flex;
+    flex: 0 0 100%;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    max-height: 30px;
     position: absolute;
-    background: #7092ff;
-    border-radius: 2px;
-    padding: 0 4px;
-    color: white;
-    top: 40px;
-    right: 10px;
+    right: 0;
+    left: 0;
 }
 
-/* About Section
-------------------------------------------------------- */
-
-#about {
-    width: 100%;
-    position: absolute;
-    right:0;
-    bottom:0;
-    border-radius: 0;
-    pointer-events: none;
+.flash-content {
+    display: flex;
+    flex: 1 0 auto;
+    flex-flow: row nowrap;
+    align-items: center;
+    padding: 2px;
+    height: 30px;
 }
 
-#attrib {
-    width: 100%;
+.flash-icon {
+    flex: 0 0 auto;
+    width: 20px;
     height: 20px;
-    margin-bottom: 5px;
-    float: left;
-    clear: both;
+    margin: 0 8px;
 }
 
-#attrib * { pointer-events: all; }
+.flash-icon circle {
+    fill: #eee;
+}
+.flash-icon.disabled circle {
+    cursor: auto;
+    fill: rgba(255,255,255,0.7);
+}
 
-.base-layer-attribution,
-.overlay-layer-attribution {
-    position: absolute;
-    color: #888;
-    font-size: 10px;
+.flash-icon use {
+    color: #222;
+}
+.flash-icon.disabled use {
+    color: rgba(32,32,32,0.7);
 }
 
-.base-layer-attribution {
-    left: 10px;
+.flash-icon.operation use {
+    fill: #222;
+    color: #79f;
+}
+.flash-icon.operation.disabled use {
+    fill: rgba(32,32,32,0.7);
+    color: rgba(40,40,40,0.7);
 }
 
-.overlay-layer-attribution {
-    right: 10px;
+.flash-text {
+    flex: 1 1 auto;
 }
 
-.overlay-layer-attribution .attribution:not(:last-child):after {
-    content: '; ';
+#footer-wrap {
+    display: flex;
+    flex: 0 0 100%;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    max-height: 30px;
+    position: absolute;
+    right: 0;
+    left: 0;
 }
 
-.source-image {
-    height:20px;
-    vertical-align:top;
+.footer-show {
+    bottom: 0px;
+    transition: bottom 75ms linear;
+    -moz-transition: bottom 75ms linear;
+    -webkit-transition: bottom 75ms linear;
 }
 
-#footer {
-    width: 100%;
-    float: left;
-    clear: both;
-    pointer-events: all;
+.footer-hide {
+    bottom: -35px;
+    transition: bottom 75ms linear;
+    -moz-transition: bottom 75ms linear;
+    -webkit-transition: bottom 75ms linear;
 }
 
+
+/* Footer - Scale bar, About, Source Switcher
+------------------------------------------------------- */
 #scale-block {
-    display: table-cell;
     vertical-align: bottom;
     width: 250px;
     max-height: 30px;
-    float: left;
-    clear: left;
+    flex: 0 0 250px;
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
@@ -4331,13 +6824,16 @@ img.tile-removing {
 
 #info-block {
     max-height: 30px;
-    clear: right;
+    flex: 1 1 auto;
 }
 
 #scale {
     height: 30px;
     width: 100%;
 }
+[dir='rtl'] #scale {
+    transform: scaleX(-1);
+}
 
 #scale:hover {
     cursor: pointer;
@@ -4349,6 +6845,9 @@ img.tile-removing {
     fill: #ccc;
     text-anchor: start;
 }
+[dir='rtl'] #scale text {
+    transform: scaleX(-1);
+}
 
 #scale path {
     fill: none;
@@ -4363,6 +6862,12 @@ img.tile-removing {
     clear: right;
     overflow: hidden;
 }
+[dir='rtl'] #about-list {
+    text-align: left;
+    clear: left;
+    margin-left: 10px;
+    margin-right: 0;
+}
 
 #about-list li {
     float: right;
@@ -4370,12 +6875,23 @@ img.tile-removing {
     padding: 5px 0 5px 5px;
     margin-left: 5px;
 }
+[dir='rtl'] #about-list li {
+    float: left;
+    border-left: none;
+    border-right: 1px solid rgba(255,255,255,.5);
+    margin-left: 0;
+    margin-right: 5px;
+    padding: 5px 5px 5px 0;
+}
 
 #about-list li:last-child {
     border-left: 0;
     margin-left: 0;
     padding-left: 0;
 }
+[dir='rtl'] #about-list li:last-child {
+    border-right: none;
+}
 
 .source-switch a {
     padding: 2px 4px 4px 4px;
@@ -4383,7 +6899,7 @@ img.tile-removing {
 }
 .source-switch a.live {
     background: #d32232;
-    color:#fff;
+    color: #fff;
 }
 
 .feature-warning a {
@@ -4398,12 +6914,13 @@ img.tile-removing {
 }
 
 .api-status {
-    float: right;
-    clear: both;
     text-align: right;
-    width: 100%;
     padding: 0px 10px;
     color: #eee;
+    flex: 1 1 auto;
+}
+[dir='rtl'] .api-status {
+    text-align: left;
 }
 
 .api-status.offline,
@@ -4419,13 +6936,60 @@ img.tile-removing {
     color: #ccf;
 }
 
-/* Modals
+/* Notification Badges
 ------------------------------------------------------- */
+/* For an icon (e.g. new version) */
+.badge {
+    display: inline-block;
+    background: #d32232;
+    width: 21px;
+    height: 20px;
+    border-radius: 11px;
+    margin-left: 6px;
+}
+[dir='rtl'] .badge {
+    margin-left: 0;
+    margin-right: 6px;
+}
+.badge a {
+    margin-right: 5px;
+}
+[dir='rtl'] .badge a {
+    margin-right: 0;
+    margin-left: 5px;
+}
+.badge .icon {
+    vertical-align: baseline;
+    width: 11px;
+    height: 11px;
+    color: #fff;
+}
+
+/* For text (e.g. upcoming events) */
+.badge-text {
+    display: inline-block;
+    color: #fff;
+    text-align: center;
+    width: 16px;
+    height: 16px;
+    font-size: 10px;
+    font-weight: bold;
+    margin-left: 5px;
+    background: #f00;
+    border-radius: 9px;
+}
+[dir='rtl'] .badge-text {
+    margin-left: 0;
+    margin-right: 5px;
+}
 
+
+/* Modals / Prompts
+------------------------------------------------------- */
 .modal {
     top: 40px;
     display: inline-block;
-    position:absolute;
+    position: absolute;
     border-radius: 3px;
     overflow: hidden;
     left: 0;
@@ -4437,7 +7001,6 @@ img.tile-removing {
 .modal .loader {
     margin-bottom: 10px;
 }
-
 .modal .description {
     text-align: center;
 }
@@ -4451,27 +7014,28 @@ img.tile-removing {
     right: 0;
     overflow: auto;
 }
-
 .shaded:before {
     content:'';
-    background:rgba(0,0,0,0.5);
-    position:fixed;
-    left:0px; right:0px; top:0px; bottom:0px;
+    background: rgba(0,0,0,0.5);
+    position: fixed;
+    left: 0px; right: 0px; top: 0px; bottom: 0px;
 }
 
 .modal-section {
     padding: 20px;
-    border-bottom: 1px solid #CCC;
+    border-bottom: 1px solid #ccc;
 }
-
 .modal-section.header h3 {
     padding: 0;
 }
-
 .modal-section.buttons {
     text-align: center;
 }
 
+.modal-section.buttons button {
+    min-width: 130px;
+}
+
 .modal-section.buttons .action {
     display: inline-block;
     margin: 0 10px;
@@ -4479,10 +7043,17 @@ img.tile-removing {
     vertical-align: middle;
 }
 
+.save-section .buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    margin-bottom: 30px;
+}
+
 .save-section .buttons .action,
 .save-section .buttons .secondary-action {
-    display: inline-block;
-    margin: 0 20px 0 0;
+    width: 45%;
+    margin: 10px auto;
     text-align: center;
     vertical-align: middle;
 }
@@ -4491,37 +7062,34 @@ img.tile-removing {
     text-align: center;
 }
 
-.modal-actions button,
-.save-success a.button {
+.modal-actions button {
     font-weight: normal;
-    color: #7092FF;
-    border-bottom: 1px solid #CCC;
+    color: #7092ff;
+    border-bottom: 1px solid #ccc;
     border-radius: 0;
     height: 160px;
     text-align: center;
     display: inline-block;
 }
-
-.modal-actions button:hover
-.save-success a.button:hover {
+.modal-actions button:hover {
     background-color: #ececec;
 }
 
-.modal-actions button:before,
-.save-success a.button.osm:before,
-.walkthrough a:before {
-    display: block;
-    content: '';
+.logo-small {
+    height: 40px;
+    width: 40px;
+    margin: auto;
+}
+
+.logo {
     height: 100px;
     width: 100%;
     max-width: 100px;
     margin: auto;
-    margin-bottom: 10px;
-    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -200px -460px;
 }
 
-.modal-actions :first-child {
-    border-right: 1px solid #CCC;
+.modal-actions > :first-child {
+    border-right: 1px solid #ccc;
 }
 
 .modal-section:last-child {
@@ -4530,57 +7098,236 @@ img.tile-removing {
 
 /* Restore Modal
 ------------------------------------------------------- */
+.modal-actions .logo-restore {
+    color: #7092ff;
+}
+.modal-actions .logo-reset {
+    color: #e06c5e;
+}
+
+/* Success Screen / Community Index
+------------------------------------------------------- */
+.save-success.body {
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
 
-.modal-actions .restore:before {
-    background-position: -500px -460px;
+.save-success .link-out {
+    margin: 0px 5px;
+    white-space: nowrap;
 }
 
-.modal-actions .reset:before {
-    background-position: -600px -460px;
+.save-summary,
+.save-communityLinks {
+    padding: 0px 20px 15px 20px;
 }
 
-/* Success Modal
-------------------------------------------------------- */
+.save-communityLinks {
+    border-top: 1px solid #ccc;
+}
 
+.save-success table,
 .save-success p {
-    padding: 15px 15px 0 15px;
+    margin-top: 15px;
+}
+.save-success h3 {
+    font-size: 14px;
+    margin-top: 15px;
+    line-height: 1.5;
+    padding-bottom: 0;
 }
-.save-success a.details {
-  padding-left: 15px;
+.save-success td {
+    vertical-align: top;
+}
+.save-success td.cell-icon {
+    width: 40px;
+}
+.save-success td.cell-detail {
+    padding: 0 10px;
 }
-.save-success .button {
-    padding-top: 15px;
+.save-success td.community-detail {
+    padding-bottom: 15px;
 }
 
-.save-success a.button.social {
-    height: auto;
+.summary-view-on-osm,
+.community-name {
+    font-size: 14px;
+    font-weight: bold;
+}
+.community-languages {
+    margin-top: 5px;
+    font-style: italic;
+}
+.community-languages:only-child {
+    margin-top: 0;
 }
 
-.save-success .icon.social {
-    height: 80px;
-    width: 80px;
-    color: #7092FF;
+.community-detail a.hide-toggle,
+.community-detail a:visited.hide-toggle {
+    font-size: 12px;
+    font-weight: normal;
+    padding-bottom: 0;
+}
+.community-detail .hide-toggle svg.icon.pre-text {
+    width: 12px;
+    height: 15px;
+}
+
+.community-events {
+    margin-top: 5px;
+}
+
+.community-event,
+.community-more {
+    background-color: #efefef;
+    padding: 8px;
+    border-radius: 4px;
+    margin-bottom: 5px;
 }
 
-.save-success .button.osm:before {
-    background-position: -200px -460px;
+.community-event-name {
+    font-size: 14px;
+    font-weight: bold;
+}
+.community-event-when {
+    font-weight: bold;
+}
+
+.community-missing {
+    padding: 10px;
+    text-align: center;
 }
 
+
 /* Splash Modal
 ------------------------------------------------------- */
+.modal-actions .logo-walkthrough,
+.modal-actions .logo-features {
+    color: #7092ff;
+}
+
+
+/* Shortcuts Modal
+------------------------------------------------------- */
+.modal-shortcuts {
+    width: 90%;
+    max-width: 950px;
+}
+
+.modal-shortcuts .modal-section:last-child {
+    padding-top: 10px;
+    min-height: 275px;
+}
+
+.modal-shortcuts .tabs-bar {
+    text-align: center;
+    padding-bottom: 5px;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+.modal-shortcuts .tab {
+    display: inline-block;
+    padding: 5px 10px;
+    margin: 0 5px;
+    cursor: pointer;
+    color: #666;
+}
+.modal-shortcuts .tab.active {
+    color: #7092ff;
+    border-bottom: 2px solid;
+}
+.modal-shortcuts .tab:hover {
+    color: #597be7;
+    background-color: #efefef;
+}
+
+.modal-shortcuts .shortcut-tab {
+    display: flex;
+    flex-flow: row wrap;
+}
+
+.modal-shortcuts .shortcut-column {
+    flex: 1 1 50%;
+    width: 50%;
+}
+
+.modal-shortcuts .shortcut-tab-tools .shortcut-column {
+    flex: 1 1 100%;
+    width: 100%;
+}
+
+.modal-shortcuts td {
+    padding-bottom: 5px;
+}
+
+.modal-shortcuts .shortcut-section {
+    padding: 20px 0 10px 0;
+}
+
+.modal-shortcuts .shortcut-keys {
+    padding: 0 10px;
+    color: #767676;
+    text-align: right;
+}
+[dir='rtl'] .modal-shortcuts .shortcut-keys {
+    text-align: left;
+}
+
+.modal-shortcuts .shortcut-keys kbd {
+    display: inline-block;
+    text-align: center;
+    padding: 3px 5px;
+    font-size: 11px;
+    line-height: 12px;
+    min-width: 12px;
+    color: #555;
+    vertical-align: baseline;
+    background-color: #fcfcfc;
+    border: solid 1px #ccc;
+    margin: 0 2px;
+    border-bottom-color: #bbb;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #bbb;
+}
 
-.modal-actions .walkthrough:before,
-.walkthrough a:before {
-    background-position: -300px -460px;
+svg.mouseclick use.left {
+    fill: rgba(112, 146, 255, 1);
+    color: rgba(112, 146, 255, 0);
+}
+svg.mouseclick use.right {
+    fill: rgba(112, 146, 255, 0);
+    color: rgba(112, 146, 255, 1);
 }
 
-.modal-actions .start:before {
-    background-position: -400px -460px;
+.modal-shortcuts .shortcut-keys .gesture {
+    color: #333;
+    padding: 3px;
 }
 
-/* Commit Modal
+
+/* Settings Modals
 ------------------------------------------------------- */
+.settings-modal textarea {
+    height: 70px;
+    width: 100%;
+}
+
+.settings-custom-background .instructions-template {
+    margin-bottom: 20px;
+}
+
+.settings-custom-data .instructions-url {
+    margin-bottom: 10px;
+}
+.settings-custom-data .field-file,
+.settings-custom-data .instructions-template {
+    margin-bottom: 20px;
+}
+
 
+/* Save Mode
+------------------------------------------------------- */
 .mode-save a.user-info {
     display: inline-block;
 }
@@ -4599,32 +7346,53 @@ img.tile-removing {
     float: left;
     height: 12px;
     min-width: 12px;
-    font-size:12px;
+    font-size: 12px;
     line-height: 12px;
-    border-radius:24px;
-    padding:5px;
-    background:#7092ff;
-    color:#fff;
+    border-radius: 24px;
+    padding: 5px;
+    background: #7092ff;
+    color: #fff;
+}
+
+.note-save .field-warning,
+.mode-save .field-warning {
+    background: #ffb;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.note-save .field-warning:empty,
+.mode-save .field-warning:empty {
+    display: none;
 }
 
+.mode-save .field-warning,
+.mode-save .changeset-info,
+.mode-save .request-review,
 .mode-save .commit-info {
     margin-bottom: 10px;
 }
 
+.mode-save .request-review label {
+    cursor: pointer;
+}
+
 .mode-save .changeset-list {
-    border:1px solid #ccc;
+    border: 1px solid #ccc;
     border-radius: 4px;
-    background:#fff;
+    background: #fff;
+    margin-bottom: 10px;
 }
 
 .mode-save .warning-section .changeset-list button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
 }
 
 .mode-save .changeset-list li {
     position: relative;
-    border-top:1px solid #ccc;
-    padding:5px 10px;
+    border-top: 1px solid #ccc;
+    padding: 5px 10px;
     cursor: pointer;
 }
 
@@ -4637,12 +7405,12 @@ img.tile-removing {
 }
 
 .changeset-list li span.count {
-    font-size:10px;
-    color:#555;
+    font-size: 10px;
+    color: #555;
 }
 
 .mode-save .commit-section .changeset-list button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
 }
 
 .changeset-list li span.count:before { content: '('; }
@@ -4651,9 +7419,9 @@ img.tile-removing {
 
 .changeset-list li:first-child { border-top: 0;}
 
+
 /* Conflict resolution
 ------------------------------------------------------- */
-
 .conflicts-help {
     padding: 20px;
     background-color: #ffffbb;
@@ -4701,70 +7469,71 @@ img.tile-removing {
     height: 30px;
 }
 
-/* Notices
-------------------------------------------------------- */
 
+/* Notices (Zoom in to Edit)
+------------------------------------------------------- */
 .notice {
     position: absolute;
-    top: 0;
-    bottom: 0;
+    top: 45px;
     left: 0;
     right: 0;
     text-align: center;
-    background: #fff;
 }
 
 .notice .zoom-to {
     margin: auto;
-    width: 80%;
-    height: 100px;
-    border-radius: 5px;
-    line-height: 40px;
-    color: #000;
-    opacity: 0.9;
+    width: 300px;
+    height: 70px;
+    font-size: 150%;
+    border-radius: 8px;
 }
 
 .notice .zoom-to:hover {
-    background: #d8e1ff;
+    background: rgba(0,0,0,0.6);
 }
 
 .notice .zoom-to .icon {
-    margin-top:10px;
-    margin-right:10px;
+    width: 30px;
+    height: 30px;
+    vertical-align: middle;
+    margin-right: 10px;
+}
+[dir='rtl'] .notice .zoom-to .icon {
+    margin-left: 10px;
+    margin-right: 0;
 }
 
+
 /* Tooltips
 ------------------------------------------------------- */
-
 .tooltip {
     position: absolute;
     display: none;
-    color:#333;
-    text-align: left;
+    color: #333;
     font-size: 12px;
+    white-space: initial;
+}
+.tooltip:not(.curtain-tooltip) {
+    pointer-events: none;
 }
-
 .tooltip.in {
-    opacity: 0.8;
+    opacity: 0.9;
     z-index: 1030;
     height: auto;
     display: block;
 }
-
 .tooltip.top {
     margin-top: -20px;
     text-align: center;
 }
-
 .tooltip.right {
     margin-left: 20px;
+    text-align: left;
 }
-
 .tooltip.bottom {
     margin-top: 20px;
     text-align: center;
 }
-
 .tooltip.left {
     margin-left: -20px;
     text-align: right;
@@ -4777,7 +7546,7 @@ img.tile-removing {
     min-width: 80px;
     padding: 10px;
     font-weight: normal;
-    background-color: white;
+    background-color: #fff;
 }
 
 .tail {
@@ -4789,7 +7558,6 @@ img.tile-removing {
     position: absolute;
     background: transparent;
 }
-
 .tail::after {
     content: "";
     position: absolute;
@@ -4800,14 +7568,14 @@ img.tile-removing {
     top: 50%;
     right: -5px;
     margin-top: -5px;
-    border-left-color: white;
+    border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }
 
 .tail div {
     border-radius: 3px;
     padding: 10px;
-    background: white;
+    background: #fff;
     position: absolute;
     top: 180px;
     left: 0;
@@ -4825,7 +7593,7 @@ img.tile-removing {
     top: 50%;
     left: -5px;
     margin-top: -5px;
-    border-right-color: white;
+    border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
 
@@ -4836,649 +7604,414 @@ img.tile-removing {
     border-color: transparent;
     border-style: solid;
 }
-
 .tooltip.top .tooltip-arrow {
     bottom: -5px;
     left: 50%;
     margin-left: -5px;
-    border-top-color: white;
+    border-top-color: #fff;
     border-width: 5px 5px 0;
 }
-
 .tooltip.right .tooltip-arrow {
     top: 50%;
     left: -5px;
     margin-top: -5px;
-    border-right-color: white;
+    border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
-
 .tooltip.left .tooltip-arrow {
     top: 50%;
-    right: -5px;
-    margin-top: -5px;
-    border-left-color: white;
-    border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-    top: -5px;
-    left: 50%;
-    margin-left: -5px;
-    border-bottom-color: white;
-    border-width: 0 5px 5px;
-}
-
-.keyhint-wrap {
-    background: #F6F6F6;
-    padding: 10px;
-    margin: 10px -10px -10px;
-    border-radius: 0 0 3px 3px;
-}
-
-.tooltip-inner .keyhint {
-    font-weight: bold;
-}
-
-/* Exceptions for tooltip layouts */
-
-/* make tooltips in panels dark */
-.map-overlay .tooltip.top .tooltip-arrow,
-.entity-editor-pane .tooltip.top .tooltip-arrow,
-.warning-section .tooltip.top .tooltip-arrow {
-    border-top-color: #000;
-}
-
-.map-overlay .tooltip.bottom .tooltip-arrow,
-.entity-editor-pane .tooltip.bottom .tooltip-arrow,
-.warning-section .tooltip.bottom .tooltip-arrow {
-    border-bottom-color: #000;
-}
-
-.map-overlay .tooltip.left .tooltip-arrow,
-.entity-editor-pane .tooltip.left .tooltip-arrow,
-.warning-section .tooltip.left .tooltip-arrow {
-    border-left-color: #000;
-}
-
-.map-overlay .tooltip.right .tooltip-arrow,
-.entity-editor-pane .tooltip.right .tooltip-arrow,
-.warning-section .tooltip.right .tooltip-arrow {
-    border-right-color: #000;
-}
-
-.map-overlay .tooltip-inner,
-.map-overlay .keyhint-wrap,
-.entity-editor-pane .tooltip-inner,
-.warning-section .tooltip-inner {
-    background: #000;
-    color: #ccc;
-}
-/* commit warning tooltips need to be closer */
-.warning-section .tooltip.top {
-    margin-top: -5px;
-}
-
-/* Uncramp map-control tooltips */
-.map-control .tooltip {
-    min-width: 160px;
-}
-/* Move over tooltips that are near the edge of screen */
-.add-point .tooltip {
-    left: 33.3333% !important;
-}
-
-.curtain-tooltip.intro-points-add .tooltip-arrow,
-.add-point .tooltip .tooltip-arrow {
-    left: 60px;
-}
-
-.radial-menu-tooltip {
-    opacity: 0.8;
-    display: none;
-    position: absolute;
-    width: 200px;
-}
-
-.radial-menu-background {
-    fill: none;
-    stroke: black;
-    stroke-opacity: 0.5;
-}
-
-.radial-menu-item circle {
-    fill: #eee;
-}
-
-.radial-menu-item circle:active,
-.radial-menu-item circle:hover {
-    fill: #fff;
-}
-
-.radial-menu-item.disabled circle {
-    cursor: auto;
-    fill: rgba(255,255,255,.5);
-}
-
-.radial-menu-item use {
-    fill: #222;
-    color: #79f;
-}
-
-.radial-menu-item.disabled use {
-    fill: rgba(32,32,32,.5);
-    color: rgba(40,40,40,.5);
-}
-
-.lasso-path {
-    fill-opacity:0.3;
-    stroke: #fff;
-    stroke-width: 1;
-    stroke-opacity: 1;
-    stroke-dasharray: 5, 5;
-}
-
-/* Media Queries
-------------------------------------------------------- */
-
-@media only screen and (max-width: 840px) {
-    /* override hide for save button */
-    #bar .save .label { display: block;}
-}
-
-@media screen and (max-width: 1200px) {
-    .user-list { display: none !important; }
-}
-
-@media screen and (max-width: 1000px) {
-    #userLink { display: none !important; }
-}
-
-@media screen and (max-width: 900px) {
-    #scale-block { display: none !important; }
-}
-
-
-/* Scrollbars
- ----------------------------------------------------- */
-
-::-webkit-scrollbar {
-    height: 20px;
-    overflow: visible;
-    width: 10px;
-    background: white;
-    border-left: 1px solid #DDD;
-}
-
-::-webkit-scrollbar-track {
-    background-clip: padding-box;
-    border: solid transparent;
-    border-width: 0;
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: rgba(0,0,0,.2);
-    background-clip: padding-box;
-    border: solid transparent;
-    border-width: 3px 3px 3px 4px;
-    border-radius: 6px;
-}
-::-webkit-scrollbar-track:hover,
-::-webkit-scrollbar-track:active {
-    background-color: rgba(0,0,0,.05);
-}
-
-/* Intro walkthrough
- ----------------------------------------------------- */
-
-.curtain-darkness {
-    pointer-events: all;
-    fill-opacity: 0.7;
-    fill: #222;
-    fill-rule: evenodd;
-}
-
-.intro-nav-wrap {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 30px;
-    padding: 10px;
-    z-index: 1001;
-}
-
-.intro-nav-wrap button.step {
-    width: 20%;
-}
-
-.intro-nav-wrap button.step.finished {
-    background: #8cd05f;
-}
-
-.intro-nav-wrap button.step .status {
-    margin-left: 3px;
-    display: none;
-}
-
-.intro-nav-wrap button.step.finished .status {
-    display: inline-block;
-}
-
-
-.curtain-tooltip .tooltip-inner {
-    text-align: left;
-    padding: 20px;
-}
-
-.curtain-tooltip .tooltip-inner {
-    font-size: 15px;
-}
-
-.curtain-tooltip .tooltip-inner .bold {
-    font-weight: bold;
-    display: block;
-    border-top: 1px solid #CCC;
-    margin-top: 10px;
-    margin-left: -20px;
-    margin-right: -20px;
-    padding: 10px 20px 0 20px;
-}
-
-.curtain-tooltip .tooltip-inner .bold:only-child {
-    border: 0;
-    padding: 0;
-    margin: 0;
-}
-
-.curtain-tooltip.intro-points-describe {
-    top: 133px !important;
-}
-
-/* Tooltip illustrations */
-
-.intro-points-add .tooltip-inner::before,
-.intro-areas-add .tooltip-inner::before,
-.intro-lines-add .tooltip-inner::before {
-    margin-left: -20px;
-    display: block;
-    content: "";
-    height: 80px;
-    width: 200px;
-    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat 0 -320px;
+    right: -5px;
+    margin-top: -5px;
+    border-left-color: #fff;
+    border-width: 5px 0 5px 5px;
 }
-
-.intro-areas-add .tooltip-inner::before {
-    background-position: 0 -400px;
+.tooltip.bottom .tooltip-arrow {
+    top: -5px;
+    left: 50%;
+    margin-left: -5px;
+    border-bottom-color: #fff;
+    border-width: 0 5px 5px;
 }
 
-.intro-lines-add .tooltip-inner::before {
-    background-position: 0 -480px;
+.tooltip-heading {
+    font-weight: bold;
+    background: #f6f6f6;
+    padding: 10px;
+    margin: -10px -10px 10px -10px;
+    border-radius: 3px 3px 0 0;
+    font-size: 14px;
 }
 
-.huge-modal-button {
-    width: 100%;
-    height: auto;
-    padding: 20px;
+.keyhint-wrap {
+    background: #f6f6f6;
+    padding: 10px;
+    margin: 10px -10px -10px -10px;
+    border-radius: 0 0 3px 3px;
 }
-
-.huge-modal-button .illustration {
-    height: 100px;
-    width: 100px;
-    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px;
-    margin: auto;
+.tooltip-inner .keyhint {
+    font-weight: bold;
+    margin-left: 5px;
 }
 
-.mapillary-wrap {
-    position: absolute;
-    bottom: 30px;
-    width: 330px;
-    height: 250px;
-    padding: 5px;
-    background-color: #fff;
+[dir='rtl'] .tooltip-inner .keyhint {
+    margin-left: 0;
+    margin-right: 5px;
 }
 
-.mapillary-wrap.hidden {
-    visibility: hidden;
+/* dark tooltips for sidebar / panels */
+.map-pane .tooltip.top .tooltip-arrow,
+#sidebar .tooltip.top .tooltip-arrow {
+    border-top-color: #000;
 }
-
-.mapillary-wrap button.thumb-hide {
-    border-radius: 0;
-    padding: 5px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 500;
+.map-pane .tooltip.bottom .tooltip-arrow,
+#sidebar .tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #000;
 }
-
-.mly-wrapper {
-    visibility: hidden;
-    width: 100%;
-    height: 100%;
+.map-pane .tooltip.left .tooltip-arrow,
+#sidebar .tooltip.left .tooltip-arrow {
+    border-left-color: #000;
 }
-
-.mly-wrapper.active {
-    visibility: visible;
+.map-pane .tooltip.right .tooltip-arrow,
+#sidebar .tooltip.right .tooltip-arrow {
+    border-right-color: #000;
+}
+.map-pane .tooltip-inner,
+.map-pane .tooltip-heading,
+.map-pane .keyhint-wrap,
+#sidebar .tooltip-inner,
+#sidebar .tooltip-heading,
+#sidebar .keyhint-wrap {
+    background: #000;
+    color: #ccc;
 }
 
-/* Right-to-left localization settings */
+/* Exceptions for tooltip layouts */
 
-[dir='rtl'] #sidebar {
-  float: right;
+/* commit warning tooltips need to be closer */
+.warning-section .tooltip.top {
+    margin-top: -5px;
 }
 
-[dir='rtl'] #sidebar .search-header .icon {
-  left: auto;
-  right: 10px;
+/* Uncramp map-control tooltips */
+.map-control .tooltip {
+    min-width: 160px;
 }
-
-/* header */
-[dir='rtl'] .header h3 {
-  text-align: right;
-  padding: 20px 40px 20px 20px;
+.map-control .shortcuts .tooltip {
+    max-width: 160px;
 }
 
-[dir='rtl'] .entity-editor-pane .header button.preset-choose {
-  left: auto;
-  right: 0;
+/* Move over tooltips that are near the edge of screen */
+button.sidebar-toggle .tooltip .tooltip-arrow {
+    left: 36px;
 }
-
-[dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose {
-  left: 0;
-  right: auto;
+[dir='rtl'] button.sidebar-toggle .tooltip .tooltip-arrow {
+    left: auto;
+    right: 36px;
 }
 
-[dir='rtl'] .preset-icon-fill-area {
-  left: auto;
-  right: 10px;
+li:first-of-type .badge .tooltip,
+li.hide + li.version .badge .tooltip {
+    left: auto !important;
+    right: 5px !important;
 }
-
-[dir='rtl'] .map-data-control .layer-list button, [dir='rtl'] .background-control .layer-list button {
-  float: left;
-  border-left: none;
-  border-right: 1px solid #CCC;
+[dir='rtl'] li:first-of-type .badge .tooltip,
+[dir='rtl'] li.hide + li.version .badge .tooltip {
+    left: 5px !important;
+    right: auto !important;
 }
-
-[dir='rtl'] .map-data-control .layer-list button:first-of-type, [dir='rtl'] .background-control .layer-list button:first-of-type {
-  border-radius: 3px 0 0 3px;
+li:first-of-type .badge .tooltip .tooltip-arrow,
+li.hide + li.version .badge .tooltip .tooltip-arrow {
+    right: 15px !important;
+    left: auto !important;
 }
-
-/* search */
-[dir='rtl'] .feature-list-item .label {
-  text-align: right;
+[dir='rtl'] li:first-of-type .badge .tooltip .tooltip-arrow,
+[dir='rtl'] li.hide + li.version .badge .tooltip .tooltip-arrow {
+    left: 15px !important;
+    right: auto !important;
 }
 
-[dir='rtl'] .feature-list-item .entity-name {
-  padding-left: 0;
-  padding-right: 10px;
-}
 
-/* preset form */
-[dir='rtl'] .form-label {
-  padding: 5px 10px 5px 0;
+/* Contextual Radial Menu (deprecated)
+------------------------------------------------------- */
+.radial-menu-tooltip {
+    opacity: 0.8;
+    display: none;
+    position: absolute;
+    width: 200px;
 }
 
-[dir='rtl'] .form-label button {
-  border-left: none;
-  border-right: 1px solid #CCC;
+.radial-menu-background {
+    fill: none;
+    stroke: black;
+    stroke-opacity: 0.5;
 }
 
-[dir='rtl'] .more-fields label {
-  padding: 5px 0 5px 10px;
+.radial-menu-item circle {
+    fill: #eee;
 }
 
-[dir='rtl'] .form-label-button-wrap {
-  text-align: left;
+.radial-menu-item circle:active,
+.radial-menu-item circle:hover {
+    fill: #fff;
 }
 
-[dir='rtl'] button.minor {
-  left: 0;
-  right: auto;
+.radial-menu-item.disabled circle {
+    cursor: auto;
+    fill: rgba(255,255,255,.5);
 }
 
-[dir='rtl'] .form-field .localized-main {
-  padding-left: 10%;
-  padding-right: 10px;
+.radial-menu-item use {
+    fill: #222;
+    color: #79f;
 }
 
-[dir='rtl'] .combobox-caret {
-  margin-left: 0;
-  margin-right: -30px;
+.radial-menu-item.disabled use {
+    fill: rgba(32,32,32,.5);
+    color: rgba(40,40,40,.5);
 }
 
-[dir='rtl'] .form-field .button-input-action {
-  margin-left: 0;
-  margin-right: -10%;
-}
 
-[dir='rtl'] .icon.pre-text {
-  margin-left: 3px;
-  margin-right: 0;
+/* Contextual Edit Menu
+------------------------------------------------------- */
+.edit-menu-tooltip {
+    display: none;
+    position: absolute;
+    width: 200px;
 }
 
-[dir='rtl'] .notice .zoom-to .icon {
-  margin-left: 10px;
-  margin-right: 0;
+.edit-menu-background {
+    fill: #eee;
 }
 
-[dir='rtl'] .preset-list-button .label {
-  text-align: right;
-  left: 0;
-  right: 60px;
-  border-left: none;
-  border-right: 1px solid rgba(0, 0, 0, .1);
-  border-radius: 3px 0 0 3px;
+.edit-menu-item rect {
+    fill: #eee;
+    cursor: default;
 }
 
-[dir='rtl'] .preset-icon-frame {
-  left: auto;
-  right: 7px;
+.edit-menu-item rect:active,
+.edit-menu-item rect:hover {
+    fill: #ccc;
 }
 
-[dir='rtl'] .preset-list-item button.tag-reference-button {
-  left: 0;
-  right: auto;
-  border-radius: 3px 0 0 3px;
+.edit-menu-item.disabled rect {
+    cursor: not-allowed;
 }
-
-[dir='rtl'] .preset-list-button-wrap .preset-icon {
-  left: auto;
-  right: auto;
+.edit-menu-item.disabled rect:hover {
+    cursor: not-allowed;
+    fill: #eee;
 }
 
-[dir='rtl'] .preset-list-button-wrap .preset-icon-32 {
-  right: 15px;
+.edit-menu-item use {
+    fill: #222;
+    color: #79f;
+    pointer-events: none;
 }
-
-[dir='rtl'] .form-field .maxspeed-unit {
-  border-radius: 0 0 0 4px;
+.edit-menu-item.disabled use {
+    fill: rgba(32,32,32,.2);
+    color: rgba(40,40,40,.2);
 }
 
-[dir='rtl'] input[type="checkbox"], [dir='rtl'] input[type="radio"] {
-  float: right;
-  margin-left: 5px;
-  margin-right: 0;
-}
 
-[dir='rtl'] .preset-input-wrap .col6 {
-  float: right;
+/* Lasso
+------------------------------------------------------- */
+.lasso-path {
+    fill-opacity: 0.3;
+    stroke: #fff;
+    stroke-width: 1;
+    stroke-opacity: 1;
+    stroke-dasharray: 5, 5;
 }
 
-/* tags form */
-[dir='rtl'] .tag-row .key-wrap,
-[dir='rtl'] .tag-row .input-wrap-position {
-  float: right;
-}
 
-[dir='rtl'] .tag-row input {
-  border-left: none;
-  border-right: 1px solid #CCC;
+/* Scrollbars
+ ----------------------------------------------------- */
+::-webkit-scrollbar {
+    height: 20px;
+    overflow: visible;
+    width: 10px;
+    background: #fff;
+    border-left: 1px solid #DDD;
 }
 
-[dir='rtl'] .tag-row:first-child input.key {
-  border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+::-webkit-scrollbar-track {
+    background-clip: padding-box;
+    border: solid transparent;
+    border-width: 0;
 }
 
-[dir='rtl'] .tag-row button {
-  left: 10%;
-  border-left-width: 1px;
+::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,.2);
+    background-clip: padding-box;
+    border: solid transparent;
+    border-width: 3px 3px 3px 4px;
+    border-radius: 6px;
 }
-
-[dir='rtl'] .tag-row .tag-reference-button {
-  left: auto;
-  right: auto;
-  margin-right: 35px;
-  border-left-width: 1px;
-  border-right-width: 0;
+::-webkit-scrollbar-track:hover,
+::-webkit-scrollbar-track:active {
+    background-color: rgba(0,0,0,.05);
 }
 
-[dir='rtl'] .tag-row:first-child .tag-reference-button {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 0;
-}
 
-[dir='rtl'] .tag-row:last-child .tag-reference-button {
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 0;
+/* Intro walkthrough
+ ----------------------------------------------------- */
+.curtain-darkness {
+    pointer-events: all;
+    fill-opacity: 0.7;
+    fill: #222;
+    fill-rule: evenodd;
 }
 
-/* map control buttons */
-[dir='rtl'] .map-controls {
-  left: 0;
-  right: auto;
+.intro-nav-wrap {
+    display: flex;
+    flex-direction: row;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 30px;
+    padding: 10px;
+    z-index: 1001;
 }
 
-[dir='rtl'] .background-control button,
-[dir='rtl'] .zoombuttons button.zoom-in {
-  border-radius: 0 4px 0 0;
+.intro-nav-wrap .intro-nav-wrap-logo {
+    flex: 0 0 auto;
+    height: 40px;
+    width: 40px;
+    color: #fff;
+    margin: 0px 20px;
+    vertical-align: middle;
 }
 
-[dir='rtl'] .help-control button,
-[dir='rtl'] .geolocate-control button {
-  border-radius: 0 0 4px 0;
+.intro-nav-wrap .joined {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: row;
 }
 
-[dir='rtl'] .list-item-gpx-browse svg {
-  transform: rotateY(180deg);
+.intro-nav-wrap button.chapter {
+    flex: 1 1 100%;
+    padding: 0px 20px;
 }
 
-/* map control button overlays */
-[dir='rtl'] .map-overlay {
-  padding: 20px 20px 20px 50px;
-  left: 0;
-  right: auto !important;
+.intro-nav-wrap button.chapter.next {
+    animation-duration: 1s;
+    animation-name: pulse;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
 }
-
-[dir='rtl'] .opacity-options {
-  left: 50px;
-  right: auto;
+@keyframes pulse {
+    from  { background: #7092ff; }
+    to    { background: #c6d4ff; }
 }
 
-[dir='rtl'] .hide-toggle {
-  padding-left: 0;
-  padding-right: 12px;
+.intro-nav-wrap button.chapter.finished {
+    background: #8cd05f;
 }
 
-[dir='rtl'] .hide-toggle:before {
-  left: auto;
-  right: 0;
-  border-left: none;
-  border-right: 8px solid #7092ff;
+.intro-nav-wrap button.chapter .status {
+    display: none;
 }
 
-[dir='rtl'] .hide-toggle.expanded:before {
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
+.intro-nav-wrap button.chapter.finished .status {
+    display: inline-block;
 }
 
-/* navbar */
-[dir='rtl'] #bar .spacer,
-[dir='rtl'] #bar .button-wrap,
-[dir='rtl'] #bar .button-wrap button {
-  float: right;
+.curtain-tooltip.tooltip.in {
+    opacity: 1;
 }
-
-[dir='rtl'] .add-point .tooltip {
-  left: inherit !important;
+.curtain-tooltip.tooltip {
+    text-align: left;
 }
-
-[dir='rtl'] .button-wrap:last-of-type {
-  padding-left: 0;
-  padding-right: 10px;
+[dir='rtl'] .curtain-tooltip.tooltip {
+    text-align: right;
 }
 
-[dir='rtl'] button.save.has-count .count {
-  margin-left: auto;
-  margin-right: 8%;
+.curtain-tooltip .tooltip-inner {
+    font-size: 15px;
+    position: relative;
+    padding: 20px;
 }
 
-[dir='rtl'] button.save.has-count .count::before {
-  border-left: 6px solid rgba(255,255,255,.5);
-  border-right: none;
-  left: auto;
-  right: -6px;
+.curtain-tooltip .tooltip-inner .button-section,
+.curtain-tooltip .tooltip-inner .instruction {
+    font-weight: bold;
+    display: block;
+    border-top: 1px solid #ccc;
+    margin-top: 10px;
+    margin-left: -20px;
+    margin-right: -20px;
+    padding: 10px 20px 0 20px;
 }
 
-[dir='rtl'] .joined button {
-  border-left: 1px solid rgba(0,0,0,.5);
-  border-right: none;
+[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 {
+    float: right;
 }
 
-[dir='rtl'] .joined button:first-child {
-  border-radius: 0 4px 4px 0;
+.curtain-tooltip .tooltip-inner .instruction:only-child {
+    border: 0;
+    padding: 0;
+    margin: 0;
 }
 
-[dir='rtl'] .joined button:last-child {
-  border-radius: 4px 0 0 4px;
+.curtain-tooltip .tooltip-inner .icon.pre-text {
+    vertical-align: text-top;
+    margin-right: 0;
+    margin-left: 0;
+    display: inline-block;
 }
 
-/* footer */
-[dir='rtl'] #scale-block {
-  float: right;
-  clear: right;
+.curtain-tooltip.intro-points-describe ,
+.curtain-tooltip.intro-lines-name_road {
+    top: 133px !important;
 }
 
-[dir='rtl'] #info-block {
-  clear: left;
+.tooltip-illustration {
+    height: 80px;
+    width: 200px;
+    margin-left: -20px;
+    margin-top: -10px;
 }
-
-[dir='rtl'] #about-list {
-  text-align: left;
-  clear: left;
-  margin-left: 10px;
-  margin-right: 0;
+[dir='rtl'] .tooltip-illustration {
+    margin-left: auto;
+    margin-right: -20px;
 }
 
-[dir='rtl'] #about-list li {
-  float: left;
-  border-left: none;
-  border-right: 1px solid rgba(255,255,255,.5);
-  margin-left: 0;
-  margin-right: 5px;
-  padding: 5px 5px 5px 0;
+.curtain-tooltip.intro-mouse {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
-[dir='rtl'] #about-list li:last-child {
-  border-right: none;
+.curtain-tooltip.intro-mouse .counter {
+    position: absolute;
+    display: block;
+    top: 50px;
+    width: 100%;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    z-index: 1003;
 }
 
-[dir='rtl'] #scale text {
-  text-anchor: end;
+.curtain-tooltip.intro-mouse .tooltip-illustration use {
+    fill: rgba(112, 146, 255, 0);
+    color: rgba(112, 146, 255, 0);
 }
-
-/* increment / decrement control - code by Naoufel Razouane */
-
-[dir='rtl'] .spin-control{
-  margin-left: 0;
-  margin-right: -20%;
+.curtain-tooltip.intro-mouse.leftclick .tooltip-illustration use {
+    fill: rgba(112, 146, 255, 1);
 }
-[dir='rtl'] .spin-control button{
-  border-left: 0;
-  border-right: 1px solid #CCC;
+.curtain-tooltip.intro-mouse.rightclick .tooltip-illustration use {
+    color: rgba(112, 146, 255, 1);
 }
-[dir='rtl'] .spin-control button.decrement{
-  border-bottom-right-radius: 0;
+
+.huge-modal-button {
+    width: 100%;
+    height: auto;
+    padding: 20px;
 }
-[dir='rtl'] .spin-control button.increment{
-  border-bottom-left-radius: 3px;
+
+.huge-modal-button .illustration {
+    height: 100px;
+    width: 100px;
+    color: #7092ff;
 }