X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e418074b2ae7598a5b84c5b2fbabe57960ab0d00..d6a2515cb0c55eb69c8bb1c872e13b5f59ea64b5:/vendor/assets/iD/iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 05d0cbe16..8fed86e62 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -162,10 +162,19 @@ input::-moz-focus-inner {
     clear: both;
 }
 /* base styles */
-.layer-osm path:not(.oneway-marker-path) {                /* IE/Edge needs :not(.oneway) */
+.layer-osm path {
     fill: none;
 }
-.layer-osm path.viewfield-marker-path {                   /* IE/Edge rule for <use> marker style */
+
+/* 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; }
+
+/* IE/Edge rule for <use> marker style */
+.layer-osm path.viewfield-marker-path {
     fill: #333;
     fill-opacity: 0.75;
     stroke: #fff;
@@ -185,7 +194,10 @@ input::-moz-focus-inner {
 
 
 /* No interactivity except what we specifically allow */
-.layer-osm * {
+.data-layer.osm *,
+.data-layer.notes *,
+.data-layer.keepRight *,
+.data-layer.improveOSM * {
     pointer-events: none;
 }
 
@@ -196,7 +208,10 @@ input::-moz-focus-inner {
 
 /* `.target` objects are interactive */
 /* They can be picked up, clicked, hovered, or things can connect to them */
-.node.target {
+.qa_error.target,
+.note.target,
+.node.target,
+.turn .target {
     pointer-events: fill;
     fill-opacity: 0.8;
     fill: currentColor;
@@ -213,6 +228,7 @@ input::-moz-focus-inner {
     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 {
@@ -227,9 +243,10 @@ input::-moz-focus-inner {
     pointer-events: none !important;
 }
 
+/* points, notes & QA */
 
-/* points & notes */
-
+/* points, notes, markers */
+g.qa_error .stroke,
 g.note .stroke {
     stroke: #222;
     stroke-width: 1;
@@ -237,6 +254,7 @@ g.note .stroke {
     opacity: 0.6;
 }
 
+g.qa_error.active .stroke,
 g.note.active .stroke {
     stroke: #222;
     stroke-width: 1;
@@ -250,6 +268,7 @@ g.point .stroke {
     fill: #fff;
 }
 
+g.qa_error .shadow,
 g.point .shadow,
 g.note .shadow {
     fill: none;
@@ -258,13 +277,14 @@ g.note .shadow {
     stroke-opacity: 0;
 }
 
-g.note.related:not(.selected) .shadow,
+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;
@@ -281,21 +301,17 @@ g.point ellipse.stroke {
 
 
 /* vertices and midpoints */
-
 g.vertex .fill {
     fill: #000;
 }
-
 g.vertex .stroke {
     stroke: #666;
     stroke-width: 1;
     fill: white;
 }
-
 g.vertex.shared .stroke {
     fill: #bbb;
 }
-
 g.midpoint .fill {
     fill: #eee;
     stroke: #444;
@@ -323,10 +339,11 @@ g.vertex.selected .shadow {
 
 
 /* lines */
-
 .preset-icon .icon.iD-other-line {
-    color: #fff;
-    fill: #777;
+    color: #989898;
+}
+.preset-icon-line path.casing {
+    stroke: #afafaf;
 }
 
 path.line {
@@ -361,7 +378,6 @@ path.line.stroke {
 
 
 /* Labels / Markers */
-
 text {
     font-size: 10px;
     color: #222;
@@ -373,7 +389,8 @@ text {
 }
 
 .onewaygroup path.oneway,
-.viewfieldgroup path.viewfield {
+.viewfieldgroup path.viewfield,
+.sidedgroup path.sided {
     stroke-width: 6px;
 }
 
@@ -401,7 +418,7 @@ text.pointlabel {
   dominant-baseline: auto;
 }
 
-.layer-labels-halo text {
+.labels-group.halo text {
     opacity: 0.7;
     stroke: #fff;
     stroke-width: 5px;
@@ -409,9 +426,8 @@ text.pointlabel {
 }
 
 text.nolabel {
-    opacity: 0;
+    opacity: 0 !important;
 }
-
 text.point {
     font-size: 10px;
 }
@@ -422,24 +438,27 @@ text.point {
     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 */
-
-g.turn rect,
-g.turn circle {
+.points-group.turns g.turn rect,
+.points-group.turns g.turn circle {
     fill: none;
-    pointer-events: all;
-}
-
-.form-field-restrictions .vertex {
-    cursor: auto !important;
-    pointer-events: none;
 }
 
 /* Turn restriction paths and vertices */
@@ -469,70 +488,9 @@ g.turn circle {
     stroke: #68f;
 }
 
-
-/* GPX Paths */
-
-.layer-gpx {
-    pointer-events: none;
-}
-
-path.gpx {
-    stroke: #ff26d4;
-    stroke-width: 2;
-    fill: none;
-}
-
-text.gpxlabel-halo,
-text.gpxlabel {
-    font-size: 10px;
-    font-weight: bold;
-    dominant-baseline: middle;
-}
-
-text.gpxlabel {
-    fill: #ff26d4;
-}
-
-text.gpxlabel-halo {
-    opacity: 0.7;
-    stroke: #000;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
-}
-
-/* MVT Paths */
-
-.layer-mvt {
-    pointer-events: none;
-}
-
-path.mvt {
-    stroke: #ff26d4;
-    stroke-width: 2;
-    fill: none;
-}
-
-text.mvtlabel-halo,
-text.mvtlabel {
-    font-size: 10px;
-    font-weight: bold;
-    dominant-baseline: middle;
-}
-
-text.mvtlabel {
-    fill: #ff26d4;
-}
-
-text.mvtlabel-halo {
-    opacity: 0.7;
-    stroke: #000;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
-}
-
 /* Default - light gray */
 path.area.stroke {
-    stroke: #ddd;
+    stroke: rgb(170, 170, 170);
     stroke-width: 1;
 }
 path.area.fill {
@@ -552,19 +510,34 @@ path.stroke.old-multipolygon {
     stroke-linecap: butt;
 }
 
+
 /* Green things */
 path.stroke.tag-landuse,
 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,
 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);
 }
@@ -572,21 +545,38 @@ path.fill.tag-leisure-park {
 .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-harbour,
-path.stroke.tag-landuse-reservoir {
+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,
@@ -597,6 +587,7 @@ 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,
@@ -607,14 +598,18 @@ path.fill.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 */
-.pattern-color-beach,
-.pattern-color-sand,
-.pattern-color-scrub {
-    fill: rgba(255, 255, 148, 0.2);
-}
 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,
@@ -626,6 +621,9 @@ path.stroke.tag-amenity-university {
     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,
@@ -634,10 +632,13 @@ 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,
@@ -647,16 +648,18 @@ path.fill.tag-amenity-university {
 .preset-icon-fill-area.tag-amenity-college,
 .preset-icon-fill-area.tag-amenity-university {
     border-color: rgb(232, 232, 0);
-    background-color: rgba(255, 255, 148, 0.15);
+    background-color: rgba(255, 255, 148, 0.25);
+}
+.pattern-color-beach,
+.pattern-color-sand,
+.pattern-color-scrub {
+    fill: rgba(255, 255, 148, 0.2);
 }
 
+
 /* Gold things */
-.pattern-color-construction {
-    fill: rgba(196, 189, 25, 0.3);
-}
 path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse.tag-status,
-path.stroke.tag-landuse-construction {
+path.stroke.tag-status-construction {
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
@@ -664,11 +667,14 @@ path.fill.tag-landuse-residential {
     fill: rgba(196, 189, 25, 0.3);
 }
 .preset-icon-fill-area.tag-landuse-residential,
-.preset-icon-fill-area.tag-landuse.tag-status,
-.preset-icon-fill-area.tag-landuse-construction {
+.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,
@@ -694,6 +700,10 @@ path.fill.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);
+}
+
 
 /* Pink things */
 path.stroke.tag-landuse-industrial,
@@ -711,10 +721,8 @@ path.fill.tag-power-plant {
     background-color: rgba(228, 164, 245, 0.3);
 }
 
+
 /* Teal things */
-.pattern-color-wetland {
-    fill: rgba(153, 225, 170, 0.3);
-}
 path.stroke.tag-natural-wetland {
     stroke: rgb(153, 225, 170);
 }
@@ -722,29 +730,42 @@ path.stroke.tag-natural-wetland {
     border-color: rgb(153, 225, 170);
     background-color: rgba(153, 225, 170, 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);
+}
+
 
 /* Light Green things */
-.pattern-color-cemetery,
-.pattern-color-orchard,
-.pattern-color-meadow,
-.pattern-color-farm,
-.pattern-color-farmland {
-    fill: rgba(191, 232, 63, 0.2);
-}
 path.stroke.tag-landuse-cemetery,
 path.stroke.tag-landuse-orchard,
+path.stroke.tag-landuse-vineyard,
 path.stroke.tag-landuse-meadow,
-path.stroke.tag-landuse-farm,
 path.stroke.tag-landuse-farmland {
     stroke: rgb(191, 232, 63);
 }
 .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-farm,
 .preset-icon-fill-area.tag-landuse-farmland {
     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 {
@@ -758,42 +779,60 @@ path.fill.tag-landuse-farmyard {
     border-color: rgb(226, 177, 111);
     background: rgba(245, 220, 186, 0.3);
 }
+.pattern-color-farmyard {
+    fill: rgba(245, 220, 186, 0.3);
+}
+
 
 /* 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-landuse-railway,
-path.stroke.tag-landuse-quarry {
-    stroke: #bbb;
+path.stroke.tag-waterway-dam,
+path.stroke.tag-waterway-weir {
+    stroke: rgb(170, 170, 170);
 }
 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-landuse-railway,
-path.fill.tag-landuse-quarry {
+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-landuse-railway,
-.preset-icon-fill-area.tag-landuse-quarry {
+.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);
 }
+.pattern-color-quarry {
+    fill: rgba(140, 140, 140, 0.5);
+}
+
 
 /* Light gray overrides */
 path.stroke.tag-natural-cave_entrance,
 path.stroke.tag-natural-glacier {
-    stroke: #ddd;
+    stroke: rgb(170, 170, 170);
 }
 path.fill.tag-natural-cave_entrance,
 path.fill.tag-natural-glacier {
@@ -805,596 +844,535 @@ path.fill.tag-natural-glacier {
     border-color: rgb(170, 170, 170);
     background: rgba(170, 170, 170, 0.3);
 }
-
 /* highways */
 
+/* defaults */
 .preset-icon .icon.tag-highway.other-line {
     color: #fff;
     fill: #777;
 }
-path.casing.tag-highway {
+path.line.casing.tag-highway {
     stroke: #444;
 }
-path.stroke.tag-highway {
+path.line.stroke.tag-highway {
     stroke: #ccc;
 }
 
-/* highway areas */
-
-path.stroke.area.tag-highway,
-.low-zoom path.stroke.area.tag-highway {
-    stroke: #fff;
-    stroke-dasharray: none;
-    stroke-width: 1;
-}
-
 /* wide highways */
-
-path.shadow.tag-highway {
+path.line.shadow.tag-highway {
     stroke-width: 20;
 }
-path.casing.tag-highway {
+path.line.casing.tag-highway {
     stroke-width: 10;
 }
-path.stroke.tag-highway {
+path.line.stroke.tag-highway {
     stroke-width: 8;
 }
-
-.low-zoom path.shadow.tag-highway {
+.low-zoom path.line.shadow.tag-highway {
     stroke-width: 16;
 }
-.low-zoom path.casing.tag-highway {
+.low-zoom path.line.casing.tag-highway {
     stroke-width: 7;
 }
-.low-zoom path.stroke.tag-highway {
+.low-zoom path.line.stroke.tag-highway {
     stroke-width: 5;
 }
 
-.preset-icon .icon.iD-highway-motorway,
-.preset-icon .icon.iD-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 {
+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 {
+path.line.casing.tag-highway-motorway,
+path.line.casing.tag-highway-motorway_link,
+path.line.casing.tag-motorway {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-trunk,
-.preset-icon .icon.iD-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 {
+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 {
+path.line.casing.tag-highway-trunk,
+path.line.casing.tag-highway-trunk_link,
+path.line.casing.tag-trunk {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-primary,
-.preset-icon .icon.iD-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 {
+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 {
+path.line.casing.tag-highway-primary,
+path.line.casing.tag-highway-primary_link,
+path.line.casing.tag-primary {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-secondary,
-.preset-icon .icon.iD-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 {
+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 {
+path.line.casing.tag-highway-secondary,
+path.line.casing.tag-highway-secondary_link,
+path.line.casing.tag-secondary {
     stroke: #70372f;
 }
 
-.preset-icon .icon.iD-highway-tertiary,
-.preset-icon .icon.iD-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 {
+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 {
+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.iD-highway-motorway,
-.legacy-carto .preset-icon .icon.iD-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 {
+.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 {
+.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.iD-highway-trunk,
-.legacy-carto .preset-icon .icon.iD-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 {
+.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 {
+.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.iD-highway-primary,
-.legacy-carto .preset-icon .icon.iD-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 {
+.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 {
+.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.iD-highway-secondary,
-.legacy-carto .preset-icon .icon.iD-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 {
+.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 {
+.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.iD-highway-tertiary,
-.legacy-carto .preset-icon .icon.iD-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 {
+.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 {
+.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.iD-highway-residential {
+.preset-icon .icon.tag-highway-residential {
     color: #fff;
     fill: #444;
 }
-path.stroke.tag-highway-residential,
-path.stroke.tag-residential {
+path.line.stroke.tag-highway-residential,
+path.line.stroke.tag-residential {
     stroke: #fff;
 }
-path.casing.tag-highway-residential,
-path.casing.tag-residential {
+path.line.casing.tag-highway-residential,
+path.line.casing.tag-residential {
     stroke: #444;
 }
 
-.preset-icon .icon.iD-highway-unclassified {
+.preset-icon .icon.tag-highway-unclassified {
     color: #dca;
     fill: #444;
 }
-path.stroke.tag-highway-unclassified,
-path.stroke.tag-unclassified {
+path.line.stroke.tag-highway-unclassified,
+path.line.stroke.tag-unclassified {
     stroke: #dca;
 }
-path.casing.tag-highway-unclassified,
-path.casing.tag-unclassified {
+path.line.casing.tag-highway-unclassified,
+path.line.casing.tag-unclassified {
     stroke: #444;
 }
 
 
 /* narrow highways */
-
-path.shadow.tag-highway-living_street,
-path.shadow.tag-highway-bus_guideway,
-path.shadow.tag-highway-service,
-path.shadow.tag-highway-track,
-path.shadow.tag-highway-road,
-path.shadow.tag-living_street,
-path.shadow.tag-service,
-path.shadow.tag-track,
-path.shadow.tag-road {
+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.casing.tag-highway-living_street,
-path.casing.tag-highway-bus_guideway,
-path.casing.tag-highway-service,
-path.casing.tag-highway-track,
-path.casing.tag-highway-road,
-path.casing.tag-living_street,
-path.casing.tag-service,
-path.casing.tag-track,
-path.casing.tag-road {
+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.stroke.tag-highway-living_street,
-path.stroke.tag-highway-bus_guideway,
-path.stroke.tag-highway-service,
-path.stroke.tag-highway-track,
-path.stroke.tag-highway-road,
-path.stroke.tag-living_street,
-path.stroke.tag-service,
-path.stroke.tag-track,
-path.stroke.tag-road {
+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.shadow.tag-highway-path,
-path.shadow.tag-highway-footway,
-path.shadow.tag-highway-cycleway,
-path.shadow.tag-highway-bridleway,
-path.shadow.tag-highway-corridor,
-path.shadow.tag-highway-pedestrian,
-path.shadow.tag-highway-steps,
-path.shadow.tag-path,
-path.shadow.tag-footway,
-path.shadow.tag-cycleway,
-path.shadow.tag-bridleway,
-path.shadow.tag-corridor,
-path.shadow.tag-pedestrian,
-path.shadow.tag-steps {
+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.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-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.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.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-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.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.shadow.tag-highway-living_street,
-.low-zoom path.shadow.tag-highway-bus_guideway,
-.low-zoom path.shadow.tag-highway-service,
-.low-zoom path.shadow.tag-highway-track,
-.low-zoom path.shadow.tag-highway-road,
-.low-zoom path.shadow.tag-living_street,
-.low-zoom path.shadow.tag-service,
-.low-zoom path.shadow.tag-track,
-.low-zoom path.shadow.tag-road {
+.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.casing.tag-highway-living_street,
-.low-zoom path.casing.tag-highway-bus_guideway,
-.low-zoom path.casing.tag-highway-service,
-.low-zoom path.casing.tag-highway-track,
-.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-road {
+.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.stroke.tag-highway-living_street,
-.low-zoom path.stroke.tag-highway-bus_guideway,
-.low-zoom path.stroke.tag-highway-service,
-.low-zoom path.stroke.tag-highway-track,
-.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-road {
+.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.shadow.tag-highway-path,
-.low-zoom path.shadow.tag-highway-footway,
-.low-zoom path.shadow.tag-highway-cycleway,
-.low-zoom path.shadow.tag-highway-bridleway,
-.low-zoom path.shadow.tag-highway-corridor,
-.low-zoom path.shadow.tag-highway-pedestrian,
-.low-zoom path.shadow.tag-highway-steps,
-.low-zoom path.shadow.tag-path,
-.low-zoom path.shadow.tag-footway,
-.low-zoom path.shadow.tag-cycleway,
-.low-zoom path.shadow.tag-bridleway,
-.low-zoom path.shadow.tag-corridor,
-.low-zoom path.shadow.tag-pedestrian,
-.low-zoom path.shadow.tag-steps {
+.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.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-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.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.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-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.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.iD-highway-living-street {
+.preset-icon .icon.tag-highway-living-street {
     color: #bbb;
     fill: #ddd;
 }
-path.stroke.tag-highway-living_street,
-path.stroke.tag-living_street {
+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 {
+path.line.casing.tag-highway-living_street,
+path.line.casing.tag-living_street {
     stroke: #fff;
 }
 
-.preset-icon .icon.iD-highway-footway.tag-highway-corridor,
-.preset-icon .icon.iD-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 {
+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;
 }
-.low-zoom path.stroke.tag-highway-corridor,
-.low-zoom path.stroke.tag-highway-pedestrian,
-.low-zoom path.stroke.tag-corridor,
-.low-zoom path.stroke.tag-pedestrian {
+.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.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 {
+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.iD-highway-road {
+.preset-icon .icon.tag-highway-road {
     color: #9e9e9e;
     fill: #666;
 }
-path.stroke.tag-highway-road,
-path.stroke.tag-road {
+path.line.stroke.tag-highway-road,
+path.line.stroke.tag-road {
     stroke: #9e9e9e;
 }
-path.casing.tag-highway-road,
-path.casing.tag-road {
+path.line.casing.tag-highway-road,
+path.line.casing.tag-road {
     stroke: #666;
 }
 
-.preset-icon .icon.iD-highway-service {
+.preset-icon .icon.tag-highway-service {
     color: #fff;
     fill: #666;
 }
-path.stroke.tag-highway-service,
-path.stroke.tag-service {
+path.line.stroke.tag-highway-service,
+path.line.stroke.tag-service {
     stroke: #fff;
 }
-path.casing.tag-highway-service,
-path.casing.tag-service {
+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.iD-highway-bus_guideway,
-.preset-icon .icon.iD-highway-service.tag-service {
+/* 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.stroke.tag-highway-bus_guideway,
-path.stroke.tag-highway-service.tag-service,
-path.stroke.tag-service.tag-service {
+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-bus_guideway,
-path.casing.tag-highway-service.tag-service,
-path.casing.tag-service.tag-service {
+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.iD-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.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.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 {
+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.iD-category-path,
-.preset-icon .icon.iD-highway-path {
+.preset-icon .icon.tag-highway-path {
     color: #988;
     fill: #dca;
 }
-path.stroke.tag-highway-path {
+path.line.stroke.tag-highway-path {
     stroke: #988;
 }
 
 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
-.preset-icon .icon.iD-highway-footway {
+.preset-icon .icon.tag-highway-footway {
     color: #988;
     fill: #fff;
 }
-path.stroke.tag-highway-footway {
+path.line.stroke.tag-highway-footway,
+.preset-icon-line path.casing.tag-highway-footway {
     stroke: #988;
 }
-
+.preset-icon-line path.stroke.tag-highway-footway {
+    stroke: #fff;
+}
 
 .preset-icon .icon.tag-route-bicycle,
-.preset-icon .icon.iD-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.iD-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.iD-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;
 }
-.low-zoom path.stroke.tag-highway-steps {
+.low-zoom path.line.stroke.tag-highway-steps {
     stroke-dasharray: 2, 2;
 }
-path.casing.tag-highway-steps,
-path.casing.tag-highway-steps.tag-unpaved {
+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,
@@ -1412,37 +1390,41 @@ g.midpoint.tag-highway-bridleway .fill {
 /* aeroways */
 
 /* areas */
-path.stroke.area.tag-aeroway,
-.low-zoom path.stroke.area.tag-aeroway {
+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);
+}
 
+/* lines */
 /* narrow aeroways (taxiway) */
-path.shadow.tag-aeroway-taxiway,
-path.shadow.tag-taxiway {
+path.line.shadow.tag-aeroway-taxiway,
+path.line.shadow.tag-taxiway {
     stroke-width: 16;
 }
-path.casing.tag-aeroway-taxiway,
-path.casing.tag-taxiway {
+path.line.casing.tag-aeroway-taxiway,
+path.line.casing.tag-taxiway {
     stroke-width: 7;
 }
-path.stroke.tag-aeroway-taxiway,
-path.stroke.tag-taxiway {
+path.line.stroke.tag-aeroway-taxiway,
+path.line.stroke.tag-taxiway {
     stroke-width: 5;
 }
-
-.low-zoom path.shadow.tag-aeroway-taxiway,
-.low-zoom path.shadow.tag-taxiway {
+.low-zoom path.line.shadow.tag-aeroway-taxiway,
+.low-zoom path.line.shadow.tag-taxiway {
     stroke-width: 12;
 }
-.low-zoom path.casing.tag-aeroway-taxiway,
-.low-zoom path.casing.tag-taxiway {
+.low-zoom path.line.casing.tag-aeroway-taxiway,
+.low-zoom path.line.casing.tag-taxiway {
     stroke-width: 5;
 }
-.low-zoom path.stroke.tag-aeroway-taxiway,
-.low-zoom path.stroke.tag-taxiway {
+.low-zoom path.line.stroke.tag-aeroway-taxiway,
+.low-zoom path.line.stroke.tag-taxiway {
     stroke-width: 3;
 }
 
@@ -1451,54 +1433,51 @@ path.stroke.tag-taxiway {
     color: #ff0;
     fill: #666;
 }
-path.stroke.tag-aeroway-taxiway,
-path.stroke.tag-taxiway {
+path.line.stroke.tag-aeroway-taxiway,
+path.line.stroke.tag-taxiway {
     stroke: #ff0;
 }
-path.casing.tag-aeroway-taxiway,
-path.casing.tag-taxiway {
+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.shadow.tag-aeroway-runway {
+path.line.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
-path.casing.tag-aeroway-runway {
+path.line.casing.tag-aeroway-runway {
     stroke-width: 10;
     stroke: #000;
     stroke-linecap: square;
 }
-path.stroke.tag-aeroway-runway {
+path.line.stroke.tag-aeroway-runway {
     stroke: #fff;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 24, 48;
 }
-
-.low-zoom path.shadow.tag-aeroway-runway {
+.low-zoom path.line.shadow.tag-aeroway-runway {
     stroke-width: 16;
 }
-.low-zoom path.casing.tag-aeroway-runway {
+.low-zoom path.line.casing.tag-aeroway-runway {
     stroke-width: 7;
 }
-.low-zoom path.stroke.tag-aeroway-runway {
+.low-zoom path.line.stroke.tag-aeroway-runway {
     stroke-width: 2;
     stroke-dasharray: 12, 24;
 }
-
-path.fill.tag-aeroway-runway {
-    stroke: rgba(0, 0, 0, 0.6);
-    fill: rgba(0, 0, 0, 0.6);
+.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;
@@ -1508,49 +1487,38 @@ path.fill.tag-aeroway-runway {
     fill: #eee;
 }
 
-/* railway areas */
-path.stroke.area.tag-railway,
-.low-zoom path.stroke.area.tag-railway {
-    stroke: white;
-    stroke-width: 1;
-    stroke-dasharray: none;
-}
-
-path.casing.area.tag-railway,
-.low-zoom path.casing.area.tag-railway {
-    stroke: none;
-}
-
+/* lines */
 /* narrow widths */
-path.shadow.tag-railway {
+path.line.shadow.tag-railway {
     stroke-width: 16;
 }
-path.casing.tag-railway {
+path.line.casing.tag-railway {
     stroke-width: 7;
 }
-path.stroke.tag-railway {
+path.line.stroke.tag-railway {
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-
-.low-zoom path.shadow.tag-railway {
+.low-zoom path.line.shadow.tag-railway {
     stroke-width: 12;
 }
-.low-zoom path.casing.tag-railway {
+.low-zoom path.line.casing.tag-railway {
     stroke-width: 5;
 }
-.low-zoom path.stroke.tag-railway {
+.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.casing.tag-railway {
+path.line.casing.tag-railway {
     stroke: #555;
 }
-path.stroke.tag-railway {
+path.line.stroke.tag-railway {
     stroke: #eee;
 }
 
@@ -1560,274 +1528,427 @@ path.stroke.tag-railway {
     color: #999;
     fill: #eee;
 }
-path.casing.tag-railway-disused,
-path.casing.tag-railway-abandoned {
+path.line.casing.tag-railway-disused,
+path.line.casing.tag-railway-abandoned {
     stroke: #999;
 }
-path.stroke.tag-railway-disused,
-path.stroke.tag-railway-abandoned {
+path.line.stroke.tag-railway-disused,
+path.line.stroke.tag-railway-abandoned {
     stroke: #eee;
 }
 
 
-.preset-icon .icon.tag-railway-subway {
-    color: #222;
-    fill: #bbb;
-}
-path.casing.tag-railway-subway {
+path.line.casing.tag-railway-subway {
     stroke: #222;
 }
-path.stroke.tag-railway-subway {
+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.iD-category-water,
-.preset-icon .icon.tag-route-ferry,
 .preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
-    color: #77d3de;
+    color: #7dd;
     fill: #fff;
 }
 
-path.fill.tag-waterway {
+
+/* areas */
+path.area.stroke.tag-waterway-dock,
+path.area.stroke.tag-waterway-boatyard,
+path.area.stroke.tag-waterway-fuel {
+    stroke: white;
+    stroke-width: 1;
+}
+path.area.casing.tag-waterway-dock,
+path.area.casing.tag-waterway-boatyard,
+path.area.casing.tag-waterway-fuel {
+    stroke: none;
+}
+path.area.fill.tag-waterway-dock,
+path.area.fill.tag-waterway-boatyard,
+path.area.fill.tag-waterway-fuel {
+    stroke: rgba(255, 255, 255, 0.3);
+    fill: rgba(255, 255, 255, 0.3);
+}
+
+/* lines */
+path.line.fill.tag-waterway {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
-path.casing.tag-waterway {
-    stroke: #3d6c71;
+path.line.casing.tag-waterway {
+    stroke: #444;
 }
-path.stroke.tag-waterway {
-    stroke: #77d3de;
+path.line.stroke.tag-waterway {
+    stroke: #7dd;
 }
 
 
 /* narrow waterways (default) */
-path.shadow.tag-waterway {
+path.line.shadow.tag-waterway {
     stroke-width: 16;
 }
-path.casing.tag-waterway {
+path.line.casing.tag-waterway {
     stroke-width: 7;
 }
-path.stroke.tag-waterway {
+path.line.stroke.tag-waterway {
     stroke-width: 5;
 }
 
-.low-zoom path.shadow.tag-waterway {
+.low-zoom path.line.shadow.tag-waterway {
     stroke-width: 12;
 }
-.low-zoom path.casing.tag-waterway {
+.low-zoom path.line.casing.tag-waterway {
     stroke-width: 5;
 }
-.low-zoom path.stroke.tag-waterway {
+.low-zoom path.line.stroke.tag-waterway {
     stroke-width: 3;
 }
 
 
 /* wide waterways (river) */
-path.shadow.tag-waterway-river {
+path.line.shadow.tag-waterway-river {
     stroke-width: 20;
 }
-path.casing.tag-waterway-river {
+path.line.casing.tag-waterway-river {
     stroke-width: 10;
 }
-path.stroke.tag-waterway-river {
+path.line.stroke.tag-waterway-river {
     stroke-width: 8;
 }
 
-.low-zoom path.shadow.tag-waterway-river {
+.low-zoom path.line.shadow.tag-waterway-river {
     stroke-width: 16;
 }
-.low-zoom path.casing.tag-waterway-river {
+.low-zoom path.line.casing.tag-waterway-river {
     stroke-width: 7;
 }
-.low-zoom path.stroke.tag-waterway-river {
+.low-zoom path.line.stroke.tag-waterway-river {
     stroke-width: 5;
 }
 
 
 /* ditch */
 .preset-icon .icon.tag-waterway-ditch {
-    color: #8eabf3;
+    color: #39a;
 }
-path.stroke.tag-waterway-ditch {
-    stroke: #8eabf3;
+path.line.stroke.tag-waterway-ditch {
+    stroke: #39a;
 }
 
 
-/* waterway areas */
-path.area.stroke.tag-waterway-dock,
-path.area.stroke.tag-waterway-boatyard,
-path.area.stroke.tag-waterway-fuel {
-    stroke: white;
-    stroke-width: 1;
+/* 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.area.casing.tag-waterway-dock,
-path.area.casing.tag-waterway-boatyard,
-path.area.casing.tag-waterway-fuel {
-    stroke: none;
+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.area.fill.tag-waterway-dock,
-path.area.fill.tag-waterway-boatyard,
-path.area.fill.tag-waterway-fuel {
-    stroke: rgba(255, 255, 255, 0.3);
-    fill: rgba(255, 255, 255, 0.3);
+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;
 }
 
-/* power */
-.preset-icon .icon.tag-man_made-pipeline,
-.preset-icon .icon.tag-power {
-    color: #939393;
-    fill: #939393;
+.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;
 }
-
-path.stroke.tag-power {
-    stroke: #939393;
-    stroke-width: 2;
+.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;
 }
-path.casing.tag-power {
-    stroke: none;
+.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;
 }
 
 
-/* boundaries */
-path.stroke.tag-boundary {
-    stroke: #fff;
-    stroke-width: 2;
+/* 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: 20, 5, 5, 5;
+    stroke-dasharray: 12,8;
 }
-path.casing.tag-boundary {
-    stroke: #82B5FE;
-    stroke-width: 6;
+.low-zoom path.line.shadow.tag-route-ferry {
+    stroke-width: 12;
 }
-
-path.casing.tag-boundary-protected_area,
-path.casing.tag-boundary-national_park {
-    stroke: #b0e298;
+.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;
 }
 
 
-/* Tree Rows */
-path.shadow.tag-natural-tree_row {
-    stroke-width: 16;
+/* aerialways */
+path.line.stroke.tag-aerialway {
+    stroke: #c55;
 }
-path.casing.tag-natural-tree_row {
-    stroke-width: 7;
+path.line.casing.tag-aerialway {
+    stroke: #444;
 }
-path.stroke.tag-natural-tree_row {
-    stroke-width: 5;
+
+
+/* pistes */
+path.line.stroke.tag-piste {
+    stroke: #a9d;
+}
+path.line.casing.tag-piste {
+    stroke: #444;
 }
 
-.low-zoom path.shadow.tag-natural-tree_row {
-    stroke-width: 12;
+
+/* Attractions */
+path.line.stroke.tag-attraction-summer_toboggan {
+    stroke: #9e9e9e;
 }
-.low-zoom path.casing.tag-natural-tree_row {
-    stroke-width: 5;
+path.line.casing.tag-attraction-summer_toboggan {
+    stroke: #666;
 }
-.low-zoom path.stroke.tag-natural-tree_row {
-    stroke-width: 3;
+
+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;
 }
 
 
-/* barriers */
-path.stroke.tag-barrier {
+/* 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.stroke.tag-barrier {
+.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.casing.tag-bridge {
+path.line.casing.tag-bridge {
     stroke-opacity: 0.6;
     stroke: #000 !important;
     stroke-linecap: butt;
     stroke-dasharray: none;
 }
-
-path.shadow.tag-bridge {
+path.line.shadow.tag-bridge {
     stroke-width: 24;
 }
-path.casing.tag-bridge {
+path.line.casing.tag-bridge {
     stroke-width: 16;
 }
-.low-zoom path.shadow.tag-bridge {
+.low-zoom path.line.shadow.tag-bridge {
     stroke-width: 16;
 }
-.low-zoom path.casing.tag-bridge {
+.low-zoom path.line.casing.tag-bridge {
     stroke-width: 10;
 }
 
-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 {
+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.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 {
+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.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 {
+.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.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 {
+.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.stroke.tag-tunnel {
+path.line.stroke.tag-tunnel,
+path.line.stroke.tag-location-underground,
+path.line.stroke.tag-location-underwater {
     stroke-opacity: 0.3;
 }
-path.casing.tag-tunnel {
+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;
@@ -1835,12 +1956,12 @@ path.casing.tag-tunnel {
 
 
 /* embankments / cuttings */
-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
+path.line.shadow.tag-embankment,
+path.line.shadow.tag-cutting {
     stroke-width: 28;
 }
-path.casing.tag-embankment,
-path.casing.tag-cutting {
+path.line.casing.tag-embankment,
+path.line.casing.tag-cutting {
     stroke-opacity: 0.5;
     stroke: #000;
     stroke-width: 22;
@@ -1848,46 +1969,87 @@ path.casing.tag-cutting {
     stroke-linecap: butt;
 }
 
-.low-zoom path.shadow.tag-embankment,
-.low-zoom path.shadow.tag-cutting {
+.low-zoom path.line.shadow.tag-embankment,
+.low-zoom path.line.shadow.tag-cutting {
     stroke-width: 14;
 }
-.low-zoom path.casing.tag-embankment,
-.low-zoom path.casing.tag-cutting {
+.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 {
@@ -1897,6 +2059,7 @@ path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
+.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);
@@ -1904,6 +2067,7 @@ path.fill.tag-building {
 
 
 /* "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,
@@ -1913,6 +2077,7 @@ path.fill.tag-building {
     fill: #dca;
 }
 
+.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,
@@ -1922,58 +2087,65 @@ path.fill.tag-building {
     background-color: #dca;
 }
 
-path.shadow.tag-public_transport-platform,
-path.shadow.tag-railway-platform,
-path.shadow.tag-man_made-pier,
-path.shadow.tag-footway.tag-footway-crossing,
-path.shadow.tag-crossing {
+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;
 }
-path.casing.tag-public_transport-platform,
-path.casing.tag-railway-platform,
-path.casing.tag-man_made-pier,
-path.casing.tag-footway.tag-footway-crossing,
-path.casing.tag-crossing {
+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;
 }
-path.stroke.tag-public_transport-platform,
-path.stroke.tag-railway-platform,
-path.stroke.tag-man_made-pier,
-path.stroke.tag-footway.tag-footway-crossing,
-path.stroke.tag-crossing {
+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;
 }
 
-.low-zoom path.shadow.tag-public_transport-platform,
-.low-zoom path.shadow.tag-railway-platform,
-.low-zoom path.shadow.tag-man_made-pier,
-.low-zoom path.shadow.tag-footway.tag-footway-crossing,
-.low-zoom path.shadow.tag-crossing {
+.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.casing.tag-public_transport-platform,
-.low-zoom path.casing.tag-railway-platform,
-.low-zoom path.casing.tag-man_made-pier,
-.low-zoom path.casing.tag-footway.tag-footway-crossing,
-.low-zoom path.casing.tag-crossing {
+.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;
 }
-.low-zoom path.stroke.tag-public_transport-platform,
-.low-zoom path.stroke.tag-railway-platform,
-.low-zoom path.stroke.tag-man_made-pier,
-.low-zoom path.stroke.tag-footway.tag-footway-crossing,
-.low-zoom path.stroke.tag-crossing {
+.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;
 }
 
+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,
@@ -1991,20 +2163,19 @@ g.midpoint.tag-crossing .fill {
     color: #444;
     fill: #dca;
 }
-path.casing.tag-crossing.tag-crossing-marked,
-path.casing.tag-crossing.tag-crossing-zebra {
+path.line.casing.tag-crossing.tag-crossing-marked,
+path.line.casing.tag-crossing.tag-crossing-zebra {
     stroke: #dca;
 }
-path.stroke.tag-crossing.tag-crossing-marked,
-path.stroke.tag-crossing.tag-crossing-zebra {
+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.stroke.tag-crossing.tag-crossing-marked,
-.low-zoom path.stroke.tag-crossing.tag-crossing-zebra {
+.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,
@@ -2103,19 +2274,29 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     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;
 }
+
 /* photo viewer div */
 #photoviewer {
     position: absolute;
-    bottom: 30px;
+    bottom: 40px;
+    left: 10px;
     width: 330px;
     height: 250px;
     padding: 5px;
     background-color: #fff;
 }
+[dir='rtl'] #photoviewer {
+    left: auto;
+    right: 10px;
+}
 
 @media screen and (min-width: 1600px) {
     #photoviewer {
@@ -2197,11 +2378,15 @@ path.stroke.tag-crossing.tag-crossing-zebra {
 
 /* markers and sequences */
 .viewfield-group {
+    pointer-events: none;
+}
+.mode-browse .viewfield-group,
+.mode-select .viewfield-group {
     pointer-events: visible;
     cursor: pointer;
 }
 
-.viewfield-group.selected * {
+.viewfield-group.currentView * {
     fill: #ffee00 !important;
 }
 .viewfield-group.hovered * {
@@ -2225,7 +2410,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-opacity: 0.9;
     fill-opacity: 0.9;
 }
-.viewfield-group.highlighted.selected circle {
+.viewfield-group.highlighted.currentView circle {
     stroke: #222;
     stroke-width: 2;
     stroke-opacity: 1;
@@ -2245,12 +2430,12 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-width: 1;
     fill-opacity: 0.8;
 }
-.viewfield-group.highlighted.selected .viewfield {
+.viewfield-group.highlighted.currentView .viewfield {
     stroke-width: 1;
     fill-opacity: 0.9;
 }
 
-.viewfield-group.selected .viewfield-scale {
+.viewfield-group.currentView .viewfield-scale {
     transform: scale(2,2);
 }
 
@@ -2260,7 +2445,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-opacity: 0.4;
 }
 .sequence.highlighted,
-.sequence.selected {
+.sequence.currentView {
     stroke-width: 4;
     stroke-opacity: 1;
 }
@@ -2304,7 +2489,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     outline: 5px solid #eebb00;
     background-color: #eebb00;
 }
-.layer-mapillary-signs .icon-sign.selected {
+.layer-mapillary-signs .icon-sign.currentView {
     outline: 5px solid #ffee00;
     background-color: #ffee00;
 }
@@ -2451,39 +2636,30 @@ label.streetside-hires {
     color: #fff;
 }
 
+/* OSM Notes and KeepRight Layers */
 
-/* OSM Notes Layer */
-.layer-notes {
-    pointer-events: none;
-}
-.layer-notes .note * {
-    pointer-events: none;
-}
-.layer-notes .note .note-fill {
-    pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */
+.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 */
 }
 
-.note-header-icon .note-shadow,
-.layer-notes .note .note-shadow {
-    color: #000;
-}
 .note-header-icon .note-fill,
 .layer-notes .note .note-fill {
-    color: #ff3300;
+    color: #f30;
     stroke: #333;
     stroke-width: 40px;
 }
 .note-header-icon.new .note-fill,
 .layer-notes .note.new .note-fill {
-    color: #ffee00;
+    color: #fe0;
     stroke: #333;
     stroke-width: 40px;
 }
 .note-header-icon.closed .note-fill,
 .layer-notes .note.closed .note-fill {
-    color: #55dd00;
+    color: #5d0;
     stroke: #333;
     stroke-width: 40px;
 }
@@ -2492,142 +2668,186 @@ label.streetside-hires {
 .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;
 }
 
+/* adjustment for error icon */
 
-/* OSM Note UI */
-.note-header {
-    background-color: #f6f6f6;
-    border-radius: 5px;
-    border: 1px solid #ccc;
+.error-header-icon .preset-icon-28 {
+    top: auto;
+    left: auto;
+}
+
+.error-header-icon {
     display: flex;
-    flex-flow: row nowrap;
     align-items: center;
+    justify-content: center;
 }
 
-.note-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;
+/* 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;
 }
-[dir='rtl'] .note-header-icon {
-    border-right: unset;
-    border-left: 1px solid #ccc;
-    border-radius: 0 5px 5px 0;
+
+.keepRight.error_type-50 {    /* almost junctions */
+    color: #88f;
 }
 
-.note-header-icon .icon-wrap {
-    position: absolute;
-    top: 0px;
+.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;
 }
 
-.note-header-label {
-    background-color: #f6f6f6;
-    padding: 0 15px;
-    flex: 1 1 100%;
-    font-size: 14px;
-    font-weight: bold;
-    border-radius: 0 5px 5px 0;
+.keepRight.error_type-130 {   /* disconnected ways */
+    color: #fa3;
 }
-[dir='rtl'] .note-header-label {
-    border-radius: 5px 0 0 5px;
+
+.keepRight.error_type-170 {   /* FIXME tag */
+    color: #ff0;
 }
 
-.note-category {
-    margin: 20px 0px;
+.keepRight.error_type-190 {   /* intersection without junction */
+    color: #f33;
 }
 
-.comments-container {
-    background: #ececec;
-    padding: 1px 10px;
-    border-radius: 8px;
-    margin-top: 20px;
+.keepRight.error_type-200 {   /* overlapping ways */
+    color: #fdbf6f;
 }
 
-.comment {
-    background-color: #fff;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-    margin: 10px auto;
-    display: flex;
-    flex-flow: row nowrap;
+.keepRight.error_type-160,    /* railway layer conflict */
+.keepRight.error_type-230 {   /* layer conflict */
+    color: #b60;
 }
-.comment-avatar {
-    padding: 10px;
-    flex: 0 0 62px;
+
+.keepRight.error_type-280 {   /* boundary issues */
+    color: #5f47a0;
 }
-.comment-avatar .icon.comment-avatar-icon {
-    width: 40px;
-    height: 40px;
-    object-fit: cover;
-    border: 1px solid #ccc;
-    border-radius: 20px;
+
+.keepRight.error_type-180,    /* relation without type */
+.keepRight.error_type-290 {   /* turn restriction issues */
+    color: #ace;
 }
-.comment-main {
-    padding: 10px 10px 10px 0;
-    flex: 1 1 100%;
-    flex-flow: column nowrap;
-    overflow: hidden;
-    overflow-wrap: break-word;
+
+.keepRight.error_type-300,    /* missing maxspeed */
+.keepRight.error_type-390 {   /* missing tracktype */
+    color: #090;
 }
-[dir='rtl'] .comment-main {
-    padding: 10px 0 10px 10px;
+
+.keepRight.error_type-360,    /* language unknown */
+.keepRight.error_type-370,    /* doubled places */
+.keepRight.error_type-410 {   /* website issues */
+    color: #f9b;
 }
 
-.comment-metadata {
-    flex-flow: row nowrap;
-    justify-content: space-between;
+.keepRight.error_type-120,    /* way without nodes */
+.keepRight.error_type-400 {   /* geometry / turn angles */
+    color: #c35;
 }
-.comment-author {
-    font-weight: bold;
-    color: #333;
+
+/* ImproveOSM Errors
+------------------------------------------------------- */
+
+.improveOSM.error_type-ow {   /* missing one way */
+    color: #1E90FF;
 }
-.comment-date {
-    color: #aaa;
+
+.improveOSM.error_type-mr-road {   /* missing road */
+    color: #B452CD;
 }
-.comment-text {
-    color: #333;
-    margin-top: 10px;
-    overflow-y: auto;
-    max-height: 250px;
+.improveOSM.error_type-mr-path {   /* missing path */
+    color: #A0522D;
 }
-.comment-text::-webkit-scrollbar {
-    border-left: none;
+.improveOSM.error_type-mr-parking {   /* missing parking */
+    color: #EEEE00;
+}
+.improveOSM.error_type-mr-both {   /* missing road+parking */
+    color: #FFA500;
 }
 
-.note-save {
-    padding: 10px;
+.improveOSM.error_type-tr {   /* missing turn restriction */
+    color: #EC1C24;
 }
 
-.note-save #new-comment-input {
-    width: 100%;
-    height: 100px;
-    max-height: 300px;
-    min-height: 100px;
+
+/* Custom Map Data (geojson, gpx, kml, vector tile) */
+.layer-mapdata {
+    pointer-events: none;
 }
 
-.note-save .detail-section {
-    margin: 10px 0;
+.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;
 }
 
-.note-report {
-    float: right;
+.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 */
 
@@ -2638,6 +2858,11 @@ label.streetside-hires {
     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 {
@@ -2653,7 +2878,6 @@ label.streetside-hires {
 }
 
 .fill-wireframe .point,
-.fill-wireframe .vertex.active,
 .fill-wireframe .areaicon,
 .fill-wireframe .areaicon-halo,
 .fill-wireframe path.casing,
@@ -2673,7 +2897,6 @@ label.streetside-hires {
 }
 /* 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
@@ -2690,10 +2913,10 @@ body {
         sans-serif;
     margin: 0;
     padding: 0;
-    min-width: 768px;
     color: #333;
     overflow: hidden;
     -ms-user-select: none;
+    -ms-content-zooming: none;
 }
 
 .unsupported {
@@ -2706,7 +2929,6 @@ body {
 .id-container {
     height: 100%;
     width: 100%;
-    min-width: 768px;
 }
 
 #content {
@@ -2729,22 +2951,6 @@ body {
     transition-duration: 200ms;
 }
 
-/* Firefox has its own ideas about fixed positioning when a css filter is active - #4348 */
-/* https://stackoverflow.com/questions/37949942/firefox-position-bug-by-parent-with-filter */
-@-moz-document url-prefix() {
-    #content > #bar {
-        width: 100vw;
-    }
-    #content.inactive > #bar > .spacer.col4 {
-        width: 0px;
-    }
-    #content.active > #bar > .spacer.col4 {
-        width: 33.3333%;
-        transition-duration: 200ms;
-        transition-timing-function: step-end;
-    }
-}
-
 #defs {
     /* Can't be display: none or the clippaths are ignored. */
     position: absolute;
@@ -2752,47 +2958,10 @@ body {
     height: 0;
 }
 
-.spacer {
-    height: 40px;
-    margin-right: 10px;
-}
-
-.limiter {
-    position: relative;
-    max-width: 1200px;
-}
-
-.spinner {
-    opacity: .5;
-    float: right;
-}
-[dir='rtl'] .spinner {
-    float: left;
-}
-
-.spinner img {
-    height: 40px;
-    width: 40px;
-    border-radius: 4px;
-    margin-right: 10px;
-    background: black;
-}
-[dir='rtl'] .spinner img {
-    margin-left: 10px;
-    margin-right: auto;
-    -moz-transform: scaleX(-1);
-    -o-transform: scaleX(-1);
-    -webkit-transform: scaleX(-1);
-    transform: scaleX(-1);
-    filter: FlipH;
-    -ms-filter: "FlipH";
-}
-
-
-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;
+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 {
@@ -2800,9 +2969,12 @@ a, button, input, textarea {
     -webkit-touch-callout: none;
 }
 
+ul li {
+    list-style: none;
+}
+
 a,
 button,
-.checkselect label:hover,
 .radial-menu-item {
     cursor: pointer;
 }
@@ -2824,7 +2996,6 @@ h3 {
     font-weight: bold;
     margin-bottom: 10px;
 }
-
 h4, h5 {
     font-size: 12px;
     font-weight: bold;
@@ -2852,30 +3023,24 @@ p {
     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;
 }
 
 /* Forms
 ------------------------------------------------------- */
-
 textarea  {
     resize: vertical;
     font:normal 12px/20px "-apple-system", BlinkMacSystemFont,
@@ -2896,7 +3061,6 @@ input[type=email] {
     border: 1px solid #ccc;
     padding: 5px 20px 5px 10px;
     height: 30px;
-    width: 100%;
     border-radius: 4px;
     text-overflow: ellipsis;
 }
@@ -2912,7 +3076,14 @@ input[type=email] {
 
 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"],
@@ -2922,6 +3093,7 @@ input[type="radio"] {
     height: 14px;
     margin-right: 5px;
     margin-top: 3px;
+    cursor: pointer;
 }
 [dir='rtl'] input[type="checkbox"],
 [dir='rtl'] input[type="radio"] {
@@ -2930,26 +3102,16 @@ input[type="radio"] {
     margin-right: 0;
 }
 
-/* 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;
-}
-
 /* tables */
-
 table {
     background-color: #fff;
     border-collapse: collapse;
     width: 100%;
     border-spacing: 0;
 }
-
 table th {
     text-align: left;
 }
-
 table.tags, table.tags td, table.tags th {
     border: 1px solid #ccc;
     padding: 4px;
@@ -2961,58 +3123,9 @@ 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: #fff;
-    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
@@ -3021,22 +3134,18 @@ ul li { list-style: none;}
     background: #fff;
     color: #333;
 }
-
 .fillL2 {
     background: #f6f6f6;
     color: #333;
 }
-
 .fillL3 {
     background: #ececec;
     color: #333;
 }
-
 .fillD {
     background: rgba(0,0,0,.5);
     color: #fff;
 }
-
 .fillD2 {
     background: rgba(0,0,0,.75);
     color: #fff;
@@ -3059,41 +3168,17 @@ 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;
 }
 
-.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;
@@ -3111,55 +3196,13 @@ 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;
-}
-[dir='rtl'] button.minor {
-    right: auto;
-}
-
-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;
-}
-[dir='rtl'] .button-wrap:last-of-type {
-    padding-left: 0;
-    padding-right: 10px;
+button.disabled {
+    background-color: rgba(255,255,255,.25);
+    color: rgba(0,0,0,.4);
+    cursor: not-allowed;
 }
 
 .joined button {
@@ -3174,14 +3217,12 @@ button.minor:hover {
 .fillL .joined button {
     border-right: 1px solid #fff;
 }
-
 .joined button:first-child {
     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;
@@ -3190,102 +3231,36 @@ button.minor:hover {
     border-radius: 4px 0 0 4px;
 }
 
+
+/* Action buttons */
 button.action {
     background: #7092ff;
     color: #fff;
 }
-
-button[disabled].action,
-button[disabled].action:hover {
-    background: #cccccc;
-    color: #888;
-}
-
 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 .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: 9.3333%;
-}
-[dir='rtl'] button.save.has-count .count {
-    margin-left: auto;
-    margin-right: 8%;
-}
-
-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;
-}
-[dir='rtl'] button.save.has-count .count::before {
-    border-left: 6px solid rgba(255,255,255,.5);
-    border-right: none;
-    left: auto;
-    right: -6px;
-}
-
-.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: 7px;
-}
-[dir='rtl'] button.add-note svg.icon {
-    margin-left: 7px;
-    margin-right: unset;
-}
-.help-wrap svg.icon.pre-text.add-note {
-    margin-left: 3px;
-    margin-right: 3px;
+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;
@@ -3315,15 +3290,12 @@ button.add-note svg.icon {
 .icon.light {
     color: #fff;
 }
-
 .icon.created {
     color: #00ca07;
 }
-
 .icon.modified {
     color: #666;
 }
-
 .icon.deleted {
     color: #ea0000;
 }
@@ -3336,31 +3308,170 @@ button.add-note svg.icon {
     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;
+    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;
-}
-
-[dir='rtl'] #bar .spacer,
-[dir='rtl'] #bar .button-wrap,
-[dir='rtl'] #bar .button-wrap button {
-    float: right;
+}
+
+.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;
@@ -3390,7 +3501,9 @@ button.add-note svg.icon {
 }
 
 .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;
@@ -3398,7 +3511,9 @@ button.add-note svg.icon {
     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;
@@ -3439,32 +3554,35 @@ button.add-note svg.icon {
     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;
-
 }
 
 .footer > a {
     justify-content: center;
 }
 
-.sidebar-component .body {
-    width: 100%;
-    overflow: auto;
-    top: 60px;
-    bottom: 0;
-    position: absolute;
+.header-container {
+    display: flex;
+    justify-content: space-between;
 }
 
+.header-block-outer {
+    width: 20%;
+}
 
-/* Hide-Toggle
-------------------------------------------------------- */
+.header-block-close {
+    display: flex;
+    justify-content: flex-end;
+}
 
+/* Hide/Toggle collapsable sections (aka Disclosure)
+------------------------------------------------------- */
 .hide-toggle .icon.pre-text {
     vertical-align: text-top;
     width: 16px;
@@ -3485,20 +3603,44 @@ a.hide-toggle {
 }
 
 
-/* Inspector
+/* 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 {
@@ -3509,9 +3651,41 @@ a.hide-toggle {
     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 {
@@ -3527,24 +3701,17 @@ a.hide-toggle {
     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;
 }
 
@@ -3574,12 +3741,12 @@ a.hide-toggle {
     font-weight: bold;
 }
 
-/* Feature list */
 
+/* Feature List / Search Results
+------------------------------------------------------- */
 .feature-list  {
     width: 100%;
 }
-
 .no-results-item,
 .geocode-item,
 .feature-list-item {
@@ -3589,21 +3756,34 @@ a.hide-toggle {
     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: #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;
@@ -3619,24 +3799,19 @@ a.hide-toggle {
 .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;
 }
-
 .feature-list-item:hover .entity-type {
     color: #597be7;
 }
-
 .feature-list-item .entity-name {
     font-weight: normal;
     color: #666;
@@ -3648,21 +3823,22 @@ a.hide-toggle {
 }
 
 
-/* Presets
+/* Preset List and Icons
 ------------------------------------------------------- */
-
-/* Preset grid  */
-
 .preset-list  {
     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 {
@@ -3671,11 +3847,45 @@ a.hide-toggle {
     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;
@@ -3739,6 +3949,9 @@ a.hide-toggle {
     left: 8px;
     margin: auto;
 }
+.preset-icon-44.line-geom {
+    top: 2px;
+}
 
 .preset-icon-44 .icon {
     width: 44px;
@@ -3763,6 +3976,9 @@ a.hide-toggle {
     left: 18px;
     margin: auto;
 }
+.preset-icon-24.line-geom {
+    top: 12px;
+}
 
 .preset-icon-24 .icon {
     width: 24px;
@@ -3774,6 +3990,10 @@ a.hide-toggle {
     right: auto;
 }
 
+[dir='rtl'] .preset-list-button-wrap .preset-icon-44 {
+    right: 8px;
+}
+
 [dir='rtl'] .preset-list-button-wrap .preset-icon-28 {
     right: 16px;
 }
@@ -3783,6 +4003,9 @@ a.hide-toggle {
 }
 
 .preset-list-button .label {
+    display: flex;
+    flex-flow: row wrap;
+    align-items: center;
     background-color: #f6f6f6;
     text-align: left;
     position: absolute;
@@ -3791,12 +4014,7 @@ a.hide-toggle {
     right: 0;
     padding: 5px 10px;
     left: 60px;
-    line-height: 50px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
-    border-radius: 0 3px 3px 0;
 }
 [dir='rtl'] .preset-list-button .label {
     text-align: right;
@@ -3804,40 +4022,68 @@ a.hide-toggle {
     right: 60px;
     border-left: none;
     border-right: 1px solid rgba(0, 0, 0, .1);
-    border-radius: 3px 0 0 3px;
+}
+[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;
 }
 
-.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: 32px;
-    background: #fafafa;
+    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 {
-    left: 0;
-    right: auto;
-    border-radius: 3px 0 0 3px;
+    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;
 }
 
-.current .preset-list-button,
-.current .preset-list-button .label {
-    background-color: #E8EBFF;
+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;
 }
 
 .category .preset-list-button:after,
@@ -3857,52 +4103,97 @@ a.hide-toggle {
 }
 
 .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 */
+/* Quick links
+------------------------------------------------------- */
+.quick-links {
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: flex-end;
+    padding: 0 20px;
+}
+.quick-link {
+    margin: 0 5px;
+}
+
+.data-editor .quick-links,
+.error-editor .quick-links,
+.note-editor .quick-links {
+    padding: 5px 0 0 0;
+}
+
 
+/* Entity/Preset Editor
+------------------------------------------------------- */
+.entity-issues,
 .preset-editor {
     overflow: hidden;
-    padding-bottom: 10px;
+    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-issues .disclosure-wrap-entity_issues:empty,
 .preset-editor .form-fields-container:empty {
     display: none;
 }
-
-.entity-editor-pane .preset-list-item .preset-list-button-wrap {
+.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;
@@ -3916,586 +4207,453 @@ a.hide-toggle {
     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;
 }
-[dir='rtl'] .form-label {
-    padding: 5px 10px 5px 0;
-}
-
-.form-label-button-wrap {
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 100%;
-    width: 100%;
-    background: transparent;
-    text-align: right;
-}
-[dir='rtl'] .form-label-button-wrap {
-    text-align: left;
-}
-
-.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: 32px;
     height: 100%;
     border-radius: 0;
     background: #f6f6f6;
 }
-[dir='rtl'] .form-label button {
+[dir='rtl'] .form-field-label button {
     border-left: none;
     border-right: 1px solid #ccc;
-    border-radius: 4px 0 0 0;
-    width: 31px;
 }
-.form-label button:hover {
+.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;
-    position: relative;
-}
-
-.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 .structure-extras-wrap,
-.inspector-hover .comments-container .comment,
-.inspector-hover input,
-.inspector-hover textarea,
-.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;
 }
-
-.inspector-hover a,
-.inspector-hover .form-field-multicombo .chips,
-.inspector-hover .checkselect label:last-of-type {
-    color: #666;
+.form-field-input-wrap > textarea {
+    height: 65px;
+    border-radius: 0 0 4px 4px;
 }
 
-.inspector-hover .form-field-multicombo .chips {
-    background: #eee;
+/* 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;
 }
-
-/* no scrollbars */
-.inspector-hover div {
-    overflow-x: hidden;
-    overflow-y: hidden;
-}
-
-/* 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;
-    overflow: hidden;
-    opacity: 0 !important;
-    border-width: 0;
-    margin: 0;
-    padding: 0;
+[dir='rtl'] .form-field-button {
+    border-left-width: 1px;
+    border-right-width: 0;
 }
-
-/* hide but preserve in layout */
-.inspector-hover .entity-editor-pane button.minor,
-.inspector-hover .combobox-caret,
-.inspector-hover .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 .footer * {
-    opacity: 0;
+.form-field-button:hover {
+    background-color: #f1f1f1;
 }
-
-/* Styles for raw tag inspector on hover */
-.inspector-hover .tag-row .key-wrap,
-.inspector-hover .tag-row .form-field.input-wrap-position {
-    width: 50%;
+.form-field-button .icon {
+    fill: #333;
+    opacity: .5;
 }
 
-.inspector-hover .tag-row:first-child input.value {
-    border-top-right-radius: 4px;
-}
-[dir='rtl'] .inspector-hover .tag-row:first-child input.value {
-    border-top-right-radius: 0;
-    border-top-left-radius: 4px;
-}
 
-.inspector-hover .tag-row:last-child input.value {
+/* round corners of first/last child elements */
+.form-field-input-wrap > button:last-of-type {
     border-bottom-right-radius: 4px;
 }
-[dir='rtl'] .inspector-hover .tag-row:last-child input.value {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 4px;
-}
-
-.inspector-hover .tag-row:last-child input.key {
+[dir='rtl'] .form-field-input-wrap > button:last-of-type {
     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;
-}
-
-.inspector-hover .more-fields {
-    max-height: 0;
-    margin-bottom: -10px;
-}
-
-/* Unstyle button fields */
-.inspector-hover .toggle-list 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 .toggle-list button.active {
-    padding-left: 10px;
-}
 
-/* Add placeholder only on hover for radio buttons */
-.inspector-hover .toggle-list .placeholder {
-    color: #a9a9a9;
-    padding: 5px 10px;
-    opacity: 1;
-    line-height: 20px;
-    width: 100%;
+/* Field - Access, Cycleway
+------------------------------------------------------- */
+.form-field-input-access,
+.form-field-input-cycleway {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
 }
 
-/* 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;
+/* 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;
+    width: 100%;
 }
-
-/* adding additional preset fields */
-
-.more-fields {
-    padding: 0 20px 20px 20px;
-    font-weight: bold;
-}
-.changeset-editor .more-fields {
-    padding: 15px 20px 0 20px;
-}
-
-.more-fields label {
+.form-field ul.labeled-inputs li {
+    border-top: 1px solid #ccc;
     display: flex;
     flex-flow: row nowrap;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.more-fields input {
-    margin-left: 10px;
-    flex: 1 1 50%;
-}
-[dir='rtl'] .more-fields input {
-    margin-left: auto;
-    margin-right: 10px;
-}
-
-.preset-input-wrap .label {
-    height: 30px;
-    background: #F6F6F6;
-    padding: 5px 10px;
-}
-
-[dir='rtl'] .preset-input-wrap .col6 {
-    float: right;
 }
-
-
-/* preset form access */
-/* preset form cycleway */
-/* preset form structure extras */
-
-.structure-extras-wrap li,
-.form-field-cycleway .preset-input-wrap li,
-.form-field-access .preset-input-wrap li {
-    border-bottom: 1px solid #ccc;
+.form-field ul.labeled-inputs li:first-child {
+    border-top: 0;
 }
-.structure-extras-wrap li:last-child,
-.form-field-cycleway .preset-input-wrap li:last-child,
-.form-field-access .preset-input-wrap li:last-child {
-    border-bottom: 0;
+.form-field ul.labeled-inputs li > span,
+.form-field ul.labeled-inputs li > div {
+    flex: 1 1 auto;
+    width: 100%;
+    border-radius: 0;
 }
-.structure-input-type-wrap input,
-.structure-input-layer-wrap input,
-.preset-input-cycleway-wrap input,
-.preset-input-access-wrap input {
+.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'] .structure-input-type-wrap input,
-[dir='rtl'] .structure-input-layer-wrap input,
-[dir='rtl'] .preset-input-cycleway-wrap input,
-[dir='rtl'] .preset-input-access-wrap input {
+[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;
 }
 
-.preset-input-wrap li:last-child input {
-    border-bottom-right-radius: 4px;
-}
 
+/* 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 {
+.structure-extras-wrap > ul.labeled-inputs {
     border: 1px solid #ccc;
     border-radius: 4px;
 }
-.structure-extras-wrap li:first-child span {
-    border-top-left-radius: 4px;
-}
-.structure-extras-wrap li:first-child input {
-    border-top-right-radius: 4px;
+
+
+/* Field - Combo / Multicombo
+------------------------------------------------------- */
+.form-field-input-combo > input:only-of-type {
+    border-radius: 0 0 4px 4px;
 }
-.structure-extras-wrap li:last-child span {
-    border-bottom-left-radius: 4px;
+.form-field-input-combo.empty-combobox input,
+.form-field-input-multicombo .empty-combobox input {
+    padding-right: 10px;
+    padding-left: 10px;
 }
-.structure-extras-wrap li:last-child input {
-    border-bottom-right-radius: 4px;
+.form-field-input-combo.empty-combobox .combobox-caret,
+.form-field-input-multicombo .empty-combobox .combobox-caret {
+    display: none;
 }
-[dir='rtl'] .structure-extras-wrap li:first-child span {
-    border-top-left-radius: 0;
-    border-top-right-radius: 4px;
-}
-[dir='rtl'] .structure-extras-wrap li:first-child input {
-    border-top-right-radius: 0;
-    border-top-left-radius: 4px;
-}
-[dir='rtl'] .structure-extras-wrap li:last-child span {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 4px;
-}
-[dir='rtl'] .structure-extras-wrap li:last-child input {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 4px;
-}
-
-
-/* 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;
-}
-
-.form-field-multicombo:focus {
-    border-bottom: 0px;
+
+.form-field-input-multicombo ul.chiplist {
+    padding: 5px 7px 5px 7px;
+    background: #fff;
+    display: block;
+    border-radius: 0 0 4px 4px;
 }
 
-.form-field-multicombo.active {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
+.form-field-input-multicombo li.chips {
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    line-height: 25px;
+    padding: 2px 0px 2px 5px;
 }
-
-.form-field-multicombo li {
+.form-field-input-multicombo li {
     display: inline-flex;
     flex-flow: row nowrap;
     align-items: center;
-    background-color: #eff2f7;
-    border: 1px solid #ccd5e3;
-    border-radius: 4px;
-    line-height: 25px;
-    padding: 2px 5px;
     margin: 3px;
+    border-radius: 4px;
 }
 
-.form-field-multicombo a {
+.form-field-input-multicombo a {
     font-family: Arial, Helvetica, sans-serif !important;
     font-size: 16px !important;
-    line-height: 24px;
+    line-height: 22px;
     float: right;
-    margin: 1px 0 0 5px;
-    padding: 0;
+    padding: 0px 5px 0px 5px;
+    margin: 0;
     cursor: pointer;
     color: #a6b4ce;
 }
 
-.form-field-multicombo input {
+.form-field-input-multicombo .input-wrap {
     border: 1px solid #ddd;
     width: 100px;
-    margin: 3px;
     height: 31px;
 }
-
-.form-field-multicombo .combobox-caret {
-    margin: 3px 3px 3px -30px;
+.form-field-input-multicombo input {
+    border: none;
+    width: 100%;
+    height: 100%;
 }
 
-.form-field-multicombo input:focus {
+.form-field-input-multicombo input:focus {
     border-radius: 4px !important;
 }
 
-
-/* preset form numbers */
-
-input[type=number] {
-    position: relative;
-    padding-right: 20%;
+.form-field-input-multicombo .full-line-chips li {
+    display: block;
 }
-
-.spin-control {
-    width: 64px;
-    height: 30px;
-    display: inline-block;
-    margin-left: -64px;
-    margin-bottom: -11px;
-    position: relative;
+.form-field-input-multicombo .full-line-chips li:not(:last-child) {
+    margin-bottom: 6px;
 }
-[dir='rtl'] .spin-control{
-    margin-left: 0;
-    margin-right: -64px;
+.form-field-input-multicombo .full-line-chips .input-wrap {
+    width: auto;
 }
 
-.spin-control button {
-    right: 1px;
-    position: relative;
-    float: left;
-    height: 100%;
-    width: 32px;
-    border-left: 1px solid #ccc;
-    border-radius: 0;
-    background: rgba(0, 0, 0, 0);
+
+/* 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;
 }
-[dir='rtl'] .spin-control button{
-    border-left: 0;
-    border-right: 1px solid #ccc;
+.form-field-input-number > input:only-of-type {
+    border-radius: 0 0 0 4px;
 }
-
-.spin-control button.decrement {
-    border-bottom-right-radius: 3px;
+[dir='rtl'] .form-field-input-number > input:only-of-type {
+    border-radius: 0 0 4px 0;
 }
-[dir='rtl'] .spin-control button.decrement {
-    border-bottom-right-radius: 0;
+.form-field-input-number > button:last-of-type {
+    border-radius: 0 0 4px 0;
 }
-[dir='rtl'] .spin-control button.increment {
-    border-bottom-left-radius: 3px;
-    right: 0;
+[dir='rtl'] .form-field-input-number > button:last-of-type {
+    border-radius: 0 0 0 4px;
 }
 
-.spin-control button.decrement::after,
-.spin-control button.increment::after {
-    content:"";
+/* 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;
 }
-
-.spin-control button.decrement::after {
+.form-field-input-number button.decrement::after {
     border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
-
-.spin-control button.increment::after {
+.form-field-input-number button.increment::after {
     border-bottom: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
 
 
-/* preset form checkbox */
-
-.checkselect label:last-of-type {
-    display: block;
+/* 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;
 }
-
-.checkselect label:hover {
-    background: #f1f1f1;
-}
-
-.checkselect .set {
-    color: inherit;
+.form-field-input-check > input[type="checkbox"] {
+    flex: 0 1 auto;
+    min-height: 20px;
+    width: 20px;
 }
-
-.checkselect label:not(.set) input[type="checkbox"] {
-    opacity: .5;
+.form-field-input-check > span {
+    flex: 1 1 auto;
 }
-
-.checkselect .reverser.button {
-    display: block;
-    float: right;
+.form-field-input-check > .reverser.button {
+    flex: 0 1 auto;
     background-color: #eff2f7;
     border: 1px solid #ccd5e3;
     border-radius: 2px;
     padding: 0px 8px;
 }
-[dir='rtl'] .checkselect .reverser.button {
-    float: left;
-}
-.checkselect .reverser.button.hide {
+.form-field-input-check > .reverser.button.hide {
     display: none;
 }
 
-/* Preset form radio button */
-
-.toggle-list button.remove {
-    border-radius: 0 0 3px 3px;
+.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;
 }
 
-.toggle-list button.remove .icon {
-    position: absolute;
-    left: 5px;
+
+/* 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;
 }
 
-.toggle-list button.remove::before {
-    content: none;
+/* 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;
 }
 
-#preset-input-maxspeed_advisory,
-#preset-input-maxspeed {
-    border-right: none;
+
+/* Field - Maxspeed
+------------------------------------------------------- */
+.form-field-input-maxspeed > input:first-of-type {
     border-radius: 0 0 0 4px;
-    width: 80%;
 }
-[dir='rtl'] #preset-input-maxspeed_advisory,
-[dir='rtl'] #preset-input-maxspeed {
-    border-right: 1px solid #ccc;
+[dir='rtl'] .form-field-input-maxspeed > input:first-of-type {
     border-radius: 0 0 4px 0;
 }
-
-.form-field .maxspeed-unit {
+.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;
-    width: 20%;
 }
-[dir='rtl'] .form-field .maxspeed-unit {
+[dir='rtl'] .form-field-input-maxspeed > input:last-of-type {
     border-right: 0;
     border-radius: 0 0 0 4px;
 }
 
-/* Wikipedia field */
-.form-field .wiki-lang {
-    border-radius: 0;
-}
-.form-field .wiki-title {
-    padding-right: 20%;
-}
-[dir='rtl'] .form-field .wiki-title {
-    padding-left: 20%;
-    padding-right: 10px;
-}
-
-.form-field .wiki-title ~ .combobox-caret {
-    right: 32px;
-}
-[dir='rtl'] .form-field .wiki-title ~ .combobox-caret {
-    right: auto;
-    left: 32px;
-}
 
-/* Localized field */
-.form-field .localized-main {
-    padding-right: 12%;
+/* Field - Localized Name
+------------------------------------------------------- */
+.form-field-input-localized > input.localized-main {
+    border-radius: 0 0 0 4px;
 }
-[dir='rtl'] .form-field .localized-main {
-    padding-left: 12%;
-    padding-right: 10px;
+[dir='rtl'] .form-field-input-localized > input.localized-main {
+    border-radius: 0 0 4px 0;
 }
-
-.form-field .button-input-action {
-    position: relative;
-    right: 1px;
-    width: 32px;
-    margin-left: -32px;
-    border: 1px solid #ccc;
-    border-top-width: 0;
-    border-right-width: 0;
+.form-field-input-localized > button.localized-add {
     border-radius: 0 0 4px 0;
-    height: 30px;
-    vertical-align: top;
 }
-[dir='rtl'] .form-field .button-input-action {
-    margin-left: 0;
-    margin-right: -32px;
-    border-right-width: 1px;
+[dir='rtl'] .form-field-input-localized > button.localized-add {
     border-radius: 0 0 0 4px;
 }
 
-.form-field .localized-wrap {
-    padding: 0 10px;
+.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;
 }
 
-.form-field .localized-wrap .entry {
+/* nested subfields for name in different languages */
+.localized-multilingual {
+    padding: 0 10px;
+    flex-basis: 100%;
+}
+.localized-multilingual .entry {
     position: relative;
     overflow: hidden;
 }
 
-.form-field .localized-wrap .entry::before {
+/* draws a little line connecting the multilingual field up to the name field */
+.localized-multilingual .entry::before {
     content: "";
     display: block;
     position: absolute;
@@ -4508,23 +4666,38 @@ input[type=number] {
     margin: auto;
 }
 
-.form-field .localized-wrap .entry .localized-lang {
+.localized-multilingual .entry .localized-lang {
     border-radius: 0;
     border-top-width: 0;
+    width: 100%;
 }
-
-.form-field .localized-wrap .entry .localized-value {
+.localized-multilingual .entry .localized-value {
     border-top-width: 0;
     border-radius: 0 0 4px 4px;
+    width: 100%;
 }
 
-.form-field .localized-wrap .form-label button {
-    border-top-right-radius: 3px;
+
+/* Field - Address
+------------------------------------------------------- */
+.form-field-input-address {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
+    border: 1px solid #ccc;
+    border-top: 0px;
 }
 
-/* Preset form address */
+.addr-row {
+    flex: 1 1 auto;
+    display: flex;
+    width: 100%;
+    min-height: 30px;
+}
 
-.addr-row input {
+.addr-row > input {
+    flex: 1 1 auto;
+    border-radius: 0;
     border-right: 0;
     border-bottom: 0;
 }
@@ -4536,25 +4709,18 @@ input[type=number] {
 .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 input {
-    border-radius: 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;
 }
@@ -4562,13 +4728,58 @@ input[type=number] {
     border-radius: 0 0 0 4px;
 }
 
-/* Restrictions editor */
 
-.form-field-restrictions .restriction-controls-container {
+/* 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;
-    border-top: 1px solid #ccc;
     width: 100%;
     padding: 5px;
+    border-top: 1px solid #ccc;
+    border-radius: 0 0 4px 4px;
 }
 
 .restriction-controls-container .restriction-controls {
@@ -4603,16 +4814,16 @@ input[type=number] {
     vertical-align: middle;
 }
 
-.form-field-restrictions .restriction-container {
+.form-field-input-restrictions .restriction-container {
     position: relative;
     height: 370px;
 }
 /* zero width space, so container takes up space */
-.form-field-restrictions .restriction-container:after {
+.form-field-input-restrictions .restriction-container:after {
     content: '\200b';
 }
 
-.form-field-restrictions svg.surface {
+.form-field-input-restrictions svg.surface {
     width: 100%;
     height: 100%;
 }
@@ -4653,30 +4864,23 @@ input[type=number] {
     color: #78f;
 }
 
-/* Changeset editor while comment text is empty */
 
+/* Field - Changeset Comment
+------------------------------------------------------- */
 .form-field-comment:not(.present) #preset-input-comment {
     border-color: rgb(230, 100, 100);
 }
-
-.form-field-comment:not(.present) .form-label {
+.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) .form-label {
-}
-
-.form-field-comment:not(.present) .form-label-button-wrap {
-    border-color: rgb(230, 100, 100);
-}
-
 .form-field-comment:not(.present) button {
     border-color: rgb(230, 100, 100);
 }
 
-/* combobox dropdown */
 
+/* Field - Combobox
+------------------------------------------------------- */
 div.combobox {
     z-index: 9999;
     display: none;
@@ -4716,6 +4920,7 @@ div.combobox {
     width: 30px;
     margin-left: -30px;
     vertical-align: top;
+    cursor: pointer;
 }
 [dir='rtl'] .combobox-caret {
   margin-left: 0;
@@ -4733,8 +4938,17 @@ div.combobox {
     border-right: 5px solid transparent;
 }
 
-/* Field Help */
+/* 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;
+}
+
 
+/* Field Help
+------------------------------------------------------- */
 .field-help-body {
     display: block;
     position: absolute;
@@ -4775,6 +4989,7 @@ div.combobox {
 }
 .field-help-nav-item.active {
     color: #7092ff;
+    border-bottom: 2px solid;
 }
 .field-help-nav-item:hover {
     color: #597be7;
@@ -4834,23 +5049,64 @@ div.combobox {
 }
 
 
-/* Raw Tag Editor */
-
-.tag-list {
-    padding-top: 10px;
+/* More Fields dropdown
+------------------------------------------------------- */
+.more-fields {
+    padding: 0 20px 20px 20px;
+    font-weight: bold;
+}
+.changeset-editor .more-fields {
+    padding: 15px 20px 0 20px;
 }
 
-.tag-row {
-    width: 100%;
-    position: relative;
-    clear: both;
+.more-fields label {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.more-fields input {
+    margin-left: 10px;
+    flex: 1 1 50%;
+}
+[dir='rtl'] .more-fields input {
+    margin-left: auto;
+    margin-right: 10px;
+}
+
+.form-field-input-wrap .label {
+    height: 30px;
+    background: #f6f6f6;
+    padding: 5px 10px;
+}
+
+
+/* Raw Tag Editor
+------------------------------------------------------- */
+.tag-list {
+    padding-top: 10px;
+}
+.tag-row {
+    width: 100%;
+    position: relative;
+}
+.tag-row .inner-wrap {
+    display: flex;
+    flex-flow: row nowrap;
+    width: 100%;
+    position: relative;
+}
+.tag-row .key-wrap,
+.tag-row .value-wrap {
+    flex: 1 1 50%;
 }
 
 .tag-row.readonly,
 .tag-row.readonly input.key,
 .tag-row.readonly input.value,
 .tag-row.readonly button.remove {
-    color: #777777;
+    color: #777;
     background-color: #eee;
     cursor: not-allowed;
 }
@@ -4861,22 +5117,13 @@ div.combobox {
     border-radius: 0;
     border-bottom: 1px solid #ccc;
     border-left: 1px solid #ccc;
+    width: 100%;
 }
 [dir='rtl'] .tag-row input {
     border-left: none;
     border-right: 1px solid #ccc;
 }
 
-.tag-row .key-wrap,
-.tag-row .input-wrap-position {
-    width: 40%;
-    float: left;
-    height: 30px;
-}
-[dir='rtl'] .tag-row .key-wrap,
-[dir='rtl'] .tag-row .input-wrap-position {
-    float: right;
-}
 
 .tag-row input.key {
     font-weight: bold;
@@ -4902,17 +5149,15 @@ div.combobox {
 .tag-row:first-child input.value {
     border-top: 1px solid #ccc;
 }
-
 .tag-row button {
-    position: absolute;
+    flex: 0 0 32px;
     height: 31px;
-    right: 10%;
+    width: 32px;
     border: 1px solid #ccc;
     border-top-width: 0;
     border-left-width: 0;
 }
 [dir='rtl'] .tag-row button {
-    left: 10%;
     border-left-width: 1px;
     border-right-width: 0;
 }
@@ -4920,11 +5165,9 @@ div.combobox {
 .tag-row button:hover {
     background: #f1f1f1;
 }
-
 .tag-row button .icon {
     opacity: .5;
 }
-
 .tag-row:first-child button {
     border-top-width: 1px;
 }
@@ -4946,138 +5189,99 @@ div.combobox {
 }
 
 .tag-row .tag-reference-button {
-    right: 0;
     border-radius: 0;
-    width: 10%;
-    top: 0;
-    background: #fafafa;
 }
 [dir='rtl'] .tag-row .tag-reference-button {
-    left: auto;
-    right: auto;
-    margin-right: 35px;
     border-left-width: 1px;
     border-right-width: 0;
 }
 
-/* Adding form fields to tag editor */
-
-.raw-tag-editor .add-tag {
-    width: 40%;
-    height: 30px;
-    border-top: 0;
-    background: rgba(0,0,0,.5);
-    border-radius: 0 0 4px 4px;
-}
-
-.raw-tag-editor .add-tag:hover {
-    background: rgba(0,0,0,.8);
-}
-
-.raw-tag-editor .add-tag .label {
-    display: none;
-}
-
 /* Tag reference */
-
-button.minor.tag-reference-loading {
+.tag-reference-loading {
     background-color: #f5f5f5;
 }
-
 .tag-reference-loading .icon {
     background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
     background-position: 0 0;
 }
 
 .tag-reference-body {
+    flex: 1 1 auto;
+    width: 100%;
     overflow: hidden;
-    clear: both;
 }
-
-.tag-reference-body .tag-reference-description {
-    margin: 10px 5px 0 5px;
+.tag-reference-body.expanded {
+    padding-bottom: 10px;
 }
-
-.tag-reference-body a {
-    display: block;
+.tag-reference-description {
+    margin: 10px 5px;
 }
-
-.tag-reference-body .tag-reference-description:last-child,
-.tag-reference-body a:last-child {
-    margin-bottom: 15px;
+.tag-reference-link {
+    display: block;
 }
 
 .preset-list .tag-reference-body {
     position: relative;
     width: 100%;
 }
-
 .raw-tag-editor .tag-reference-body {
-    float: left;
     width: 100%;
 }
-
 .raw-tag-editor .tag-row.readonly .tag-reference-body {
     background: #f6f6f6;
     color: #333;
 }
-
-.raw-tag-editor .tag-row:not(:last-child) .tag-reference-body {
+.raw-tag-editor .tag-row:not(:last-child) .tag-reference-body.expanded {
     border-bottom: 1px solid #ccc;
 }
-
 .raw-tag-editor .tag-row.readonly .tag-reference-body.expanded {
     border-top: 1px solid #ccc;
 }
 
-img.tag-reference-wiki-image {
-    float: right;
-    width: 33.3333%;
-    width: -webkit-calc(33.3333% - 10px);
-    width: calc(33.3333% - 10px);
-    border-radius: 4px;
-    max-height: 200px;
-    margin: 10px 5px 15px 20px;
-}
-
-
-/* Raw relation membership editor */
 
+/* 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,
-.raw-membership-editor .member-row {
-    position: relative;
-}
-
 .raw-member-editor .member-row .member-entity-name,
 .raw-membership-editor .member-row .member-entity-name {
     font-weight: normal;
     padding-left: 10px;
 }
 
+[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-input-member > input.member-role {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .form-field-input-member > input.member-role {
+    border-radius: 0 0 4px 0;
+}
+
+.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;
+}
+
 .member-incomplete .member-delete {
     display: none;
 }
 
 .member-row-new .member-entity-input {
+    flex: 1 1 100%;
     border-radius: 4px 4px 0 0;
-    border: 1px solid #cfcfcf;
-}
-
-.add-relation {
-    width: 40%;
-    height: 30px;
-    background: rgba(0,0,0,.5);
-    border-radius: 4px;
-    margin-top: 10px;
+    border: 0;
 }
 
-.add-relation:hover {
-    background: rgba(0,0,0,.8);
+/* preserve extra space at bottom of inspector to allow for dropdown options - #5280 */
+.raw-membership-editor.inspector-inner {
+    margin-bottom: 150px;
 }
 
 /* hidden field to prevent user from tabbing out of the sidebar */
@@ -5088,29 +5292,388 @@ input.key-trap {
     border: 1px solid rgba(0,0,0,0);
 }
 
-/* Fullscreen button */
-div.full-screen {
-    float: right;
-    width: 40px;
-    margin-right: 10px;
+
+/* add tag, add relation buttons */
+.add-row {
+    display: flex;
+    width: 100%;
+    flex-flow: row nowrap;
+}
+.add-row .add-tag,
+.add-row .add-relation,
+.add-row .space-value {
+    flex: 1 1 50%;
+}
+.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);
 }
 
-div.full-screen .tooltip {
-    min-width: 160px;
+.add-tag {
+    border-radius: 0 0 4px 4px;
+}
+.add-relation {
+    margin-top: 10px;
+    border-radius: 4px;
 }
 
-div.full-screen > button, div.full-screen > button.active {
+
+/* 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;
+}
+.inspector-hover .preset-list-button,
+.inspector-hover .tag-row input {
+    background: #f6f6f6;
+}
+
+.inspector-hover .entity-issues .issue,
+.inspector-hover .entity-issues .issue li {
+    border: 1px solid #ccc;
+}
+.inspector-hover .entity-issues .issue .icon {
+    color: #666;
+}
+
+.inspector-hover a,
+.inspector-hover .form-field-input-multicombo .chips,
+.inspector-hover .form-field-input-check span {
+    color: #666;
+}
+
+.inspector-hover .form-field-input-multicombo .chips {
+    background: #eee;
+    border: 1px solid #ccc;
+}
+
+/* no scrollbars */
+.inspector-hover div {
+    overflow-x: hidden;
+    overflow-y: hidden;
+}
+
+/* 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;
+}
+
+/* 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;
+}
+
+/* Styles for raw tag inspector on hover */
+.inspector-hover .tag-row .key-wrap,
+.inspector-hover .tag-row .value-wrap {
+    height: 31px;
+}
+
+.inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 4px;
+}
+[dir='rtl'] .inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 0;
+    border-top-left-radius: 4px;
+}
+
+.inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 4px;
+}
+
+.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;
+}
+
+.inspector-hover .more-fields {
+    max-height: 0;
+    margin-bottom: -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;
+}
+
+/* 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%;
+    border: 0;
+}
+.inspector-hover .form-field-input-radio .structure-extras-wrap {
+    border: 0;
+}
+
+
+/* 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;
+}
+
+.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;
+}
+[dir='rtl'] .note-header-icon,
+[dir='rtl'] .error-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
+}
+
+.note-header-icon .icon-wrap,
+.error-header-icon .icon-wrap {
+    position: absolute;
+    top: 0px;
+}
+
+.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;
+}
+[dir='rtl'] .note-header-label,
+[dir='rtl'] .error-header-label {
+    border-radius: 5px 0 0 5px;
+}
+
+.note-category {
+    margin: 20px 0px;
+}
+
+.comments-container {
+    background: #ececec;
+    padding: 1px 10px;
+    border-radius: 8px;
+    margin-top: 20px;
+}
+
+.comment {
+    background-color: #fff;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin: 10px auto;
+    display: flex;
+    flex-flow: row nowrap;
+}
+.comment-avatar {
+    padding: 10px;
+    flex: 0 0 62px;
+}
+.comment-avatar .icon.comment-avatar-icon {
     width: 40px;
     height: 40px;
-    background: transparent;
+    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;
 }
 
-div.full-screen > button:hover {
-    background-color: rgba(0, 0, 0, .8);
+.comment-metadata {
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+.comment-author {
+    font-weight: bold;
+    color: #333;
+}
+.comment-date {
+    color: #aaa;
+}
+.comment-text {
+    color: #333;
+    margin-top: 10px;
+    overflow-y: auto;
+    max-height: 250px;
+}
+.comment-text::-webkit-scrollbar {
+    border-left: none;
+}
+
+.note-save,
+.error-save {
+    padding-top: 20px;
+}
+
+.error-details {
+    padding: 10px;
+}
+.error-details-container {
+    background: #ececec;
+    padding: 10px;
+    margin-top: 20px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
+}
+.error-details-description {
+    margin-bottom: 10px;
+}
+.error-details-description-text::first-letter {
+    text-transform: capitalize;
+}
+[dir='rtl'] .error-details-description-text::first-letter {
+    text-transform: none;  /* #5877 */
+}
+
+.note-save .new-comment-input,
+.error-save .new-comment-input {
+    width: 100%;
+    height: 100px;
+    max-height: 300px;
+    min-height: 100px;
+}
+
+.note-save .detail-section,
+.error-save .detail-section {
+    margin: 10px 0;
+}
+
+.note-report {
+    float: right;
+}
+
+
+/* Custom Data Editor
+------------------------------------------------------- */
+.data-header {
+    background-color: #f6f6f6;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+}
+
+.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;
+}
+[dir='rtl'] .data-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
+}
+
+.data-header-icon .icon-wrap {
+    position: absolute;
+    top: 0px;
+}
+
+.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;
+}
+[dir='rtl'] .data-header-label {
+    border-radius: 5px 0 0 5px;
 }
 
-/* Map Controls */
+/* 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%;
+}
 
+
+/* Map Controls
+------------------------------------------------------- */
 .map-controls {
     right: 0;
     top: 132px;
@@ -5118,27 +5681,54 @@ div.full-screen > button:hover {
     position: fixed;
     z-index: 100;
 }
-[dir='rtl'] .map-controls {
-    left: 0;
-    right: auto;
+[dir='rtl'] .map-controls {
+    left: 0;
+    right: auto;
+}
+
+.map-control > button {
+    position: relative;
+    width: 40px;
+    background: rgba(0,0,0,.5);
+    border-radius: 0;
+}
+
+.map-control > button:hover {
+    background: rgba(0, 0, 0, .8);
+}
+
+.map-control > button.active,
+.map-control > button.active:hover {
+    background: #7092ff;
+}
+
+
+/* Fullscreen Button (disabled)
+------------------------------------------------------- */
+div.full-screen {
+    display: inline-block;
+    width: 40px;
+    margin-right: 10px;
+    display: none;
+}
+
+div.full-screen .tooltip {
+    min-width: 160px;
 }
 
-.map-control > button {
+div.full-screen > button, div.full-screen > button.active {
     width: 40px;
-    background: rgba(0,0,0,.5);
-    border-radius: 0;
+    height: 40px;
+    background: transparent;
 }
 
-.map-control > button:hover {
-    background: rgba(0, 0, 0, .8);
+div.full-screen > button:hover {
+    background-color: rgba(0, 0, 0, .8);
 }
 
-.map-control > button.active,
-.map-control > button.active:hover {
-    background: #7092ff;
-}
 
-/* Zoomer */
+/* Zoom Buttons
+------------------------------------------------------- */
 .zoombuttons > button.zoom-in {
     border-radius: 4px 0 0 0;
 }
@@ -5146,7 +5736,9 @@ div.full-screen > button:hover {
     border-radius: 0 4px 0 0;
 }
 
-/* Geolocator */
+
+/* Geolocate Button
+------------------------------------------------------- */
 .geolocate-control {
     margin-bottom: 10px;
 }
@@ -5157,7 +5749,9 @@ div.full-screen > button:hover {
     border-radius: 0 0 4px 0;
 }
 
-/* Pane Buttons */
+
+/* Background / Map Data / Help Pane buttons
+------------------------------------------------------- */
 .help-control > button {
     border-radius: 0 0 0 4px;
 }
@@ -5177,8 +5771,8 @@ div.full-screen > button:hover {
 }
 
 
-/* Background / Map Data Settings */
-
+/* Background / Map Data Settings
+------------------------------------------------------- */
 .map-data-control,
 .background-control {
     position: relative;
@@ -5195,11 +5789,11 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
-.layer-list li {
-    position: relative;
+.layer-list > li {
     height: 30px;
     background-color: #fff;
     color: #7092ff;
+    position: relative;
 }
 
 .layer-list:empty {
@@ -5209,23 +5803,21 @@ 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;
@@ -5237,11 +5829,7 @@ div.full-screen > button:hover {
     float: right;
 }
 
-[dir='rtl'] .list-item-gpx-browse svg {
-    transform: rotateY(180deg);
-}
-
-[dir='rtl'] .list-item-mvt-browse svg {
+[dir='rtl'] .list-item-data-browse svg {
     transform: rotateY(180deg);
 }
 
@@ -5264,9 +5852,204 @@ div.full-screen > button:hover {
     text-overflow: ellipsis;
 }
 
+.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;
+}
+
+.map-data-pane .layer-list button .icon,
+.background-pane .layer-list button .icon {
+    opacity: 0.5;
+}
+
+.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;
+}
+
+.map-data-pane .vectortile-container .vectortile-header {
+    padding-bottom: 5px;
+}
+.map-data-pane .vectortile-container .vectortile-footer {
+    padding-bottom: 10px;
+}
+
+
+/* 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 */
 
+/* Background - Display Options Sliders
+------------------------------------------------------- */
 .display-options-container {
     padding: 10px;
 }
@@ -5299,9 +6082,9 @@ div.full-screen > button:hover {
 }
 
 
-/* Adjust Alignment controls */
-
-.background-control .nudge-container {
+/* Background - Adjust Alignment
+------------------------------------------------------- */
+.background-pane .nudge-container {
     border: 1px solid #ccc;
     border-radius: 4px;
     padding: 10px;
@@ -5402,89 +6185,69 @@ div.full-screen > button:hover {
    cursor: move;
 }
 
-.background-control .nudge.right::after {
+.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 {
+.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 {
+.background-pane .nudge.top::after {
     border-right: 5px solid transparent;
     border-left: 5px solid transparent;
     border-bottom: 5px solid #222;
 }
 
-.background-control .nudge.bottom::after {
+.background-pane .nudge.bottom::after {
     border-right: 5px solid transparent;
     border-left: 5px solid transparent;
     border-top: 5px solid #222;
 }
 
 
-.map-data-control .layer-list button,
-.background-control .layer-list button {
-    float: right;
-    height: 100%;
-    width: 10%;
-    border-left: 1px solid #ccc;
-    border-radius: 0;
-}
-[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;
-}
-
-.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;
-}
-[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;
-}
-
-/* Side panes */
+/* Side Panes - Background / Map Data / Help
+------------------------------------------------------- */
 .map-pane {
-    position: fixed;
+    position: absolute;
     top: 60px;
     bottom: 30px;
     right: 0;
+    width: 100%;
+    max-width: 400px;
+    min-width: 180px;
     padding-bottom: 50px;
     overflow: hidden;
-    z-index: -1;
+    z-index: 10;
 }
 [dir='rtl'] .map-pane {
     left: 0;
     right: auto !important;
 }
 
+.map-pane.help-wrap {
+    max-width: 600px;
+}
+
 .pane-heading {
     display: flex;
     flex-flow: row nowrap;
     justify-content: space-between;
     border-bottom: 1px solid #ccc;
+    height: 60px;
 }
 
 .pane-heading h2 {
-    margin: 15px 20px;
+    margin: 14px 20px;
 }
 
 .pane-heading button {
     width: 40px;
-    height: 61px;
+    height: 100%;
     border-radius: 0;
 }
 
@@ -5502,9 +6265,9 @@ div.full-screen > button:hover {
     padding-bottom: 15px;
 }
 
-/* Help */
-
 
+/* Help
+------------------------------------------------------- */
 .help-wrap p {
     font-size: 15px;
     margin-bottom: 20px;
@@ -5605,9 +6368,8 @@ div.full-screen > button:hover {
 }
 
 
-/* Tiles
+/* Raster Background Tiles
 ------------------------------------------------------- */
-
 img.tile {
     position: absolute;
     transform-origin: 0 0;
@@ -5667,7 +6429,6 @@ img.tile-debug {
 
 /* Map
 ------------------------------------------------------- */
-
 #map {
     position: relative;
     overflow: hidden;
@@ -5695,6 +6456,7 @@ img.tile-debug {
     bottom: 0;
 }
 
+
 /* Map-In-Map
 ------------------------------------------------------- */
 .map-in-map {
@@ -5752,7 +6514,7 @@ img.tile-debug {
 }
 
 
-/* Debug
+/* Debug Data
 ------------------------------------------------------- */
 .debug {
     stroke: currentColor;
@@ -5791,7 +6553,8 @@ img.tile-debug {
     padding: 0 5px;
 }
 
-/* Info Box
+
+/* Information Panels
 ------------------------------------------------------- */
 .info-panels {
     display: flex;
@@ -5848,7 +6611,6 @@ img.tile-debug {
 .panel-title button.close:hover {
     color: #fff;
 }
-
 .panel-title button.close .icon {
     height: 20px;
     width: 16px;
@@ -5897,9 +6659,8 @@ img.tile-debug {
 }
 
 
-/* About Section
+/* About Section, Attribution, Footer
 ------------------------------------------------------- */
-
 #about {
     width: 100%;
     position: absolute;
@@ -5964,8 +6725,9 @@ img.tile-debug {
     height: 30px;
 }
 
-/* footer flash message */
 
+/* Footer - Flash messages
+------------------------------------------------------- */
 #flash-wrap {
     display: flex;
     flex: 0 0 100%;
@@ -6047,8 +6809,8 @@ img.tile-debug {
 }
 
 
-/* footer scale */
-
+/* Footer - Scale bar, About, Source Switcher
+------------------------------------------------------- */
 #scale-block {
     vertical-align: bottom;
     width: 250px;
@@ -6094,7 +6856,6 @@ img.tile-debug {
     shape-rendering: crispEdges;
 }
 
-
 #about-list {
     text-align: right;
     margin-right: 10px;
@@ -6123,7 +6884,6 @@ img.tile-debug {
     padding: 5px 5px 5px 0;
 }
 
-
 #about-list li:last-child {
     border-left: 0;
     margin-left: 0;
@@ -6176,8 +6936,8 @@ img.tile-debug {
     color: #ccf;
 }
 
-/* Notification Badges */
-
+/* Notification Badges
+------------------------------------------------------- */
 /* For an icon (e.g. new version) */
 .badge {
     display: inline-block;
@@ -6202,7 +6962,7 @@ img.tile-debug {
     vertical-align: baseline;
     width: 11px;
     height: 11px;
-    fill: #fff;
+    color: #fff;
 }
 
 /* For text (e.g. upcoming events) */
@@ -6224,9 +6984,8 @@ img.tile-debug {
 }
 
 
-/* Modals
+/* Modals / Prompts
 ------------------------------------------------------- */
-
 .modal {
     top: 40px;
     display: inline-block;
@@ -6242,7 +7001,6 @@ img.tile-debug {
 .modal .loader {
     margin-bottom: 10px;
 }
-
 .modal .description {
     text-align: center;
 }
@@ -6256,7 +7014,6 @@ img.tile-debug {
     right: 0;
     overflow: auto;
 }
-
 .shaded:before {
     content:'';
     background: rgba(0,0,0,0.5);
@@ -6268,15 +7025,17 @@ img.tile-debug {
     padding: 20px;
     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;
@@ -6346,7 +7105,7 @@ img.tile-debug {
     color: #e06c5e;
 }
 
-/* Success Modal
+/* Success Screen / Community Index
 ------------------------------------------------------- */
 .save-success.body {
     overflow-y: scroll;
@@ -6476,6 +7235,7 @@ img.tile-debug {
 }
 .modal-shortcuts .tab.active {
     color: #7092ff;
+    border-bottom: 2px solid;
 }
 .modal-shortcuts .tab:hover {
     color: #597be7;
@@ -6506,13 +7266,11 @@ img.tile-debug {
 }
 
 .modal-shortcuts .shortcut-keys {
-    padding-right: 10px;
+    padding: 0 10px;
     color: #767676;
     text-align: right;
 }
 [dir='rtl'] .modal-shortcuts .shortcut-keys {
-    padding-right: auto;
-    padding-left: 10px;
     text-align: left;
 }
 
@@ -6548,6 +7306,26 @@ svg.mouseclick use.right {
 }
 
 
+/* 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 {
@@ -6607,10 +7385,6 @@ svg.mouseclick use.right {
     margin-bottom: 10px;
 }
 
-.mode-save .warning-section {
-    background: #ffb;
-}
-
 .mode-save .warning-section .changeset-list button {
     border-left: 1px solid #ccc;
 }
@@ -6645,9 +7419,9 @@ svg.mouseclick use.right {
 
 .changeset-list li:first-child { border-top: 0;}
 
+
 /* Conflict resolution
 ------------------------------------------------------- */
-
 .conflicts-help {
     padding: 20px;
     background-color: #ffffbb;
@@ -6695,9 +7469,9 @@ svg.mouseclick use.right {
     height: 30px;
 }
 
-/* Notices
-------------------------------------------------------- */
 
+/* Notices (Zoom in to Edit)
+------------------------------------------------------- */
 .notice {
     position: absolute;
     top: 45px;
@@ -6729,38 +7503,37 @@ svg.mouseclick use.right {
     margin-right: 0;
 }
 
+
 /* Tooltips
 ------------------------------------------------------- */
-
 .tooltip {
     position: absolute;
     display: none;
     color: #333;
     font-size: 12px;
+    white-space: initial;
+}
+.tooltip:not(.curtain-tooltip) {
+    pointer-events: none;
 }
-
 .tooltip.in {
     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;
@@ -6785,7 +7558,6 @@ svg.mouseclick use.right {
     position: absolute;
     background: transparent;
 }
-
 .tail::after {
     content: "";
     position: absolute;
@@ -6832,7 +7604,6 @@ svg.mouseclick use.right {
     border-color: transparent;
     border-style: solid;
 }
-
 .tooltip.top .tooltip-arrow {
     bottom: -5px;
     left: 50%;
@@ -6840,7 +7611,6 @@ svg.mouseclick use.right {
     border-top-color: #fff;
     border-width: 5px 5px 0;
 }
-
 .tooltip.right .tooltip-arrow {
     top: 50%;
     left: -5px;
@@ -6848,7 +7618,6 @@ svg.mouseclick use.right {
     border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
-
 .tooltip.left .tooltip-arrow {
     top: 50%;
     right: -5px;
@@ -6856,7 +7625,6 @@ svg.mouseclick use.right {
     border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }
-
 .tooltip.bottom .tooltip-arrow {
     top: -5px;
     left: 50%;
@@ -6867,7 +7635,7 @@ svg.mouseclick use.right {
 
 .tooltip-heading {
     font-weight: bold;
-    background: #F6F6F6;
+    background: #f6f6f6;
     padding: 10px;
     margin: -10px -10px 10px -10px;
     border-radius: 3px 3px 0 0;
@@ -6875,52 +7643,50 @@ svg.mouseclick use.right {
 }
 
 .keyhint-wrap {
-    background: #F6F6F6;
+    background: #f6f6f6;
     padding: 10px;
     margin: 10px -10px -10px -10px;
     border-radius: 0 0 3px 3px;
 }
-
 .tooltip-inner .keyhint {
     font-weight: bold;
     margin-left: 5px;
 }
 
-/* Exceptions for tooltip layouts */
+[dir='rtl'] .tooltip-inner .keyhint {
+    margin-left: 0;
+    margin-right: 5px;
+}
 
-/* make tooltips in panels dark */
+/* dark tooltips for sidebar / panels */
 .map-pane .tooltip.top .tooltip-arrow,
-.entity-editor-pane .tooltip.top .tooltip-arrow,
-.warning-section .tooltip.top .tooltip-arrow {
+#sidebar .tooltip.top .tooltip-arrow {
     border-top-color: #000;
 }
-
 .map-pane .tooltip.bottom .tooltip-arrow,
-.entity-editor-pane .tooltip.bottom .tooltip-arrow,
-.warning-section .tooltip.bottom .tooltip-arrow {
+#sidebar .tooltip.bottom .tooltip-arrow {
     border-bottom-color: #000;
 }
-
 .map-pane .tooltip.left .tooltip-arrow,
-.entity-editor-pane .tooltip.left .tooltip-arrow,
-.warning-section .tooltip.left .tooltip-arrow {
+#sidebar .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
-
 .map-pane .tooltip.right .tooltip-arrow,
-.entity-editor-pane .tooltip.right .tooltip-arrow,
-.warning-section .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,
-.entity-editor-pane .tooltip-inner,
-.warning-section .tooltip-inner {
+#sidebar .tooltip-inner,
+#sidebar .tooltip-heading,
+#sidebar .keyhint-wrap {
     background: #000;
     color: #ccc;
 }
+
+/* Exceptions for tooltip layouts */
+
 /* commit warning tooltips need to be closer */
 .warning-section .tooltip.top {
     margin-top: -5px;
@@ -6935,19 +7701,12 @@ svg.mouseclick use.right {
 }
 
 /* Move over tooltips that are near the edge of screen */
-.add-point .tooltip {
-    left: 33.3333% !important;
-}
-[dir='rtl'] .add-point .tooltip {
-    left: inherit !important;
-}
-
-.add-point .tooltip .tooltip-arrow {
-    left: 60px;
+button.sidebar-toggle .tooltip .tooltip-arrow {
+    left: 36px;
 }
-[dir='rtl'] .add-point .tooltip .tooltip-arrow {
+[dir='rtl'] button.sidebar-toggle .tooltip .tooltip-arrow {
     left: auto;
-    right: 60px;
+    right: 36px;
 }
 
 li:first-of-type .badge .tooltip,
@@ -6972,8 +7731,8 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
 }
 
 
-/* radial menu (deprecated) */
-
+/* Contextual Radial Menu (deprecated)
+------------------------------------------------------- */
 .radial-menu-tooltip {
     opacity: 0.8;
     display: none;
@@ -7011,8 +7770,9 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     color: rgba(40,40,40,.5);
 }
 
-/* edit menu */
 
+/* Contextual Edit Menu
+------------------------------------------------------- */
 .edit-menu-tooltip {
     display: none;
     position: absolute;
@@ -7046,13 +7806,14 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     color: #79f;
     pointer-events: none;
 }
-
 .edit-menu-item.disabled use {
     fill: rgba(32,32,32,.2);
     color: rgba(40,40,40,.2);
 }
 
 
+/* Lasso
+------------------------------------------------------- */
 .lasso-path {
     fill-opacity: 0.3;
     stroke: #fff;
@@ -7061,30 +7822,9 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     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;
@@ -7111,9 +7851,9 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     background-color: rgba(0,0,0,.05);
 }
 
+
 /* Intro walkthrough
  ----------------------------------------------------- */
-
 .curtain-darkness {
     pointer-events: all;
     fill-opacity: 0.7;