Update note comments to use friendly_date_ago helper

[rails.git] / vendor / assets / iD / iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 6ed4c3c09d859680b93dd4b8fe3276d8c1676cd7..03c942bb2d578448760d72015b01fd5cc1dc178f 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -122,7 +122,7 @@ input[type="radio"] {
  */
 
 input[type="search"] {
  */
 
 input[type="search"] {

-    -webkit-appearance: textfield; /* 1 */
+    -webkit-appearance: none; /* 1 */

     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box; /* 2 */
     box-sizing: border-box;
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box; /* 2 */
     box-sizing: border-box;


@@ -162,10 +162,19 @@ input::-moz-focus-inner {
     clear: both;
 }
 /* base styles */
     clear: both;
 }
 /* base styles */

-.layer-osm path:not(.oneway-marker-path) {                /* IE/Edge needs :not(.oneway) */
+.layer-osm path {

     fill: none;
 }
     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;
     fill: #333;
     fill-opacity: 0.75;
     stroke: #fff;


@@ -185,7 +194,10 @@ input::-moz-focus-inner {
 
 
 /* No interactivity except what we specifically allow */
 
 
 /* No interactivity except what we specifically allow */

-.layer-osm * {
+.data-layer.osm *,
+.data-layer.notes *,
+.data-layer.keepRight *,
+.data-layer.improveOSM * {

     pointer-events: none;
 }
 
     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 */
 
 /* `.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;
     pointer-events: fill;
     fill-opacity: 0.8;
     fill: currentColor;


@@ -213,6 +228,7 @@ input::-moz-focus-inner {
     stroke-linejoin: round;
 }
 
     stroke-linejoin: round;
 }
 

+

 /* `.target-nope` objects are explicitly forbidden to join to */
 .surface:not(.nope-disabled) .node.target.target-nope,
 .surface:not(.nope-disabled) .way.target.target-nope {
 /* `.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;
 }
 
     pointer-events: none !important;
 }
 

+/* points, notes & QA */

 
 

-/* points & notes */
-
+/* points, notes, markers */
+g.qa_error .stroke,

 g.note .stroke {
     stroke: #222;
     stroke-width: 1;
 g.note .stroke {
     stroke: #222;
     stroke-width: 1;


@@ -237,6 +254,7 @@ g.note .stroke {
     opacity: 0.6;
 }
 
     opacity: 0.6;
 }
 

+g.qa_error.active .stroke,

 g.note.active .stroke {
     stroke: #222;
     stroke-width: 1;
 g.note.active .stroke {
     stroke: #222;
     stroke-width: 1;


@@ -250,6 +268,8 @@ g.point .stroke {
     fill: #fff;
 }
 
     fill: #fff;
 }
 

+
+g.qa_error .shadow,

 g.point .shadow,
 g.note .shadow {
     fill: none;
 g.point .shadow,
 g.note .shadow {
     fill: none;


@@ -258,13 +278,14 @@ g.note .shadow {
     stroke-opacity: 0;
 }
 
     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.note.hover:not(.selected) .shadow,
 g.point.related:not(.selected) .shadow,
 g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
 

+g.qa_error.selected .shadow,

 g.note.selected .shadow,
 g.point.selected .shadow {
     stroke-opacity: 0.7;
 g.note.selected .shadow,
 g.point.selected .shadow {
     stroke-opacity: 0.7;


@@ -281,21 +302,17 @@ g.point ellipse.stroke {
 
 
 /* vertices and midpoints */
 
 
 /* vertices and midpoints */

-

 g.vertex .fill {
     fill: #000;
 }
 g.vertex .fill {
     fill: #000;
 }

-

 g.vertex .stroke {
     stroke: #666;
     stroke-width: 1;
     fill: white;
 }
 g.vertex .stroke {
     stroke: #666;
     stroke-width: 1;
     fill: white;
 }

-

 g.vertex.shared .stroke {
     fill: #bbb;
 }
 g.vertex.shared .stroke {
     fill: #bbb;
 }

-

 g.midpoint .fill {
     fill: #eee;
     stroke: #444;
 g.midpoint .fill {
     fill: #eee;
     stroke: #444;


@@ -323,10 +340,11 @@ g.vertex.selected .shadow {
 
 
 /* lines */
 
 
 /* lines */

-

 .preset-icon .icon.iD-other-line {
 .preset-icon .icon.iD-other-line {

-    color: #fff;
-    fill: #777;
+    color: #989898;
+}
+.preset-icon-container path.line.casing {
+    stroke: #afafaf;

 }
 
 path.line {
 }
 
 path.line {


@@ -343,6 +361,8 @@ path.shadow {
     stroke: #f6634f;
     stroke-width: 16;
     stroke-opacity: 0;
     stroke: #f6634f;
     stroke-width: 16;
     stroke-opacity: 0;

+    stroke-linecap: round;
+    stroke-linejoin: round;

 }
 
 path.shadow.related:not(.selected),
 }
 
 path.shadow.related:not(.selected),


@@ -361,7 +381,6 @@ path.line.stroke {
 
 
 /* Labels / Markers */
 
 
 /* Labels / Markers */

-

 text {
     font-size: 10px;
     color: #222;
 text {
     font-size: 10px;
     color: #222;


@@ -373,7 +392,8 @@ text {
 }
 
 .onewaygroup path.oneway,
 }
 
 .onewaygroup path.oneway,

-.viewfieldgroup path.viewfield {
+.viewfieldgroup path.viewfield,
+.sidedgroup path.sided {

     stroke-width: 6px;
 }
 
     stroke-width: 6px;
 }
 


@@ -401,7 +421,7 @@ text.pointlabel {
   dominant-baseline: auto;
 }
 
   dominant-baseline: auto;
 }
 

-.layer-labels-halo text {
+.labels-group.halo text {

     opacity: 0.7;
     stroke: #fff;
     stroke-width: 5px;
     opacity: 0.7;
     stroke: #fff;
     stroke-width: 5px;


@@ -409,9 +429,8 @@ text.pointlabel {
 }
 
 text.nolabel {
 }
 
 text.nolabel {

-    opacity: 0;
+    opacity: 0 !important;

 }
 }

-

 text.point {
     font-size: 10px;
 }
 text.point {
     font-size: 10px;
 }


@@ -422,24 +441,36 @@ text.point {
     stroke-width: 2px;
     stroke-miterlimit: 1;
 }
     stroke-width: 2px;
     stroke-miterlimit: 1;
 }

-

 .icon.areaicon {
     fill: #222;
     opacity: 0.8;
 }
 
 
 .icon.areaicon {
     fill: #222;
     opacity: 0.8;
 }
 
 

-/* Turn Restrictions */
+/* Wikidata-tagged */
+g.point.tag-wikidata path.stroke {
+    stroke-width: 3px;
+    stroke: #777;
+    fill: #ddd;
+}

 
 

-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
+
+/* 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;

 }
 
 }
 

-.form-field-restrictions .vertex {
-    cursor: auto !important;
-    pointer-events: none;
+/* Turn Restrictions */
+.points-group.turns g.turn rect,
+.points-group.turns g.turn circle {
+    fill: none;

 }
 
 /* Turn restriction paths and vertices */
 }
 
 /* Turn restriction paths and vertices */


@@ -469,10 +500,9 @@ g.turn circle {
     stroke: #68f;
 }
 
     stroke: #68f;
 }
 

-

 /* Default - light gray */
 path.area.stroke {
 /* Default - light gray */
 path.area.stroke {

-    stroke: #ddd;
+    stroke: rgb(170, 170, 170);

     stroke-width: 1;
 }
 path.area.fill {
     stroke-width: 1;
 }
 path.area.fill {


@@ -481,9 +511,9 @@ path.area.fill {
     fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }
     fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }

-.preset-icon-fill-area {
-    border: 1px solid rgb(170, 170, 170);
-    background-color: rgba(170, 170, 170, 0.3);
+.preset-icon-fill path.fill {
+    stroke: rgb(170, 170, 170);
+    fill: rgba(170, 170, 170, 0.3);

 }
 
 path.shadow.old-multipolygon,
 }
 
 path.shadow.old-multipolygon,


@@ -492,69 +522,73 @@ path.stroke.old-multipolygon {
     stroke-linecap: butt;
 }
 
     stroke-linecap: butt;
 }
 

+

 /* Green things */
 /* Green things */

-path.stroke.tag-landuse,

 path.stroke.tag-natural,
 path.stroke.tag-natural,

+path.stroke.tag-natural-wood,

 path.stroke.tag-leisure-nature_reserve,
 path.stroke.tag-leisure-pitch,
 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-recreation_ground,
+path.stroke.tag-landuse-forest,
+path.stroke.tag-landuse-grass,
+path.stroke.tag-barrier-hedge {

     stroke: rgb(140, 208, 95);
 }
     stroke: rgb(140, 208, 95);
 }

-path.fill.tag-landuse,

 path.fill.tag-natural,
 path.fill.tag-natural,

+path.fill.tag-natural-wood,

 path.fill.tag-leisure-nature_reserve,
 path.fill.tag-leisure-pitch,
 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-recreation_ground,
+path.fill.tag-landuse-forest,
+path.fill.tag-landuse-grass,
+path.fill.tag-barrier-hedge {

     stroke: rgba(140, 208, 95, 0.3);
     fill: rgba(140, 208, 95, 0.3);
 }
     stroke: rgba(140, 208, 95, 0.3);
     fill: rgba(140, 208, 95, 0.3);
 }

-.preset-icon-fill-area.tag-landuse,
-.preset-icon-fill-area.tag-natural,
-.preset-icon-fill-area.tag-leisure-nature_reserve,
-.preset-icon-fill-area.tag-leisure-pitch,
-.preset-icon-fill-area.tag-leisure-park {
-    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 */
 /* Blue things */

-path.stroke.tag-amenity-swimming_pool,
+path.stroke.tag-amenity-fountain,

 path.stroke.tag-leisure-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-natural-bay,
+path.stroke.tag-natural-water {

     stroke: rgb(119, 211, 222);
 }
     stroke: rgb(119, 211, 222);
 }

-path.fill.tag-amenity-swimming_pool,
+path.fill.tag-amenity-fountain,

 path.fill.tag-leisure-swimming_pool,
 path.fill.tag-leisure-swimming_pool,

-path.fill.tag-landuse-aquaculture,
-path.fill.tag-landuse-basin,
-path.fill.tag-landuse-harbour,
-path.fill.tag-landuse-reservoir,
+path.fill.tag-natural-bay,

 path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
 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-swimming_pool,
-.preset-icon-fill-area.tag-leisure-swimming_pool,
-.preset-icon-fill-area.tag-landuse-aquaculture,
-.preset-icon-fill-area.tag-landuse-basin,
-.preset-icon-fill-area.tag-landuse-harbour,
-.preset-icon-fill-area.tag-landuse-reservoir,
-.preset-icon-fill-area.tag-natural-water {
-    border-color: rgb(119, 211, 222);
-    background-color: rgba(119, 211, 222, 0.3);
+.pattern-color-waves,
+.pattern-color-water_standing,
+.pattern-color-pond {
+    fill: rgba(119, 211, 222, 0.3);

 }
 
 }
 

+

 /* Yellow things */
 /* 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-beachvolleyball,

+path.stroke.tag-leisure-pitch.tag-sport-baseball,
+path.stroke.tag-leisure-pitch.tag-sport-softball,
+path.stroke.tag-leisure-track,

 path.stroke.tag-natural-beach,
 path.stroke.tag-natural-sand,
 path.stroke.tag-natural-scrub,
 path.stroke.tag-natural-beach,
 path.stroke.tag-natural-sand,
 path.stroke.tag-natural-scrub,


@@ -566,6 +600,9 @@ path.stroke.tag-amenity-university {
     stroke: rgba(255, 255, 148, 0.75);
 }
 path.fill.tag-leisure-pitch.tag-sport-beachvolleyball,
     stroke: rgba(255, 255, 148, 0.75);
 }
 path.fill.tag-leisure-pitch.tag-sport-beachvolleyball,

+path.fill.tag-leisure-pitch.tag-sport-baseball,
+path.fill.tag-leisure-pitch.tag-sport-softball,
+path.fill.tag-leisure-track,

 path.fill.tag-natural-beach,
 path.fill.tag-natural-sand,
 path.fill.tag-natural-scrub,
 path.fill.tag-natural-beach,
 path.fill.tag-natural-sand,
 path.fill.tag-natural-scrub,


@@ -574,42 +611,44 @@ path.fill.tag-amenity-kindergarten,
 path.fill.tag-amenity-school,
 path.fill.tag-amenity-college,
 path.fill.tag-amenity-university {
 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);
-}
-.preset-icon-fill-area.tag-leisure-pitch.tag-sport-beachvolleyball,
-.preset-icon-fill-area.tag-natural-beach,
-.preset-icon-fill-area.tag-natural-sand,
-.preset-icon-fill-area.tag-natural-scrub,
-.preset-icon-fill-area.tag-amenity-childcare,
-.preset-icon-fill-area.tag-amenity-kindergarten,
-.preset-icon-fill-area.tag-amenity-school,
-.preset-icon-fill-area.tag-amenity-college,
-.preset-icon-fill-area.tag-amenity-university {
-    border-color: rgb(232, 232, 0);
-    background-color: rgba(255, 255, 148, 0.15);
+    stroke: rgba(255, 255, 148, 0.25);
+    fill: rgba(255, 255, 148, 0.25);
+}
+.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-beachvolleyball,
+.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-baseball,
+.preset-icon-fill path.area.stroke.tag-leisure-pitch.tag-sport-softball,
+.preset-icon-fill path.area.stroke.tag-leisure-track,
+.preset-icon-fill path.area.stroke.tag-natural-beach,
+.preset-icon-fill path.area.stroke.tag-natural-sand,
+.preset-icon-fill path.area.stroke.tag-natural-scrub,
+.preset-icon-fill path.area.stroke.tag-amenity-childcare,
+.preset-icon-fill path.area.stroke.tag-amenity-kindergarten,
+.preset-icon-fill path.area.stroke.tag-amenity-school,
+.preset-icon-fill path.area.stroke.tag-amenity-college,
+.preset-icon-fill path.area.stroke.tag-amenity-university {
+    stroke: rgb(232, 232, 0);
+}
+.pattern-color-beach,
+.pattern-color-sand,
+.pattern-color-scrub {
+    fill: rgba(255, 255, 148, 0.2);

 }
 
 }
 

+

 /* Gold things */
 /* Gold things */

-.pattern-color-construction {
-    fill: rgba(196, 189, 25, 0.3);
-}

 path.stroke.tag-landuse-residential,
 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 {
     stroke: rgba(196, 189, 25, 0.3);
     fill: rgba(196, 189, 25, 0.3);
 }
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
     stroke: rgba(196, 189, 25, 0.3);
     fill: rgba(196, 189, 25, 0.3);
 }

-.preset-icon-fill-area.tag-landuse-residential,
-.preset-icon-fill-area.tag-landuse.tag-status,
-.preset-icon-fill-area.tag-landuse-construction {
-    border-color: rgb(196, 189, 25);
-    background: rgba(196, 189, 25, 0.3);
+.pattern-color-construction {
+    fill: rgba(196, 189, 25, 0.3);

 }
 
 }
 

+

 /* Orange things */
 path.stroke.tag-landuse-retail,
 path.stroke.tag-landuse-commercial,
 /* Orange things */
 path.stroke.tag-landuse-retail,
 path.stroke.tag-landuse-commercial,


@@ -626,15 +665,11 @@ path.fill.tag-landuse-military {
     stroke: rgba(214, 136, 26, 0.3);
     fill: rgba(214, 136, 26, 0.3);
 }
     stroke: rgba(214, 136, 26, 0.3);
     fill: rgba(214, 136, 26, 0.3);
 }

-.preset-icon-fill-area.tag-landuse-retail,
-.preset-icon-fill-area.tag-landuse-commercial,
-.preset-icon-fill-area.tag-landuse-landfill,
-.preset-icon-fill-area.tag-military,
-.preset-icon-fill-area.tag-landuse-military {
-    border-color: rgb(214, 136, 26);
-    background-color: rgba(214, 136, 26, 0.3);
+.pattern-color-landfill {
+    fill: rgba(214, 136, 26, 0.3);

 }
 
 }
 

+

 /* Pink things */
 path.stroke.tag-landuse-industrial,
 path.stroke.tag-power-plant {
 /* Pink things */
 path.stroke.tag-landuse-industrial,
 path.stroke.tag-power-plant {


@@ -645,47 +680,52 @@ path.fill.tag-power-plant {
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }

-.preset-icon-fill-area.tag-landuse-industrial,
-.preset-icon-fill-area.tag-power-plant {
-    border-color: rgb(228, 164, 245);
-    background-color: rgba(228, 164, 245, 0.3);
-}
+

 
 /* Teal things */
 
 /* Teal things */

-.pattern-color-wetland {
-    fill: rgba(153, 225, 170, 0.3);
-}

 path.stroke.tag-natural-wetland {
     stroke: rgb(153, 225, 170);
 }
 path.stroke.tag-natural-wetland {
     stroke: rgb(153, 225, 170);
 }

-.preset-icon-fill-area.tag-natural-wetland {
-    border-color: rgb(153, 225, 170);
-    background-color: rgba(153, 225, 170, 0.2);
+.preset-icon-fill path.area.fill.tag-natural-wetland {
+    fill: 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 */
 /* 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-cemetery,
 path.stroke.tag-landuse-orchard,

+path.stroke.tag-landuse-vineyard,

 path.stroke.tag-landuse-meadow,
 path.stroke.tag-landuse-meadow,

-path.stroke.tag-landuse-farm,

 path.stroke.tag-landuse-farmland {
     stroke: rgb(191, 232, 63);
 }
 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-meadow,
-.preset-icon-fill-area.tag-landuse-farm,
-.preset-icon-fill-area.tag-landuse-farmland {
-    background-color: rgba(191, 232, 63, 0.2);
+.preset-icon-fill path.area.fill.tag-landuse-cemetery,
+.preset-icon-fill path.area.fill.tag-landuse-orchard,
+.preset-icon-fill path.area.fill.tag-landuse-vineyard,
+.preset-icon-fill path.area.fill.tag-landuse-meadow,
+.preset-icon-fill path.area.fill.tag-landuse-farmland {
+    fill: rgba(191, 232, 63, 0.2);
+}
+.pattern-color-cemetery,
+.pattern-color-cemetery_christian,
+.pattern-color-cemetery_buddhist,
+.pattern-color-cemetery_muslim,
+.pattern-color-cemetery_jewish,
+.pattern-color-orchard,
+.pattern-color-vineyard,
+.pattern-color-meadow,
+.pattern-color-farmland {
+    fill: rgba(191, 232, 63, 0.2);

 }
 
 }
 

+

 /* Tan things */
 path.stroke.tag-landuse-farmyard {
     stroke: rgb(245, 220, 186);
 /* Tan things */
 path.stroke.tag-landuse-farmyard {
     stroke: rgb(245, 220, 186);


@@ -694,647 +734,668 @@ path.fill.tag-landuse-farmyard {
     stroke: rgba(245, 220, 186, 0.3);
     fill: rgba(245, 220, 186, 0.3);
 }
     stroke: rgba(245, 220, 186, 0.3);
     fill: rgba(245, 220, 186, 0.3);
 }

-.preset-icon-fill-area.tag-landuse-farmyard {
-    border-color: rgb(226, 177, 111);
-    background: rgba(245, 220, 186, 0.3);
+.preset-icon-fill path.area.stroke.tag-landuse-farmyard {
+    stroke: rgb(226, 177, 111);
+}
+.pattern-color-farmyard {
+    fill: rgba(245, 220, 186, 0.3);

 }
 
 }
 

+

 /* Dark Gray things */
 path.stroke.tag-amenity-parking,
 /* 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-leisure-pitch.tag-sport-basketball,
 path.stroke.tag-leisure-pitch.tag-sport-skateboard,

+path.stroke.tag-man_made-adit,
+path.stroke.tag-man_made-groyne,
+path.stroke.tag-man_made-breakwater,

 path.stroke.tag-natural-bare_rock,
 path.stroke.tag-natural-bare_rock,

+path.stroke.tag-natural-cave_entrance,
+path.stroke.tag-natural-cliff,
+path.stroke.tag-natural-rock,

 path.stroke.tag-natural-scree,
 path.stroke.tag-natural-scree,

-path.stroke.tag-landuse-railway,
-path.stroke.tag-landuse-quarry {
-    stroke: #bbb;
+path.stroke.tag-natural-stone,
+path.stroke.tag-natural-shingle,
+path.stroke.tag-waterway-dam,
+path.stroke.tag-waterway-weir {
+    stroke: rgb(170, 170, 170);

 }
 path.fill.tag-amenity-parking,
 }
 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-leisure-pitch.tag-sport-basketball,
 path.fill.tag-leisure-pitch.tag-sport-skateboard,

+path.fill.tag-man_made-adit,
+path.fill.tag-man_made-groyne,
+path.fill.tag-man_made-breakwater,

 path.fill.tag-natural-bare_rock,
 path.fill.tag-natural-bare_rock,

+path.fill.tag-natural-cliff,
+path.fill.tag-natural-cave_entrance,
+path.fill.tag-natural-rock,

 path.fill.tag-natural-scree,
 path.fill.tag-natural-scree,

-path.fill.tag-landuse-railway,
-path.fill.tag-landuse-quarry {
+path.fill.tag-natural-stone,
+path.fill.tag-natural-shingle,
+path.fill.tag-waterway-dam,
+path.fill.tag-waterway-weir {

     stroke: rgba(140, 140, 140, 0.5);
     fill: rgba(140, 140, 140, 0.5);
 }
     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-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 {
-    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 {
 /* 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 {
     stroke: rgba(255, 255, 255, 0.3);
     fill: rgba(255, 255, 255, 0.3);
 }
 }
 path.fill.tag-natural-cave_entrance,
 path.fill.tag-natural-glacier {
     stroke: rgba(255, 255, 255, 0.3);
     fill: rgba(255, 255, 255, 0.3);
 }

-.preset-icon-fill-area.tag-natural-cave_entrance,
-.preset-icon-fill-area.tag-natural-glacier {
-    border-color: rgb(170, 170, 170);
-    background: rgba(170, 170, 170, 0.3);
+.preset-icon-fill path.fill.tag-natural-cave_entrance,
+.preset-icon-fill path.fill.tag-natural-glacier {
+    stroke: rgb(170, 170, 170);
+    fill: rgba(170, 170, 170, 0.3);

 }
 }

+preset-icon-container/* highways */

 
 

-/* highways */
-
+/* defaults */

 .preset-icon .icon.tag-highway.other-line {
     color: #fff;
     fill: #777;
 }
 .preset-icon .icon.tag-highway.other-line {
     color: #fff;
     fill: #777;
 }

-path.casing.tag-highway {
+path.line.casing.tag-highway {

     stroke: #444;
 }
     stroke: #444;
 }

-path.stroke.tag-highway {
+path.line.stroke.tag-highway {

     stroke: #ccc;
 }
 
     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 */
 /* wide highways */

-
-path.shadow.tag-highway {
+path.line.shadow.tag-highway {

     stroke-width: 20;
 }
     stroke-width: 20;
 }

-path.casing.tag-highway {
+path.line.casing.tag-highway {

     stroke-width: 10;
 }
     stroke-width: 10;
 }

-path.stroke.tag-highway {
+path.line.stroke.tag-highway {

     stroke-width: 8;
 }
     stroke-width: 8;
 }

-
-.low-zoom path.shadow.tag-highway {
+.low-zoom path.line.shadow.tag-highway {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-.low-zoom path.casing.tag-highway {
+.low-zoom path.line.casing.tag-highway {

     stroke-width: 7;
 }
     stroke-width: 7;
 }

-.low-zoom path.stroke.tag-highway {
+.low-zoom path.line.stroke.tag-highway {

     stroke-width: 5;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     stroke: #7f7f3f;
 }
 

-.preset-icon .icon.iD-highway-residential {
+.preset-icon .icon.tag-highway-residential {

     color: #fff;
     fill: #444;
 }
     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;
 }
     stroke: #fff;
 }

-path.casing.tag-highway-residential,
-path.casing.tag-residential {
+path.line.casing.tag-highway-residential,
+path.line.casing.tag-residential {

     stroke: #444;
 }
 
     stroke: #444;
 }
 

-.preset-icon .icon.iD-highway-unclassified {
+.preset-icon .icon.tag-highway-unclassified {

     color: #dca;
     fill: #444;
 }
     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;
 }
     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 */
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     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;
 }
     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;
 }
     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;
 }
 
     stroke-width: 1;
 }
 

-
-.preset-icon .icon.iD-highway-living-street {
+/* living streets */
+.preset-icon .icon.tag-highway-living-street {

     color: #bbb;
     fill: #ddd;
 }
     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;
 }
     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;
 }
 
     stroke: #fff;
 }
 

-.preset-icon .icon.iD-highway-footway.tag-highway-corridor,
-.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian {
+/* pedestrian streets and corridors */
+.preset-icon .icon.tag-highway-corridor,
+.preset-icon .icon.tag-highway-pedestrian {

     color: #8cd05f;
     fill: #fff;
 }
     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;
 }
     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;
 }
     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;
 }
 
     stroke: #8cd05f;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
 

-.preset-icon .icon.iD-highway-road {
+/* unknown roads */
+.preset-icon .icon.tag-highway-road {

     color: #9e9e9e;
     fill: #666;
 }
     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;
 }
     stroke: #9e9e9e;
 }

-path.casing.tag-highway-road,
-path.casing.tag-road {
+path.line.casing.tag-highway-road,
+path.line.casing.tag-road {

     stroke: #666;
 }
 
     stroke: #666;
 }
 

-.preset-icon .icon.iD-highway-service {
+/* service roads */
+.preset-icon .icon.tag-highway-service {

     color: #fff;
     fill: #666;
 }
     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;
 }
     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 */
     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;
 }
     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;
 }
     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;
 }
 
     stroke: #666;
 }
 

-.preset-icon .icon.iD-highway-track {
-    color: #eaeaea;
-    fill: #c5b59f;
-}
-path.stroke.tag-highway-track,
-path.stroke.tag-track {
+/* unmaintained track roads */
+path.line.stroke.tag-highway-track,
+path.line.stroke.tag-track {

     stroke: #c5b59f;
 }
     stroke: #c5b59f;
 }

-path.casing.tag-highway-track,
-path.casing.tag-track {
+path.line.casing.tag-highway-track,
+path.line.casing.tag-track {

     stroke: #746f6f;
 }
 
     stroke: #746f6f;
 }
 

-path.stroke.tag-highway-path,
-path.stroke.tag-highway-footway,
-path.stroke.tag-highway-cycleway,
-path.stroke.tag-highway-bridleway {
+/* paths */
+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;
 }
     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;
 }
 
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 

-path.casing.tag-highway-path,
-path.casing.tag-highway-path.tag-unpaved {
+/* style for features that should have highway=footway but don't yet */
+path.line.stroke.tag-crossing,
+path.line.stroke.tag-public_transport-platform,
+path.line.stroke.tag-highway-platform,
+path.line.stroke.tag-railway-platform,
+path.line.stroke.tag-man_made-pier {
+    stroke: #dca;
+}
+
+path.line.casing.tag-highway-path,
+path.line.casing.tag-highway-path.tag-unpaved,
+path.line.casing.tag-highway-footway.tag-public_transport-platform,
+path.line.casing.tag-highway-footway.tag-man_made-pier,
+path.line.casing.tag-highway.tag-crossing {

     stroke: #dca;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
     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;
 }
 
     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,
+.preset-icon .icon.tag-highway-footway.tag-public_transport-platform,
+.preset-icon .icon.tag-highway-footway.tag-man_made-pier {

     color: #988;
     fill: #dca;
 }
     color: #988;
     fill: #dca;
 }

-path.stroke.tag-highway-path {
+path.line.stroke.tag-highway-path {

     stroke: #988;
 }
 
     stroke: #988;
 }
 

+/* footways */

 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
 .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;
 }
     color: #988;
     fill: #fff;
 }

-path.stroke.tag-highway-footway {
+path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway_bus_stop,
+.preset-icon-container path.casing.tag-highway-footway {

     stroke: #988;
 }
     stroke: #988;
 }

+.preset-icon-container path.stroke.tag-highway-footway:not(.tag-crossing-marked):not(.tag-crossing-unmarked):not(.tag-man_made-pier):not(.tag-public_transport-platform) {
+    stroke: #fff;
+}

 
 

-
+/* cycleways */

 .preset-icon .icon.tag-route-bicycle,
 .preset-icon .icon.tag-route-bicycle,

-.preset-icon .icon.iD-highway-cycleway {
+.preset-icon .icon.tag-highway-cycleway {

     color: #58a9ed;
     fill: #fff;
 }
     color: #58a9ed;
     fill: #fff;
 }

-path.stroke.tag-highway-cycleway {
+path.line.stroke.tag-highway-cycleway,
+.preset-icon-container path.casing.tag-highway-cycleway {

     stroke: #58a9ed;
 }
     stroke: #58a9ed;
 }

+.preset-icon-container path.stroke.tag-highway-cycleway:not(.tag-crossing) {
+    stroke: #fff;
+}

 
 

+/* bridleways */

 .preset-icon .icon.tag-route-horse,
 .preset-icon .icon.tag-route-horse,

-.preset-icon .icon.iD-highway-bridleway {
+.preset-icon .icon.tag-highway-bridleway {

     color: #e06d5f;
     fill: #fff;
 }
     color: #e06d5f;
     fill: #fff;
 }

-path.stroke.tag-highway-bridleway {
+path.line.stroke.tag-highway-bridleway,
+.preset-icon-container path.casing.tag-highway-bridleway {

     stroke: #e06d5f;
 }
     stroke: #e06d5f;
 }

+.preset-icon-container path.stroke.tag-highway-bridleway {
+    stroke: #fff;
+}
+
+/* racetracks */
+.preset-icon .icon.tag-leisure-track {
+    color: rgb(229, 184, 43);
+}
+path.line.stroke.tag-leisure-track,
+.preset-icon-container path.casing.tag-highway.tag-leisure-track {
+    stroke: rgb(229, 184, 43);
+}
+.preset-icon-container path.line.stroke.tag-highway.tag-leisure-track {
+    stroke: #fff;
+}

 
 

-.preset-icon .icon.iD-highway-steps {
+/* steps */
+.preset-icon .icon.tag-highway-steps {

     color: #81d25c;
     fill: #fff;
 }
     color: #81d25c;
     fill: #fff;
 }

-path.stroke.tag-highway-steps {
-    stroke: #81d25c;
+path.line.stroke.tag-highway-steps {

     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
     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;
 }
     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;
 }
     stroke: #fff;
     stroke-linecap: round;
     stroke-dasharray: none;
 }

+path.line.stroke.tag-highway-steps,
+.preset-icon-container path.line.casing.tag-highway-steps {
+    stroke: #81d25c;
+}
+.preset-icon-container path.line.stroke.tag-highway-steps {
+    stroke: #fff;
+}
+
+
+/* crossings */
+path.line.stroke.tag-highway.tag-crossing-unmarked {
+    stroke-dasharray: 6, 4;
+}
+.low-zoom path.line.stroke.tag-highway.tag-crossing-unmarked {
+    stroke-dasharray: 3, 2;
+}
+path.line.stroke.tag-highway.tag-crossing-marked {
+    stroke-dasharray: 6, 3;
+}
+.low-zoom path.line.stroke.tag-highway.tag-crossing-marked {
+    stroke-dasharray: 3, 1.5;
+}
+path.line.stroke.tag-highway-footway.tag-crossing-marked {
+    stroke: #4c4444;
+}
+.preset-icon .icon.tag-highway-footway.tag-crossing-marked {
+    color: #4c4444;
+}
+path.line.stroke.tag-highway-footway.tag-crossing-unmarked {
+    stroke: #776a6a;
+}
+.preset-icon .icon.tag-highway-footway.tag-crossing-unmarked {
+    color: #776a6a;
+}
+path.line.stroke.tag-highway-cycleway.tag-crossing-marked {
+    stroke: #446077;
+}
+.preset-icon .icon.tag-highway-cycleway.tag-crossing-marked {
+    color: #446077;
+}
+

 
 /* highway midpoints */
 g.midpoint.tag-highway-corridor .fill,
 
 /* highway midpoints */
 g.midpoint.tag-highway-corridor .fill,


@@ -1352,37 +1413,41 @@ g.midpoint.tag-highway-bridleway .fill {
 /* aeroways */
 
 /* areas */
 /* 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;
 }
     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) */
 /* 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;
 }
     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;
 }
     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;
 }
     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;
 }
     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;
 }
     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;
 }
 
     stroke-width: 3;
 }
 


@@ -1391,54 +1456,51 @@ path.stroke.tag-taxiway {
     color: #ff0;
     fill: #666;
 }
     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;
 }
     stroke: #ff0;
 }

-path.casing.tag-aeroway-taxiway,
-path.casing.tag-taxiway {
+path.line.casing.tag-aeroway-taxiway,
+path.line.casing.tag-taxiway {

     stroke: #666;
 }
 
     stroke: #666;
 }
 

-

 /* wide aeroways (runway) */
 .preset-icon .icon.tag-aeroway-runway,
 .preset-icon .icon.tag-runway {
     color: #444;
     fill: #000;
 }
 /* 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;
 }
     stroke-width: 20;
 }

-path.casing.tag-aeroway-runway {
+path.line.casing.tag-aeroway-runway {

     stroke-width: 10;
     stroke: #000;
     stroke-linecap: square;
 }
     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;
 }
     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;
 }
     stroke-width: 16;
 }

-.low-zoom path.casing.tag-aeroway-runway {
+.low-zoom path.line.casing.tag-aeroway-runway {

     stroke-width: 7;
 }
     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;
 }
     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-container path.line.stroke.tag-aeroway-runway {
+    stroke-dasharray: 0, 14, 8, 14;

 }
 }

-

 /* railways */
 /* railways */

+
+/* defaults */

 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;
 .preset-icon .icon.tag-railway.other-line {
     color: #fff;
     fill: #777;


@@ -1448,49 +1510,45 @@ path.fill.tag-aeroway-runway {
     fill: #eee;
 }
 
     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 */
 /* narrow widths */

-path.shadow.tag-railway {
+path.line.shadow.tag-railway {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-path.casing.tag-railway {
+path.line.casing.tag-railway {

     stroke-width: 7;
 }
     stroke-width: 7;
 }

-path.stroke.tag-railway {
+path.line.stroke.tag-railway {

     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
     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;
 }
     stroke-width: 12;
 }

-.low-zoom path.casing.tag-railway {
+.low-zoom path.line.casing.tag-railway {

     stroke-width: 5;
 }
     stroke-width: 5;
 }

-.low-zoom path.stroke.tag-railway {
+.low-zoom path.line.stroke.tag-railway {

     stroke-width: 2;
     stroke-dasharray: 6,6;
 }
     stroke-width: 2;
     stroke-dasharray: 6,6;
 }

+.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) {
+    stroke-dasharray: 6;
+}

 
 

+path.line.casing.tag-railway.tag-railway-platform {
+    stroke-width: 0;
+}
+path.line.stroke.tag-railway.tag-railway-platform {
+    stroke-dasharray: none;
+}

 
 /* styles */
 
 /* styles */

-path.casing.tag-railway {
+path.line.casing.tag-railway {

     stroke: #555;
 }
     stroke: #555;
 }

-path.stroke.tag-railway {
+path.line.stroke.tag-railway {

     stroke: #eee;
 }
 
     stroke: #eee;
 }
 


@@ -1500,274 +1558,425 @@ path.stroke.tag-railway {
     color: #999;
     fill: #eee;
 }
     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;
 }
     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;
 }
 
 
     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;
 }
     stroke: #222;
 }

-path.stroke.tag-railway-subway {
+path.line.stroke.tag-railway-subway {

     stroke: #bbb;
 }
 /* waterways */
     stroke: #bbb;
 }
 /* waterways */

+
+/* defaults */

 .preset-icon .icon.tag-waterway.other-line {
 .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 {
 .preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {

-    color: #77d3de;
+    color: #7dd;

     fill: #fff;
 }
 
     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);
 }
     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) */
 }
 
 
 /* narrow waterways (default) */

-path.shadow.tag-waterway {
+path.line.shadow.tag-waterway {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-path.casing.tag-waterway {
+path.line.casing.tag-waterway {

     stroke-width: 7;
 }
     stroke-width: 7;
 }

-path.stroke.tag-waterway {
+path.line.stroke.tag-waterway {

     stroke-width: 5;
 }
 
     stroke-width: 5;
 }
 

-.low-zoom path.shadow.tag-waterway {
+.low-zoom path.line.shadow.tag-waterway {

     stroke-width: 12;
 }
     stroke-width: 12;
 }

-.low-zoom path.casing.tag-waterway {
+.low-zoom path.line.casing.tag-waterway {

     stroke-width: 5;
 }
     stroke-width: 5;
 }

-.low-zoom path.stroke.tag-waterway {
+.low-zoom path.line.stroke.tag-waterway {

     stroke-width: 3;
 }
 
 
 /* wide waterways (river) */
     stroke-width: 3;
 }
 
 
 /* wide waterways (river) */

-path.shadow.tag-waterway-river {
+path.line.shadow.tag-waterway-river {

     stroke-width: 20;
 }
     stroke-width: 20;
 }

-path.casing.tag-waterway-river {
+path.line.casing.tag-waterway-river {

     stroke-width: 10;
 }
     stroke-width: 10;
 }

-path.stroke.tag-waterway-river {
+path.line.stroke.tag-waterway-river {

     stroke-width: 8;
 }
 
     stroke-width: 8;
 }
 

-.low-zoom path.shadow.tag-waterway-river {
+.low-zoom path.line.shadow.tag-waterway-river {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-.low-zoom path.casing.tag-waterway-river {
+.low-zoom path.line.casing.tag-waterway-river {

     stroke-width: 7;
 }
     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 {
     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;
+}
+.low-zoom path.line.casing.tag-aerialway,
+.low-zoom path.line.casing.tag-attraction-summer_toboggan,
+.low-zoom path.line.casing.tag-attraction-water_slide,
+.low-zoom path.line.casing.tag-golf-cartpath,
+.low-zoom path.line.casing.tag-man_made-pipeline,
+.low-zoom path.line.casing.tag-natural-tree_row,
+.low-zoom path.line.casing.tag-piste {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-aerialway,
+.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
+.low-zoom path.line.stroke.tag-attraction-water_slide,
+.low-zoom path.line.stroke.tag-golf-cartpath,
+.low-zoom path.line.stroke.tag-man_made-pipeline,
+.low-zoom path.line.stroke.tag-natural-tree_row,
+.low-zoom path.line.stroke.tag-piste {
+    stroke-width: 3;

 }
 
 }
 

-path.stroke.tag-power {
-    stroke: #939393;
+
+/* ferry routes  */
+.preset-icon .icon.tag-route-ferry {
+    color: #58a9ed;
+    fill: #fff;
+}
+path.line.shadow.tag-route-ferry {
+    stroke-width: 16;
+}
+path.line.stroke.tag-route-ferry {
+    stroke-width: 3;
+    stroke-linecap: butt;
+    stroke-dasharray: 12,8;
+}
+.low-zoom path.line.shadow.tag-route-ferry {
+    stroke-width: 12;
+}
+.low-zoom path.line.stroke.tag-route-ferry,
+.preset-icon-container path.line.stroke.tag-route-ferry {

     stroke-width: 2;
     stroke-width: 2;

+    stroke-dasharray: 6,4;
+}
+path.line.stroke.tag-route-ferry {
+    stroke: #58a9ed;

 }
 }

-path.casing.tag-power {
+path.line.casing.tag-route-ferry {

     stroke: none;
 }
 
 
     stroke: none;
 }
 
 

-/* boundaries */
-path.stroke.tag-boundary {
-    stroke: #fff;
-    stroke-width: 2;
-    stroke-linecap: butt;
-    stroke-dasharray: 20, 5, 5, 5;
+/* aerialways */
+path.line.stroke.tag-aerialway {
+    stroke: #c55;

 }
 }

-path.casing.tag-boundary {
-    stroke: #82B5FE;
-    stroke-width: 6;
+path.line.casing.tag-aerialway {
+    stroke: #444;

 }
 
 }
 

-path.casing.tag-boundary-protected_area,
-path.casing.tag-boundary-national_park {
-    stroke: #b0e298;
+
+/* pistes */
+path.line.stroke.tag-piste {
+    stroke: #a9d;
+}
+path.line.casing.tag-piste {
+    stroke: #444;

 }
 
 
 }
 
 

-/* Tree Rows */
-path.shadow.tag-natural-tree_row {
-    stroke-width: 16;
-}
-path.casing.tag-natural-tree_row {
-    stroke-width: 7;
+/* Attractions */
+path.line.stroke.tag-attraction-summer_toboggan {
+    stroke: #9e9e9e;

 }
 }

-path.stroke.tag-natural-tree_row {
-    stroke-width: 5;
+path.line.casing.tag-attraction-summer_toboggan {
+    stroke: #666;

 }
 
 }
 

-.low-zoom path.shadow.tag-natural-tree_row {
-    stroke-width: 12;
+path.line.stroke.tag-attraction-water_slide {
+    stroke: #aae0cb;

 }
 }

-.low-zoom path.casing.tag-natural-tree_row {
-    stroke-width: 5;
+path.line.casing.tag-attraction-water_slide {
+    stroke: #3d6c71;

 }
 }

-.low-zoom path.stroke.tag-natural-tree_row {
-    stroke-width: 3;
+
+
+/* golf cartpaths (like service roads) */
+.preset-icon .icon.tag-golf-cartpath {
+    color: #dca;
+    fill: #666;
+}
+path.line.stroke.tag-golf-cartpath {
+    stroke: #dca;
+}
+path.line.casing.tag-golf-cartpath {
+    stroke: #666;
+}
+
+
+/* power and pipeline */
+.preset-icon .icon.tag-man_made-pipeline,
+.preset-icon .icon.tag-power {
+    color: #939393;
+    fill: #939393;
+}
+
+
+/* power */
+path.line.stroke.tag-power {
+    stroke: #939393;
+    stroke-width: 2;
+}
+path.line.casing.tag-power {
+    stroke: none;
+}
+
+
+/* pipeline */
+path.line.stroke.tag-man_made-pipeline {
+    stroke: #cbd0d8;
+    stroke-linecap: butt;
+    stroke-dasharray: 80, 1.25;
+}
+path.line.casing.tag-man_made-pipeline {
+    stroke: #666;
+}
+.low-zoom path.line.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 40, 1;
+}
+.preset-icon-container path.line.stroke.tag-man_made-pipeline {
+    stroke-dasharray: 19, 1;

 }
 
 
 }
 
 

-/* barriers */
-path.stroke.tag-barrier {
+/* 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;
     stroke: #ddd;

+}
+.preset-icon-container 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;
 }
     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;
 }
     stroke-width: 2px;
     stroke-linecap: butt;
     stroke-dasharray: 8, 2, 2, 2;
 }

+.preset-icon-container path.line.stroke.tag-barrier,
+.preset-icon-container path.line.stroke.tag-man_made-groyne,
+.preset-icon-container path.line.stroke.tag-man_made-breakwater {
+    stroke-dasharray: 1, 4, 6, 4;
+}

 
 
 /* bridges */
 
 
 /* bridges */

-path.casing.tag-bridge {
+path.line.casing.tag-bridge {

     stroke-opacity: 0.6;
     stroke: #000 !important;
     stroke-linecap: butt;
     stroke-dasharray: none;
 }
     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;
 }
     stroke-width: 24;
 }

-path.casing.tag-bridge {
+path.line.casing.tag-bridge {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-.low-zoom path.shadow.tag-bridge {
+.low-zoom path.line.shadow.tag-bridge {

     stroke-width: 16;
 }
     stroke-width: 16;
 }

-.low-zoom path.casing.tag-bridge {
+.low-zoom path.line.casing.tag-bridge {

     stroke-width: 10;
 }
 
     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;
 }
     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;
 }
 
     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;
 }
     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 */
     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;
 }
     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;
     stroke-opacity: 0.5;
     stroke-linecap: butt;
     stroke-dasharray: none;


@@ -1775,12 +1984,12 @@ path.casing.tag-tunnel {
 
 
 /* embankments / cuttings */
 
 
 /* embankments / cuttings */

-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
+path.line.shadow.tag-embankment,
+path.line.shadow.tag-cutting {

     stroke-width: 28;
 }
     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;
     stroke-opacity: 0.5;
     stroke: #000;
     stroke-width: 22;


@@ -1788,163 +1997,96 @@ path.casing.tag-cutting {
     stroke-linecap: butt;
 }
 
     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;
 }
     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 */
     stroke-width: 10;
 }
 
 
 /* Surface - unpaved */

-path.casing.tag-unpaved {
+path.line.casing.tag-unpaved {

     stroke: #ccc;
     stroke-linecap: butt;
     stroke-dasharray: 4, 3;
 }
     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;
 }
     stroke-dasharray: 3, 2;
 }

-path.casing.tag-bridge.tag-unpaved {
+path.line.casing.tag-bridge.tag-unpaved {

     stroke: #000;
     stroke-dasharray: 4, 3;
 }
     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;
 }
 
 
     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;
 }
     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;
 }
 
     stroke-dasharray: 5, 2;
 }
 

-
-/* Buildings */
-path.stroke.tag-building {
-    stroke: rgb(224, 110, 95);
-}
-path.fill.tag-building {
-    stroke: rgba(224, 110, 95, 0.3);
-    fill: rgba(224, 110, 95, 0.3);
-}
-.preset-icon-fill-area.tag-building {
-    border-color: rgb(224, 110, 95);
-    background-color: rgba(224, 110, 95, 0.3);
+/* Road Closed Status */
+.preset-icon .icon.tag-highway.tag-status-construction {
+    color: #fc6c14;
+    fill: #fff;

 }
 }

-
-
-/* "Special" paths - platforms, piers, crossings */
-.preset-icon .icon.tag-public_transport-platform,
-.preset-icon .icon.tag-railway-platform,
-.preset-icon .icon.tag-man_made-pier,
-.preset-icon .icon.tag-footway.tag-footway-crossing,
-.preset-icon .icon.tag-crossing {
-    color: #988;
-    fill: #dca;
+path.line.shadow.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 20;

 }
 }

-
-.preset-icon-fill-area.tag-public_transport-platform,
-.preset-icon-fill-area.tag-railway-platform,
-.preset-icon-fill-area.tag-man_made-pier,
-.preset-icon-fill-area.tag-footway.tag-footway-crossing,
-.preset-icon-fill-area.tag-crossing {
-    border-color: #988;
-    background-color: #dca;
+path.line.casing.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 10;
+    stroke-linecap: butt;
+    stroke-dasharray: none

 }
 }

-
-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 {
-    stroke-width: 16;
+path.line.stroke.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 8;
+    stroke-linecap: butt;
+    stroke-dasharray: 10, 10;

 }
 }

-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 {
-    stroke: #dca;
-    stroke-width: 5;
-    stroke-linecap: round;
-    stroke-dasharray: none;
+path.line.casing.tag-highway.tag-status.tag-status-construction,
+.preset-icon-container path.line.stroke.tag-highway.tag-status.tag-status-construction {
+    stroke: #fff;

 }
 }

-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 {
-    stroke: #988;
-    stroke-width: 3;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
+path.line.stroke.tag-highway.tag-status.tag-status-construction,
+.preset-icon-container path.line.casing.tag-highway.tag-status.tag-status-construction {
+    stroke: #fc6c14;

 }
 }

-
-.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 {
-    stroke-width: 12;
+.low-zoom path.line.shadow.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 16;

 }
 }

-.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 {
-    stroke-width: 3;
+.low-zoom path.line.casing.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 7;

 }
 }

-.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 {
-    stroke-width: 1;
-    stroke-linecap: butt;
-    stroke-dasharray: 3, 3;
+.low-zoom path.line.stroke.tag-highway.tag-status.tag-status-construction {
+    stroke-width: 5;
+    stroke-dasharray: 8, 8;

 }
 
 }
 

-g.midpoint.tag-public_transport-platform .fill,
-g.midpoint.tag-railway-platform .fill,
-g.midpoint.tag-man_made-pier .fill,
-g.midpoint.tag-footway.tag-footway-crossing .fill,
-g.midpoint.tag-crossing .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}

 
 

-/* marked crossings, zebras */
-.preset-icon .icon.tag-crossing.tag-crossing-marked,
-.preset-icon .icon.tag-crossing.tag-crossing-zebra {
-    color: #444;
-    fill: #dca;
-}
-path.casing.tag-crossing.tag-crossing-marked,
-path.casing.tag-crossing.tag-crossing-zebra {
-    stroke: #dca;
-}
-path.stroke.tag-crossing.tag-crossing-marked,
-path.stroke.tag-crossing.tag-crossing-zebra {
-    stroke: #444;
-    stroke-dasharray: 6, 4;
+/* Buildings */
+path.stroke.tag-building {
+    stroke: rgb(224, 110, 95);

 }
 }

-.low-zoom path.stroke.tag-crossing.tag-crossing-marked,
-.low-zoom path.stroke.tag-crossing.tag-crossing-zebra {
-    stroke-dasharray: 3, 2;
+path.fill.tag-building {
+    stroke: rgba(224, 110, 95, 0.3);
+    fill: rgba(224, 110, 95, 0.3);

 }
 }

-

 /* Cursors */
 
 .nope,
 /* Cursors */
 
 .nope,


@@ -2001,6 +2143,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
 }
 
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
 }
 

+.mode-add-preset #map,

 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,
 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,


@@ -2043,19 +2186,32 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }
 
     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 {
 .turn rect,
 .turn circle {
     cursor: pointer;
 }
 /* photo viewer div */
 #photoviewer {

-    position: absolute;
-    bottom: 30px;
+    position: relative;
+    flex-shrink: 0;
+    margin-bottom: 10px;

     width: 330px;
     height: 250px;
     padding: 5px;
     background-color: #fff;
 }
     width: 330px;
     height: 250px;
     padding: 5px;
     background-color: #fff;
 }

+[dir='ltr'] #photoviewer {
+    margin-left: 10px;
+    margin-right: 2px;
+}
+[dir='rtl'] #photoviewer {
+    margin-right: 10px;
+    margin-left: 2px;
+}

 
 @media screen and (min-width: 1600px) {
     #photoviewer {
 
 @media screen and (min-width: 1600px) {
     #photoviewer {


@@ -2145,7 +2301,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     cursor: pointer;
 }
 
     cursor: pointer;
 }
 

-.viewfield-group.selected * {
+.viewfield-group.currentView * {

     fill: #ffee00 !important;
 }
 .viewfield-group.hovered * {
     fill: #ffee00 !important;
 }
 .viewfield-group.hovered * {


@@ -2169,7 +2325,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-opacity: 0.9;
     fill-opacity: 0.9;
 }
     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;
     stroke: #222;
     stroke-width: 2;
     stroke-opacity: 1;


@@ -2189,12 +2345,12 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-width: 1;
     fill-opacity: 0.8;
 }
     stroke-width: 1;
     fill-opacity: 0.8;
 }

-.viewfield-group.highlighted.selected .viewfield {
+.viewfield-group.highlighted.currentView .viewfield {

     stroke-width: 1;
     fill-opacity: 0.9;
 }
 
     stroke-width: 1;
     fill-opacity: 0.9;
 }
 

-.viewfield-group.selected .viewfield-scale {
+.viewfield-group.currentView .viewfield-scale {

     transform: scale(2,2);
 }
 
     transform: scale(2,2);
 }
 


@@ -2204,7 +2360,7 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     stroke-opacity: 0.4;
 }
 .sequence.highlighted,
     stroke-opacity: 0.4;
 }
 .sequence.highlighted,

-.sequence.selected {
+.sequence.currentView {

     stroke-width: 4;
     stroke-opacity: 1;
 }
     stroke-width: 4;
     stroke-opacity: 1;
 }


@@ -2224,13 +2380,13 @@ path.stroke.tag-crossing.tag-crossing-zebra {
 
 
 /* Mapillary Image Layer */
 
 
 /* Mapillary Image Layer */

-.layer-mapillary-images {
+.layer-mapillary {

     pointer-events: none;
 }
     pointer-events: none;
 }

-.layer-mapillary-images .viewfield-group * {
+.layer-mapillary .viewfield-group * {

     fill: #55ff22;
 }
     fill: #55ff22;
 }

-.layer-mapillary-images .sequence {
+.layer-mapillary .sequence {

     stroke: #55ff22;
 }
 
     stroke: #55ff22;
 }
 


@@ -2248,20 +2404,20 @@ path.stroke.tag-crossing.tag-crossing-zebra {
     outline: 5px solid #eebb00;
     background-color: #eebb00;
 }
     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;
 }
 
 
 /* OpenStreetCam Image Layer */
     outline: 5px solid #ffee00;
     background-color: #ffee00;
 }
 
 
 /* OpenStreetCam Image Layer */

-.layer-openstreetcam-images {
+.layer-openstreetcam {

     pointer-events: none;
 }
     pointer-events: none;
 }

-.layer-openstreetcam-images .viewfield-group * {
+.layer-openstreetcam .viewfield-group * {

     fill: #20c4ff;
 }
     fill: #20c4ff;
 }

-.layer-openstreetcam-images .sequence {
+.layer-openstreetcam .sequence {

     stroke: #20c4ff;
 }
 
     stroke: #20c4ff;
 }
 


@@ -2395,42 +2551,30 @@ label.streetside-hires {
     color: #fff;
 }
 
     color: #fff;
 }
 

+/* OSM Notes and KeepRight Layers */

 
 

-/* OSM Notes Layer */
-.layer-notes {
-    pointer-events: none;
-}
-.layer-notes .note * {
-    pointer-events: none;
-}
-.mode-browse .layer-notes .note .note-fill,
-.mode-select .layer-notes .note .note-fill,
-.mode-select-data .layer-notes .note .note-fill,
-.mode-select-note .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 {
 .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 {
     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 {
     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;
 }
     stroke: #333;
     stroke-width: 40px;
 }


@@ -2450,9 +2594,118 @@ label.streetside-hires {
     height: 15px;
 }
 
     height: 15px;
 }
 

+/* adjustment for error icon */

 
 

-/* Custom Map Data (geojson, gpx, kml, vector tile) */
+.error-header-icon .preset-icon-28 {
+    top: auto;
+    left: auto;
+}
+
+.error-header-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* 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;
+}
+
+.keepRight.error_type-50 {    /* almost junctions */
+    color: #88f;
+}
+
+.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;
+}
+
+.keepRight.error_type-130 {   /* disconnected ways */
+    color: #fa3;
+}
+
+.keepRight.error_type-170 {   /* FIXME tag */
+    color: #ff0;
+}
+
+.keepRight.error_type-190 {   /* intersection without junction */
+    color: #f33;
+}
+
+.keepRight.error_type-200 {   /* overlapping ways */
+    color: #fdbf6f;
+}
+
+.keepRight.error_type-160,    /* railway layer conflict */
+.keepRight.error_type-230 {   /* layer conflict */
+    color: #b60;
+}
+
+.keepRight.error_type-280 {   /* boundary issues */
+    color: #5f47a0;
+}
+
+.keepRight.error_type-180,    /* relation without type */
+.keepRight.error_type-290 {   /* turn restriction issues */
+    color: #ace;
+}
+
+.keepRight.error_type-300,    /* missing maxspeed */
+.keepRight.error_type-390 {   /* missing tracktype */
+    color: #090;
+}

 
 

+.keepRight.error_type-360,    /* language unknown */
+.keepRight.error_type-370,    /* doubled places */
+.keepRight.error_type-410 {   /* website issues */
+    color: #f9b;
+}
+
+.keepRight.error_type-120,    /* way without nodes */
+.keepRight.error_type-400 {   /* geometry / turn angles */
+    color: #c35;
+}
+
+/* ImproveOSM Errors
+------------------------------------------------------- */
+
+.improveOSM.error_type-ow {   /* missing one way */
+    color: #1E90FF;
+}
+
+.improveOSM.error_type-mr-road {   /* missing road */
+    color: #B452CD;
+}
+.improveOSM.error_type-mr-path {   /* missing path */
+    color: #A0522D;
+}
+.improveOSM.error_type-mr-parking {   /* missing parking */
+    color: #EEEE00;
+}
+.improveOSM.error_type-mr-both {   /* missing road+parking */
+    color: #FFA500;
+}
+
+.improveOSM.error_type-tr {   /* missing turn restriction */
+    color: #EC1C24;
+}
+
+
+/* Custom Map Data (geojson, gpx, kml, vector tile) */

 .layer-mapdata {
     pointer-events: none;
 }
 .layer-mapdata {
     pointer-events: none;
 }


@@ -2511,7 +2764,6 @@ label.streetside-hires {
     stroke-width: 5px;
     stroke-miterlimit: 1;
 }
     stroke-width: 5px;
     stroke-miterlimit: 1;
 }

-

 /* Fill Styles */
 
 .low-zoom.fill-wireframe path.stroke,
 /* Fill Styles */
 
 .low-zoom.fill-wireframe path.stroke,


@@ -2541,7 +2793,6 @@ label.streetside-hires {
 }
 
 .fill-wireframe .point,
 }
 
 .fill-wireframe .point,

-.fill-wireframe .vertex.active,

 .fill-wireframe .areaicon,
 .fill-wireframe .areaicon-halo,
 .fill-wireframe path.casing,
 .fill-wireframe .areaicon,
 .fill-wireframe .areaicon-halo,
 .fill-wireframe path.casing,


@@ -2555,6 +2806,12 @@ label.streetside-hires {
     stroke-width: 60px;
     pointer-events: none;
 }
     stroke-width: 60px;
     pointer-events: none;
 }

+.fill-partial path.area.fill.tag-building_part {
+    stroke-width: 40px;
+}
+.fill-partial path.area.fill.tag-indoor {
+    stroke-width: 20px;
+}

 .mode-browse .fill-partial path.area.fill,
 .mode-select .fill-partial path.area.fill {
     pointer-events: visibleStroke;
 .mode-browse .fill-partial path.area.fill,
 .mode-select .fill-partial path.area.fill {
     pointer-events: visibleStroke;


@@ -2577,10 +2834,10 @@ body {
         sans-serif;
     margin: 0;
     padding: 0;
         sans-serif;
     margin: 0;
     padding: 0;

-    min-width: 768px;

     color: #333;
     overflow: hidden;
     -ms-user-select: none;
     color: #333;
     overflow: hidden;
     -ms-user-select: none;

+    -ms-content-zooming: none;

 }
 
 .unsupported {
 }
 
 .unsupported {


@@ -2593,7 +2850,6 @@ body {
 .id-container {
     height: 100%;
     width: 100%;
 .id-container {
     height: 100%;
     width: 100%;

-    min-width: 768px;

 }
 
 #content {
 }
 
 #content {


@@ -2616,22 +2872,6 @@ body {
     transition-duration: 200ms;
 }
 
     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;
 #defs {
     /* Can't be display: none or the clippaths are ignored. */
     position: absolute;


@@ -2639,43 +2879,6 @@ body {
     height: 0;
 }
 
     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;
 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;


@@ -2687,9 +2890,12 @@ a, button, input, textarea {
     -webkit-touch-callout: none;
 }
 
     -webkit-touch-callout: none;
 }
 

+ul li {
+    list-style: none;
+}
+

 a,
 button,
 a,
 button,

-.checkselect label:hover,

 .radial-menu-item {
     cursor: pointer;
 }
 .radial-menu-item {
     cursor: pointer;
 }


@@ -2711,7 +2917,6 @@ h3 {
     font-weight: bold;
     margin-bottom: 10px;
 }
     font-weight: bold;
     margin-bottom: 10px;
 }

-

 h4, h5 {
     font-size: 12px;
     font-weight: bold;
 h4, h5 {
     font-size: 12px;
     font-weight: bold;


@@ -2739,23 +2944,18 @@ p {
     margin: 0;
     padding: 0;
 }
     margin: 0;
     padding: 0;
 }

-

 p:last-child {
     padding-bottom: 0;
 }
 p:last-child {
     padding-bottom: 0;
 }

-

 em {
     font-style: italic;
 }
 em {
     font-style: italic;
 }

-

 strong {
     font-weight: bold;
 }
 strong {
     font-weight: bold;
 }

-

 a:visited, a {
     color: #7092ff;
 }
 a:visited, a {
     color: #7092ff;
 }

-

 a:hover {
     color: #597be7;
 }
 a:hover {
     color: #597be7;
 }


@@ -2782,7 +2982,6 @@ input[type=email] {
     border: 1px solid #ccc;
     padding: 5px 20px 5px 10px;
     height: 30px;
     border: 1px solid #ccc;
     padding: 5px 20px 5px 10px;
     height: 30px;

-    width: 100%;

     border-radius: 4px;
     text-overflow: ellipsis;
 }
     border-radius: 4px;
     text-overflow: ellipsis;
 }


@@ -2798,7 +2997,14 @@ input[type=email] {
 
 textarea:focus,
 input:focus {
 
 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"],
 }
 
 input[type="checkbox"],


@@ -2808,6 +3014,7 @@ input[type="radio"] {
     height: 14px;
     margin-right: 5px;
     margin-top: 3px;
     height: 14px;
     margin-right: 5px;
     margin-top: 3px;

+    cursor: pointer;

 }
 [dir='rtl'] input[type="checkbox"],
 [dir='rtl'] input[type="radio"] {
 }
 [dir='rtl'] input[type="checkbox"],
 [dir='rtl'] input[type="radio"] {


@@ -2816,26 +3023,16 @@ input[type="radio"] {
     margin-right: 0;
 }
 
     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 */
 /* tables */

-

 table {
     background-color: #fff;
     border-collapse: collapse;
     width: 100%;
     border-spacing: 0;
 }
 table {
     background-color: #fff;
     border-collapse: collapse;
     width: 100%;
     border-spacing: 0;
 }

-

 table th {
     text-align: left;
 }
 table th {
     text-align: left;
 }

-

 table.tags, table.tags td, table.tags th {
     border: 1px solid #ccc;
     padding: 4px;
 table.tags, table.tags td, table.tags th {
     border: 1px solid #ccc;
     padding: 4px;


@@ -2847,63 +3044,15 @@ table.tags, table.tags td, table.tags th {
 
 /* Grid
 ------------------------------------------------------- */
 
 /* 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;}
+.col6  { float: left; width: 50.0000%; max-width: 600px; }
+.col12 { float: left; width: 100.0000%; }

 
 

-.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;
-}
-
-
-/* Utility Classes
-------------------------------------------------------- */
-.fillL {
-    background: #fff;
-    color: #333;
+/* Utility Classes
+------------------------------------------------------- */
+.fillL {
+    background: #fff;
+    color: #333;

 }
 .fillL2 {
     background: #f6f6f6;
 }
 .fillL2 {
     background: #f6f6f6;


@@ -2928,10 +3077,12 @@ ul li { list-style: none;}
 .ar { right: 0; }
 
 input.hide,
 .ar { right: 0; }
 
 input.hide,

+textarea.hide,

 div.hide,
 form.hide,
 button.hide,
 a.hide,
 div.hide,
 form.hide,
 button.hide,
 a.hide,

+ul.hide,

 li.hide {
     display: none;
 }
 li.hide {
     display: none;
 }


@@ -2939,11 +3090,9 @@ li.hide {
 .deemphasize {
     color: #a9a9a9;
 }
 .deemphasize {
     color: #a9a9a9;
 }

-

 .content {
     box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.25);
 }
 .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;
 .loading {
     background: url(<%= asset_path("iD/img/loader_bg.gif") %>);
     background-size: 5px 5px;


@@ -2969,176 +3118,66 @@ button:focus,
 button:hover {
     background-color: #ececec;
 }
 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.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 {
+.joined > * {

     border-radius: 0;
     border-right: 1px solid rgba(0,0,0,.5);
 }
     border-radius: 0;
     border-right: 1px solid rgba(0,0,0,.5);
 }

-[dir='rtl'] .joined button {
+[dir='rtl'] .joined > * {

     border-left: 1px solid rgba(0,0,0,.5);
     border-right: none;
 }
 
     border-left: 1px solid rgba(0,0,0,.5);
     border-right: none;
 }
 

-.fillL .joined button {
+.fillL .joined > * {

     border-right: 1px solid #fff;
 }
     border-right: 1px solid #fff;
 }

-
-.joined button:first-child {
+.joined > *:first-child {

     border-radius: 4px 0 0 4px;
 }
     border-radius: 4px 0 0 4px;
 }

-[dir='rtl'] .joined button:first-child {
+[dir='rtl'] .joined > *:first-child {

     border-radius: 0 4px 4px 0;
 }
     border-radius: 0 4px 4px 0;
 }

-
-.joined button:last-child {
+.joined > *:last-child {

     border-right-width: 0;
     border-radius: 0 4px 4px 0;
 }
     border-right-width: 0;
     border-radius: 0 4px 4px 0;
 }

-[dir='rtl'] .joined button:last-child {
+[dir='rtl'] .joined > *.bar-button:last-child {

     border-radius: 4px 0 0 4px;
 }
 
     border-radius: 4px 0 0 4px;
 }
 

+
+/* Action buttons */

 button.action {
     background: #7092ff;
     color: #fff;
 }
 button.action {
     background: #7092ff;
     color: #fff;
 }

-
-button[disabled].action,
-button[disabled].action:hover {
-    background: #cccccc;
-    color: #888;
-}
-

 button.action:focus,
 button.action:hover {
 button.action:focus,
 button.action:hover {

-    background: #597BE7;
+    background: #597be7;

 }
 }

-

 button.secondary-action {
     background: #ececec;
 }
 button.secondary-action {
     background: #ececec;
 }

-

 button.secondary-action:focus,
 button.secondary-action:hover {
     background: #cccccc;
 }
 
 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;

 }
 
 
 }
 
 


@@ -3173,15 +3212,12 @@ button.add-note svg.icon {
 .icon.light {
     color: #fff;
 }
 .icon.light {
     color: #fff;
 }

-

 .icon.created {
     color: #00ca07;
 }
 .icon.created {
     color: #00ca07;
 }

-

 .icon.modified {
     color: #666;
 }
 .icon.modified {
     color: #666;
 }

-

 .icon.deleted {
     color: #ea0000;
 }
 .icon.deleted {
     color: #ea0000;
 }


@@ -3194,130 +3230,494 @@ button.add-note svg.icon {
     border-radius: 3px;
 }
 
     border-radius: 3px;
 }
 

+.icon-annotation {
+    color: #333;
+}
+
+.notification-badge {
+    display: block;
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    right: 7px;
+    top: 9px;
+}
+
+.notification-badge.hide {
+    display: none;
+}
+

 
 /* Toolbar / Persistent UI Elements
 ------------------------------------------------------- */
 #bar {
 
 /* Toolbar / Persistent UI Elements
 ------------------------------------------------------- */
 #bar {

-    position: fixed;
-    padding: 10px 0;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    position: absolute;
+    padding: 10px 5px 0px 5px;

     left: 0;
     top: 0;
     right: 0;
     left: 0;
     top: 0;
     right: 0;

-    height: 60px;
-    z-index: 9;
-    min-width: 768px;
+    z-index: 101;

 }
 }

-
-[dir='rtl'] #bar .spacer,
-[dir='rtl'] #bar .button-wrap,
-[dir='rtl'] #bar .button-wrap button {
-    float: right;
+#bar .toolbar-item {
+    display: flex;
+    flex: 0 1 auto;
+    flex-flow: column wrap;
+    justify-content: center;
+    position: relative;

 }
 }

-
-
-/* Header for modals / panes
-------------------------------------------------------- */
-.header {
-    border-bottom: 1px solid #ccc;
-    height: 60px;
+#bar .toolbar-item .item-content {
+    display: flex;
+    flex: 0 1 auto;
+    flex-flow: row nowrap;
+    justify-content: center;

     position: relative;
     position: relative;

+    height: 40px;
+    width: auto;
+    margin: 0 5px;

 }
 }

-
-.header h3 {
+#bar .toolbar-item .item-label {

     text-align: center;
     text-align: center;

-    margin-bottom: 0;
+    font-size: 11px;

     white-space: nowrap;
     white-space: nowrap;

-    text-overflow: ellipsis;
-    overflow: hidden;
-    padding: 20px;
+    margin: 1px 2px 2px 2px;

 }
 }

-
-.header button,
-.modal > button {
-    border-radius: 0;
-    width: 40px;
-    text-align: center;
-    overflow: hidden;
+#bar .toolbar-item.spacer {
+    width: 100%;
+    flex-grow: 2;

 }
 }

-
-.header button {
-    position: relative;
-    height: 100%;
+#bar .toolbar-item:first-child {
+    justify-content: flex-start;

 }
 }

-
-.field-help-title button.close,
-.sidebar-component .header button.data-editor-close,
-.sidebar-component .header button.note-editor-close,
-.entity-editor-pane .header button.preset-close,
-.preset-list-pane .header button.preset-choose {
-    position: absolute;
-    right: 0;
-    top: 0;
+#bar .toolbar-item:last-child {
+    justify-content: flex-end;

 }
 }

-[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'] .entity-editor-pane .header button.preset-close,
-[dir='rtl'] .preset-list-pane .header button.preset-choose {
-    left: 0;
-    right: auto;
+#bar .toolbar-item:empty:not(.spacer) {
+    display: none;

 }
 }

-
-.entity-editor-pane .header button.preset-choose {
-    position: absolute;
-    left: 0;
-    top: 0;
+button.bar-button {
+    flex: 0 0 auto;
+    flex-flow: row nowrap;
+    align-items: center;
+    padding: 0 10px;
+    min-width: 30px;
+    white-space: nowrap;
+    display: flex;

 }
 }

-[dir='rtl'] .entity-editor-pane .header button.preset-choose {
-    left: auto;
-    right: 0;
+button.bar-button .icon {
+    flex: 0 0 20px;

 }
 }

-
-.preset-choose {
-    font-size: 16px;
-    line-height: 1.25;
-    font-weight: bold;
+button.bar-button .label {
+    flex: 0 1 auto;
+    padding: 0 5px;

 }
 
 }
 

-.modal > button {
-    position: absolute;
-    right: 0;
-    top: 0;
-    height: 59px;
-    z-index: 50;
+button.bar-button.dragging {
+    opacity: 0.75;
+    z-index: 200;

 }
 }

-[dir='rtl'] .modal > button {
-    left: 0;
-    right: unset;
+button.bar-button.dragging .tooltip {
+    display: none;

 }
 }

-
-.footer {
-    position: absolute;
-    bottom: 0;
-    margin: 0;
-    padding: 5px 20px 5px 20px;
-    border-top: 1px solid #ccc;
-    background-color: #fafafa;
-    width: 100%;
-    z-index: 1;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    list-style: none;
-    display: flex;
+button.bar-button.dragging.removing {
+    cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer;

 }
 
 }
 

-.footer > a {
-    justify-content: center;
+button.save .count {
+    display: inline-block;
+    min-width: 32px;
+    text-align: center;

 }
 
 }
 

-.sidebar-component .body {
+.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;
+    position: absolute;
+    right: 4px;
+    bottom: 26px;
+}
+.spinner img {
+    height: 20px;
+    width: 20px;
+    background: transparent;
+    border-radius: 100%;
+}
+[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 .spinner,
+#bar.narrow button.bar-button .label {
+    display: none;
+}
+#bar.narrow button .count {
+    border-left-width: 0;
+    border-right-width: 0;
+}
+
+[dir='ltr'] .undo-redo button:first-of-type {
+    margin-right: 1px;
+}
+[dir='rtl'] .undo-redo button:first-of-type {
+    margin-left: 1px;
+}
+
+/* Add a feature search bar
+------------------------------------------------------- */
+
+.search-add {
+    width: 200%;
+    justify-content: center;
+    position: relative;
+    min-width: 150px;
+    max-width: 325px;
+}
+.search-add .search-wrap {
+    position: relative;

     width: 100%;
     width: 100%;

-    overflow: auto;
-    top: 60px;
+}
+[dir='ltr'] .search-add .search-wrap {
+    border-radius: 20px 4px 4px 20px;
+}
+[dir='rtl'] .search-add .search-wrap {
+    border-radius: 4px 20px 20px 4px;
+}
+.search-add .search-wrap.focused .tooltip {
+    display: none;
+}
+.search-add .search-wrap:last-child {
+    border-radius: 20px;
+}
+.search-add input[type='search'] {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    border: none;
+    font-size: 14px;
+    text-indent: 25px;
+    padding: 5px 10px;
+    border-radius: inherit;
+}
+.search-add input[type='search'][disabled] {
+    opacity: 0.25;
+    cursor: not-allowed;
+}
+.search-add .search-icon {
+    color: #333;
+    display: block;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    pointer-events: none;
+}
+[dir='rtl'] .search-add .search-icon {
+    left: auto;
+    right: 10px;
+}
+.search-add .popover {
+    border: none;
+    border-radius: 6px;
+    position: absolute;
+    max-height: 600px;
+    top: 44px;
+    width: 200%;
+    max-width: 325px;
+    margin: auto;
+    left: auto;
+    right: auto;
+    z-index: 300;
+}
+.search-add .popover .popover-content {
+    overflow-y: auto;
+    height: 100%;
+    max-height: 60vh;
+}
+.search-add .popover,
+.search-add .popover .popover-content {
+    /* ensure corners are rounded in Chrome */
+    -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
+}
+.search-add .popover .popover-footer {
+    padding: 5px 10px 5px 10px;
+    background: #f6f6f6;
+    border-top: 1px solid #DCDCDC;
+    display: flex;
+}
+.search-add .popover .popover-footer .message {
+    color: #666666;
+    flex-grow: 1;
+}
+.search-add .popover .popover-footer button.filter {
+    height: 20px;
+    background: transparent;
+    color: #666;
+}
+.search-add .popover .popover-footer button.filter.active {
+    color: #7092ff;
+}
+.search-add .popover .popover-footer button.filter:hover {
+    color: #333;
+}
+.search-add .popover .popover-footer button.filter.active:hover {
+    color: #597be7;
+}
+.search-add .popover::-webkit-scrollbar {
+    /* don't overlap rounded corners */
+    background: transparent;
+}
+.search-add .popover .list {
+    height: 100%;
+}
+.search-add .list-item > .row {
+    display: flex;
+    position: relative;
+    padding: 2px;
+}
+.search-add .list-item:not(:last-of-type) .row,
+.search-add .subsection.subitems .list-item .row,
+.search-add .subsection > .tag-reference-body  {
+    border-bottom: 1px solid #DCDCDC;
+}
+.search-add .list-item .label {
+    font-weight: bold;
+    font-size: 12px;
+    padding-left: 2px;
+    top: 0;

     bottom: 0;
     bottom: 0;

+    position: relative;
+    display: flex;
+    align-items: center;
+    line-height: 1.3em;
+    width: 100%;
+}
+.search-add .list-item .label .namepart:nth-child(2) {
+    font-weight: normal;
+}
+.search-add .list-item.disabled .preset-icon-container,
+.search-add .list-item.disabled .label {
+    opacity: 0.55;
+}
+[dir='ltr'] .search-add .list-item .label .icon.inline {
+    margin-left: 0;
+}
+[dir='rtl'] .search-add .list-item .label .icon.inline {
+    margin-right: 0;
+}
+.search-add .list-item .row > *:not(button) {
+    pointer-events: none;
+}
+.search-add .list-item button.choose {
+    position: absolute;
+    border-radius: 0;
+    height: 100%;
+    width: 100%;
+    top: 0;
+    left: 0;
+}
+.search-add .list-item button.choose:hover,
+.search-add .list-item button.choose:focus {
+    background: #fff;
+}
+.search-add .list-item.focused:not(.disabled) button.choose {
+    background: #e8ebff;
+}
+.search-add .list-item button.choose.disabled {
+    background-color: #ececec;
+}
+.search-add .subsection .list-item button.choose {
+    opacity: 0.85;
+}
+.search-add .subsection .tag-reference-body {
+    background: rgba(255, 255, 255, 0.85);
+    padding: 10px;
+}
+.search-add .list-item button.accessory {
+    position: relative;
+    flex: 0 0 auto;
+    color: #808080;
+    background: transparent;
+    padding-right: 3px;
+    padding-left: 3px;
+}
+.search-add .list-item button.accessory:hover {
+    color: #666;
+}
+.search-add .list-item button.tag-reference-open path {
+    fill: #000;
+}
+.search-add .subsection {
+    background-color: #CBCBCB;
+}
+[dir='ltr'] .search-add .subitems {
+    padding-left: 6px;
+}
+[dir='rtl'] .search-add .subitems {
+    padding-right: 6px;
+}
+
+/* Add a preset mode buttons
+------------------------------------------------------- */
+
+button.bar-button.add-preset {
+    border-radius: 4px;
+}
+[dir='ltr'] button.bar-button.add-preset {
+    margin-left: 1px;
+}
+[dir='rtl'] button.bar-button.add-preset {
+    margin-right: 1px;
+}
+[dir='ltr'] button.bar-button.add-preset.first-recent {
+    margin-left: 10px;
+}
+[dir='rtl'] button.bar-button.add-preset.first-recent {
+    margin-right: 10px;
+}
+button.bar-button.add-preset {
+    padding: 0;
+}
+button.add-preset.disabled .preset-icon-container {
+    opacity: 0.5;
+}
+/* Header for modals / panes
+------------------------------------------------------- */
+.header {
+    border-bottom: 1px solid #ccc;
+    height: 60px;
+    position: relative;
+}
+
+.header h3 {
+    text-align: center;
+    margin-bottom: 0;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    padding: 20px;
+}
+
+.header button,
+.modal > button {
+    border-radius: 0;
+    width: 40px;
+    text-align: center;
+    overflow: hidden;
+}
+
+.header button {
+    position: relative;
+    height: 100%;
+}
+
+.field-help-title button.close,
+.sidebar-component .header button.data-editor-close,
+.sidebar-component .header button.note-editor-close,
+.sidebar-component .header button.error-editor-close,
+.entity-editor-pane .header button.preset-close,
+.preset-list-pane .header button.preset-choose {
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+[dir='rtl'] .field-help-title button.close,
+[dir='rtl'] .sidebar-component .header button.data-editor-close,
+[dir='rtl'] .sidebar-component .header button.note-editor-close,
+[dir='rtl'] .sidebar-component .header button.error-editor-close,
+[dir='rtl'] .entity-editor-pane .header button.preset-close,
+[dir='rtl'] .preset-list-pane .header button.preset-choose {
+    left: 0;
+    right: auto;
+}
+
+.entity-editor-pane .header button.preset-choose {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+[dir='rtl'] .entity-editor-pane .header button.preset-choose {
+    left: auto;
+    right: 0;
+}
+
+.preset-choose {
+    font-size: 16px;
+    line-height: 1.25;
+    font-weight: bold;
+}
+
+.modal > button {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 59px;
+    z-index: 50;
+}
+[dir='rtl'] .modal > button {
+    left: 0;
+    right: unset;
+}
+
+.footer {

     position: absolute;
     position: absolute;

+    bottom: 0;
+    margin: 0;
+    padding: 5px 20px 5px 20px;
+    border-top: 1px solid #ccc;
+    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;
+}
+
+.header-container {
+    display: flex;
+    justify-content: space-between;
+}
+
+.header-block-outer {
+    width: 20%;

 }
 
 }
 

+.header-block-close {
+    display: flex;
+    justify-content: flex-end;
+}

 
 /* Hide/Toggle collapsable sections (aka Disclosure)
 ------------------------------------------------------- */
 
 /* Hide/Toggle collapsable sections (aka Disclosure)
 ------------------------------------------------------- */


@@ -3347,13 +3747,38 @@ a.hide-toggle {
     position: relative;
     float: left;
     height: 100%;
     position: relative;
     float: left;
     height: 100%;

-    overflow: hidden;

     z-index: 10;
     background: #f6f6f6;
     -ms-user-select: element;
     z-index: 10;
     background: #f6f6f6;
     -ms-user-select: element;

+    border: 0px solid #ccc;
+    border-right-width: 1px;

 }
 [dir='rtl'] #sidebar {
     float: right;
 }
 [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 {
 }
 
 .sidebar-component {


@@ -3364,6 +3789,14 @@ a.hide-toggle {
     right: 0;
 }
 
     right: 0;
 }
 

+.sidebar-component .body {
+    width: 100%;
+    overflow: auto;
+    top: 60px;
+    bottom: 0;
+    position: absolute;
+}
+

 .panewrap {
     position: absolute;
     width: 200%;
 .panewrap {
     position: absolute;
     width: 200%;


@@ -3389,6 +3822,8 @@ a.hide-toggle {
 .inspector-wrap {
     width: 100%;
     height: 100%;
 .inspector-wrap {
     width: 100%;
     height: 100%;

+    overflow: hidden;
+    position: relative;

 }
 
 .inspector-hidden {
 }
 
 .inspector-hidden {


@@ -3404,21 +3839,17 @@ a.hide-toggle {
     bottom: 0;
 }
 
     bottom: 0;
 }
 

-.feature-list-pane .inspector-body {
-    top: 120px;
-}
+.feature-list-pane .inspector-body,

 .preset-list-pane .inspector-body {
     top: 120px;
 }
 .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 {
 .selection-list-pane .inspector-body {
     top: 60px;
 }
 
 .inspector-inner {

-    padding: 20px;
+    padding: 20px 20px 5px 20px;

     position: relative;
 }
 
     position: relative;
 }
 


@@ -3463,21 +3894,34 @@ a.hide-toggle {
     border-radius: 0;
 }
 
     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 {
     background-color: #fff;
     font-weight: bold;
     height: 40px;
     line-height: 20px;
 }

-

 .feature-list-item:hover {
     background-color: #ececec;
 }
 .feature-list-item:hover {
     background-color: #ececec;
 }

-

 .feature-list-item button {
     background: transparent;
 }
 .feature-list-item button {
     background: transparent;
 }

-

 .feature-list-item .label {
     text-align: left;
     padding: 10px 10px;
 .feature-list-item .label {
     text-align: left;
     padding: 10px 10px;


@@ -3493,24 +3937,19 @@ a.hide-toggle {
 .feature-list-item .label .icon {
     opacity: .5;
 }
 .feature-list-item .label .icon {
     opacity: .5;
 }

-

 .feature-list-item .close {
     float: right;
     padding: 10px;
 }
 .feature-list-item .close {
     float: right;
     padding: 10px;
 }

-

 .feature-list-item .close .icon {
     opacity: 1;
 }
 .feature-list-item .close .icon {
     opacity: 1;
 }

-

 .feature-list-item .entity-type {
     color: #7092ff;
 }
 .feature-list-item .entity-type {
     color: #7092ff;
 }

-

 .feature-list-item:hover .entity-type {
     color: #597be7;
 }
 .feature-list-item:hover .entity-type {
     color: #597be7;
 }

-

 .feature-list-item .entity-name {
     font-weight: normal;
     color: #666;
 .feature-list-item .entity-name {
     font-weight: normal;
     color: #666;


@@ -3530,130 +3969,154 @@ a.hide-toggle {
     border-bottom: 1px solid #ccc;
 }
 
     border-bottom: 1px solid #ccc;
 }
 

+.preset-list-item {
+    margin-bottom: 10px;
+}
+

 .preset-list-button-wrap {
     position: relative;
 .preset-list-button-wrap {
     position: relative;

-    margin-bottom: 10px;
-    height: 60px;
+    height: 62px;
+    display: flex;
+    border: 1px solid #ccc;
+    border-radius: 4px;

 }
 
 .preset-list-button {
     width: 100%;
     height: 100%;
     position: relative;
 }
 
 .preset-list-button {
     width: 100%;
     height: 100%;
     position: relative;

-    border: 1px solid #ccc;
+    display: flex;

 }
 
 .preset-list.filtered .preset-list-item:first-child .preset-list-button {
     background: #ececec;
 }
 
 }
 
 .preset-list.filtered .preset-list-item:first-child .preset-list-button {
     background: #ececec;
 }
 

-.preset-icon-fill-area {
-    cursor: inherit;
-    height: 40px;
+.preset-icon-container {
+    position: relative;
+    width: 60px;
+    height: 60px;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.preset-icon-container.small {

     width: 40px;
     width: 40px;

-    margin: auto;
-    position: absolute;
-    left: 10px;
-    top: 10px;
+    height: 40px;
+    flex: 0 0 auto;
+}
+.preset-icon-container img.image-icon {
+    width: 50px;
+    height: 50px;
+    object-fit: contain;
+    border-radius: 2px;

 }
 
 }
 

-.preset-icon-fill-vertex {
-    height: 40px;
-    width: 40px;
+.preset-icon-point-border path {
+    stroke: #333;
+    stroke-width: 1.2;
+    fill: transparent;
+}
+
+.preset-icon-line {

     margin: auto;
     position: absolute;
     margin: auto;
     position: absolute;

-    left: 10px;
-    top: 10px;
-    border: 1.5px solid #333;
-    border-radius: 20px;
-    background-color: #efefef;
-    backface-visibility: hidden;
+    left: 0;
+    right: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;

 }
 }

-
-[dir='rtl'] .preset-icon-fill-vertex,
-[dir='rtl'] .preset-icon-fill-area {
-  left: auto;
-  right: 10px;
+.preset-icon-container path {
+    cursor: inherit;
+}
+.preset-icon-container circle.vertex {
+    fill: #fff;
+    stroke: rgba(0, 0, 0, 0.25);
+}
+.preset-icon-fill circle.midpoint {
+    fill: transparent;
+    stroke: rgba(0, 0, 0, 0.25);
+}
+/* use a consistent stroke width */
+.preset-icon-container path.line.stroke {
+    stroke-width: 2 !important;
+}
+.preset-icon-container path.line.casing {
+    stroke-width: 4 !important;

 }
 
 }
 

-.preset-icon-frame {
-    position: absolute;
-    top: 7px;
-    left: 7px;
+.preset-icon-fill {

     margin: auto;
     margin: auto;

+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;

 }
 }

-[dir='rtl'] .preset-icon-frame {
-    left: auto;
-    right: 7px;
+.preset-icon-container svg,
+.preset-icon-container svg > * {
+    cursor: inherit !important;

 }
 }

-
-.preset-icon-frame .icon {
-    width: 46px;
-    height: 46px;
+.preset-icon-fill path.area.stroke {
+    fill: transparent;

 }
 
 }
 

-.preset-icon-60 {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    margin: auto;
+.preset-icon-fill-vertex circle {
+    stroke-width: 1.5px;
+    stroke: #333;
+    fill: #efefef;
+    backface-visibility: hidden;

 }
 
 }
 

-.preset-icon-60 .icon {
-    width: 60px;
-    height: 60px;
+.preset-icon {
+    width: 100%;
+    height:100%;
+    position: absolute;
+    z-index: 1;

 }
 }

-
-.preset-icon-44 {
+.preset-icon .icon {

     position: absolute;
     position: absolute;

-    top: 9px;
-    left: 8px;

     margin: auto;
     margin: auto;

+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
+    transform: scale(0.48);

 }
 }

-
-.preset-icon-44 .icon {
-    width: 44px;
-    height: 44px;
+.preset-icon-container.small .preset-icon.point-geom .icon {
+    transform: translateY(-7%) scale(0.27);

 }
 }

-
-.preset-icon-28 {
-    position: absolute;
-    top: 16px;
-    left: 16px;
-    margin: auto;
+.preset-icon-container.small .preset-icon.point-geom.preset-icon-iD .icon {
+    transform: translateY(-9%) scale(0.5);

 }
 }

-
-.preset-icon-28 .icon {
-    width: 28px;
-    height: 28px;
+.preset-icon.framed .icon {
+    transform: scale(0.4);

 }
 }

-
-.preset-icon-24 {
-    position: absolute;
-    top: 18px;
-    left: 18px;
-    margin: auto;
+.preset-icon.framed.line-geom .icon,
+.preset-icon.framed.route-geom .icon {
+    top: 20%;
+    transform: translateY(-30%) scale(0.4);

 }
 }

-
-.preset-icon-24 .icon {
-    width: 24px;
-    height: 24px;
+.preset-icon-iD .icon {
+    transform: scale(1);

 }
 }

-
-[dir='rtl'] .preset-list-button-wrap .preset-icon {
-    left: auto;
-    right: auto;
+.preset-icon-iD.framed .icon {
+    transform: scale(0.74);

 }
 }

-
-[dir='rtl'] .preset-list-button-wrap .preset-icon-28 {
-    right: 16px;
+.preset-icon-iD.framed.line-geom .icon,
+.preset-icon-iD.framed.route-geom .icon {
+    transform: translateY(-30%) scale(0.74);

 }
 }

-
-[dir='rtl'] .preset-list-button-wrap .preset-icon-24 {
-    right: 18px;
+.preset-icon-container.fallback .preset-icon .icon {
+    transform: scale(0.5) !important;

 }
 
 .preset-list-button .label {
 }
 
 .preset-list-button .label {

+    display: flex;
+    flex-flow: row wrap;
+    align-items: center;

     background-color: #f6f6f6;
     text-align: left;
     position: absolute;
     background-color: #f6f6f6;
     text-align: left;
     position: absolute;


@@ -3662,12 +4125,7 @@ a.hide-toggle {
     right: 0;
     padding: 5px 10px;
     left: 60px;
     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-left: 1px solid rgba(0, 0, 0, .1);

-    border-radius: 0 3px 3px 0;

 }
 [dir='rtl'] .preset-list-button .label {
     text-align: right;
 }
 [dir='rtl'] .preset-list-button .label {
     text-align: right;


@@ -3675,39 +4133,74 @@ a.hide-toggle {
     right: 60px;
     border-left: none;
     border-right: 1px solid rgba(0, 0, 0, .1);
     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;
 }
 
     background-color: #ececec;
 }
 

+.preset-list-item button.preset-favorite-button,

 .preset-list-item button.tag-reference-button {
     height: 100%;
 .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;
     width: 32px;

-    background: #fafafa;
+    flex: 0 0 auto;
+    background: #f6f6f6;
+}
+[dir='ltr'] .preset-list-item button.preset-favorite-button,
+[dir='ltr'] .preset-list-item button.tag-reference-button {
+    border-left: 1px solid #ccc;

 }
 }

+[dir='rtl'] .preset-list-item button.preset-favorite-button,

 [dir='rtl'] .preset-list-item button.tag-reference-button {
 [dir='rtl'] .preset-list-item button.tag-reference-button {

-    left: 0;
-    right: auto;
-    border-radius: 3px 0 0 3px;
+    border-right: 1px solid #ccc;
+}
+[dir='ltr'] .preset-list-item button:last-child {
+    border-radius: 0 4px 4px 0;
+}
+[dir='rtl'] .preset-list-item button:last-child {
+    border-radius: 4px 0 0 4px;

 }
 
 }
 

+.preset-list-item button.preset-favorite-button:hover,

 .preset-list-item button.tag-reference-button:hover {
     background: #f1f1f1;
 }
 .preset-list-item button.tag-reference-button:hover {
     background: #f1f1f1;
 }

+.preset-list-item button.preset-favorite-button .icon,

 .preset-list-item button.tag-reference-button .icon {
     opacity: .5;
 }
 
 .preset-list-item button.tag-reference-button .icon {
     opacity: .5;
 }
 

+button.preset-favorite-button .icon {
+    fill-opacity: 0;
+    stroke-width: 1;
+}
+button.preset-favorite-button.active .icon {
+    fill-opacity: inherit;
+}
+
+

 .current .preset-list-button,
 .current .preset-list-button .label {
 .current .preset-list-button,
 .current .preset-list-button .label {

-    background-color: #E8EBFF;
+    background-color: #e8ebff;

 }
 
 .category .preset-list-button:after,
 }
 
 .category .preset-list-button:after,


@@ -3727,48 +4220,97 @@ a.hide-toggle {
 }
 
 .subgrid .preset-list {
 }
 
 .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;
 }
     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;
 
 .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);
     width: 0;
     height: 0;
     margin-left: 50%;
     margin-left: -webkit-calc(50% - 10px);

-    margin-top: -10px;
+}
+
+
+/* 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/Preset Editor
 ------------------------------------------------------- */

+.entity-issues,

 .preset-editor {
     overflow: hidden;
 .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;
 }
 .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;
 .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;
 }
 .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;
 }
 
     margin-bottom: 0;
 }
 

+/*
+    The parts of a field:
+    - `.form-field` is a `div` wraps the entire thing
+    - `.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 |  <- .field-label        |
+   +------------------+                               |
+   |  Starbucks   | + |  <- .form-field-input-wrap     >  .form-field
+   '------------------'                               |
+     tag reference       <- .tag-reference-body      |
+                                                    -
+*/
+

 .form-field {
 .form-field {

+    display: flex;
+    flex-flow: row wrap;

     margin-bottom: 10px;
     width: 100%;
     -webkit-transition: margin-bottom 200ms;
     margin-bottom: 10px;
     width: 100%;
     -webkit-transition: margin-bottom 200ms;


@@ -3782,448 +4324,333 @@ a.hide-toggle {
     margin-bottom: 0;
 }
 
     margin-bottom: 0;
 }
 

-.form-label {
+/* A `label` element that wraps the top section */
+.field-label {
+    display: flex;
+    flex-flow: row nowrap;
+    flex: 1 1 100%;
+    height: 30px;

     position: relative;
     font-weight: bold;
     position: relative;
     font-weight: bold;

-    border: 1px solid #cfcfcf;
-    padding: 5px 0 5px 10px;
-    background: #f6f6f6;
-    display: block;
-    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-label-button-wrap .icon {
-    opacity: .5;
-}
-
-.form-label button {
-    border-left: 1px solid #ccc;
-    width: 32px;
-    height: 100%;
-    border-radius: 0;
+    color: #333;

     background: #f6f6f6;
     background: #f6f6f6;

-}
-[dir='rtl'] .form-label button {
-    border-left: none;
-    border-right: 1px solid #ccc;
-    border-radius: 4px 0 0 0;
-    width: 31px;
-}
-.form-label button:hover {
-    background: #f1f1f1;
-}
-
-.form-label .modified-icon,
-.form-field .remove-icon {
-    display: none;
-}
-
-.modified .form-label .modified-icon,
-.present .form-label .remove-icon {
-    display: inline-block;
-}
-
-.form-field > input,
-.form-field > textarea,
-.form-field .preset-input-wrap {
-    border: 1px solid #ccc;
-    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
-}
-
-/* Inspector (hover styles)
-------------------------------------------------------- */
-.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;
-}
-
-.inspector-hover a,
-.inspector-hover .form-field-multicombo .chips,
-.inspector-hover .checkselect label:last-of-type {
-    color: #666;
-}
-
-.inspector-hover .form-field-multicombo .chips {
-    background: #eee;

     border: 1px solid #ccc;
     border: 1px solid #ccc;

-}
-
-/* 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;
+    border-radius: 4px 4px 0 0;

     overflow: hidden;
     overflow: hidden;

-    opacity: 0 !important;
-    border-width: 0;
-    margin: 0;
-    padding: 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;
-}
-
-/* Styles for raw tag inspector on hover */
-.inspector-hover .tag-row .key-wrap,
-.inspector-hover .tag-row .form-field.input-wrap-position {
-    width: 50%;
-}
-.inspector-hover .tag-row .key-wrap,
-.inspector-hover .tag-row .input-wrap-position {
-    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 .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;
+.field-label .label-text {
+    flex: 1 1 auto;
+    padding: 5px 0 5px 10px;

 }
 }

-
-.inspector-hover .toggle-list button.active {
-    padding-left: 10px;
+[dir='rtl'] .field-label .label-text {
+    padding: 5px 10px 5px 0;

 }
 
 }
 

-/* 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%;
+.label-text .label-textannotation svg.icon {
+    margin: 0 8px;
+    color: #333;
+    opacity: 0.5;
+    width: 14px;
+    height: 14px;
+    vertical-align: text-top;

 }
 
 }
 

-/* Hide placeholder for radio buttons if another is active, or not in hover state */
-.toggle-list label.active ~ .placeholder,
-.toggle-list .placeholder {
-    padding: 0;
-    opacity: 0;
-    width: 0;
-    line-height: 0;
-    display: block;
-    overflow: hidden;
+.field-label button {
+    flex: 0 0 32px;
+    border-left: 1px solid #ccc;
+    width: 32px;
+    height: 100%;
+    border-radius: 0;
+    background: #f6f6f6;
+}
+[dir='rtl'] .field-label button {
+    border-left: none;
+    border-right: 1px solid #ccc;
+}
+.field-label button:hover {
+    background: #f1f1f1;
+}
+.field-label .icon {
+    opacity: .5;

 }
 
 }
 

-/* More Fields dropdown
-------------------------------------------------------- */
-.more-fields {
-    padding: 0 20px 20px 20px;
-    font-weight: bold;
+.field-label .modified-icon,
+.field-label .remove-icon,
+.field-label .remove-icon-multilingual {
+    display: none;

 }
 }

-.changeset-editor .more-fields {
-    padding: 15px 20px 0 20px;
+.modified:not(.locked) .field-label .modified-icon,
+.present:not(.locked) .field-label .remove-icon,
+.present:not(.locked) .field-label .remove-icon-multilingual {
+    display: inline-block;

 }
 
 }
 

-.more-fields label {
+/* A `div` element that wraps the bottom section */
+.form-field-input-wrap {

     display: flex;
     flex-flow: row nowrap;
     display: flex;
     flex-flow: row nowrap;

-    justify-content: space-between;
-    align-items: center;
+    width: 100%;
+    flex: 1 1 auto;
+    min-height: 30px;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+}
+.nowrap .form-field-input-wrap {
+    border-radius: 0;

 }
 
 }
 

-.more-fields input {
-    margin-left: 10px;
-    flex: 1 1 50%;
+
+.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;

 }
 }

-[dir='rtl'] .more-fields input {
-    margin-left: auto;
-    margin-right: 10px;
+.form-field-input-wrap > textarea {
+    height: 65px;
+    border-radius: 0 0 4px 4px;
+    overflow: auto;

 }
 
 }
 

-.preset-input-wrap .label {
+/* Buttons inside fields */
+.form-field-button {
+    flex: 0 0 auto;

     height: 30px;
     height: 30px;

-    background: #F6F6F6;
-    padding: 5px 10px;
+    width: 32px;
+    position: relative;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 0;
+    border-top-width: 0;
+    border-left-width: 0;
+    vertical-align: top;
+}
+[dir='rtl'] .form-field-button {
+    border-left-width: 1px;
+    border-right-width: 0;
+}
+.form-field-button:hover {
+    background-color: #f1f1f1;
+}
+.form-field-button .icon {
+    fill: #333;
+    opacity: .5;

 }
 
 }
 

-[dir='rtl'] .preset-input-wrap .col6 {
-    float: right;
+
+/* round corners of first/last child elements */
+.form-field-input-wrap > button:last-of-type {
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .form-field-input-wrap > button:last-of-type {
+    border-bottom-left-radius: 4px;

 }
 
 
 }
 
 

-/* Field - Access, Cycleway, Structure
+/* Field - Access, Cycleway

 ------------------------------------------------------- */
 ------------------------------------------------------- */

-.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-input-access,
+.form-field-input-cycleway {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;

 }
 }

-.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;
+
+/* Field - lists with labeled input items
+------------------------------------------------------- */
+.form-field ul.rows {
+    flex: 1 1 auto;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+    overflow: hidden;
+    width: 100%;
+}
+.form-field ul.rows li {
+    border-top: 1px solid #ccc;
+}
+.form-field ul.rows li:first-child {
+    border-top: 0;
+}
+.form-field ul.rows li {
+    display: flex;
+    flex-flow: row nowrap;
+}
+.form-field ul.rows li.labeled-input > span,
+.form-field ul.rows li.labeled-input > 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.rows li input {

     border-radius: 0;
     border-width: 0;
     border-radius: 0;
     border-width: 0;

+    width: 100%;
+}
+.form-field ul.rows li button {
+    border-width: 0;
+}
+[dir='ltr'] .form-field ul.rows li.labeled-input input,
+[dir='ltr'] .form-field ul.rows li button {

     border-left-width: 1px;
 }
     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 {
-    border-left-width: 0;
+[dir='rtl'] .form-field ul.rows li.labeled-input input,
+[dir='rtl'] .form-field ul.rows li button {

     border-right-width: 1px;
 }
 
     border-right-width: 1px;
 }
 

-.preset-input-wrap li:last-child input {
-    border-bottom-right-radius: 4px;
-}

 
 

+/* Field - Structure
+------------------------------------------------------- */

 .structure-extras-wrap {
 .structure-extras-wrap {

+    width: 100%;

     padding: 10px 10px;
     background: #fff;
     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.rows {

     border: 1px solid #ccc;
     border-radius: 4px;
 }
     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;
-}
-.structure-extras-wrap li:last-child span {
-    border-bottom-left-radius: 4px;
-}
-.structure-extras-wrap li:last-child input {
-    border-bottom-right-radius: 4px;
-}
-[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;
+
+
+/* Field - Combo / Multicombo
+------------------------------------------------------- */
+.form-field-input-combo > input:only-of-type {
+    border-radius: 0 0 4px 4px;

 }
 }

-[dir='rtl'] .structure-extras-wrap li:last-child span {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 4px;
+.form-field-input-combo.empty-combobox input,
+.form-field-input-multicombo .empty-combobox input {
+    padding-right: 10px;
+    padding-left: 10px;

 }
 }

-[dir='rtl'] .structure-extras-wrap li:last-child input {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 4px;
+.form-field-input-combo.empty-combobox .combobox-caret,
+.form-field-input-multicombo .empty-combobox .combobox-caret {
+    display: none;

 }
 
 }
 

-
-/* Field - Multicombo
-------------------------------------------------------- */
-.form-field-multicombo {
-    border: 1px solid #cfcfcf;
-    border-top: 0px;
-    padding: 5px 0 5px 10px;
+.form-field-input-multicombo ul.chiplist {
+    padding: 5px 8px 5px 8px;

     background: #fff;
     display: block;
     border-radius: 0 0 4px 4px;
     background: #fff;
     display: block;
     border-radius: 0 0 4px 4px;

-    overflow: hidden;
-}
-.form-field-multicombo:focus {
-    border-bottom: 0px;
-}
-.form-field-multicombo.active {
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
+    width: 100%;

 }
 
 }
 

-.form-field-multicombo li {
+.form-field-input-multicombo li {

     display: inline-flex;
     flex-flow: row nowrap;
     align-items: center;
     display: inline-flex;
     flex-flow: row nowrap;
     align-items: center;

+    margin-bottom: 3px;
+    margin-top: 3px;
+    border-radius: 4px;
+}
+[dir='ltr'] .form-field-input-multicombo li {
+    margin-right: 6px;
+}
+[dir='rtl'] .form-field-input-multicombo li {
+    margin-left: 6px;
+}
+
+.form-field-input-multicombo li.chips {

     background-color: #eff2f7;
     border: 1px solid #ccd5e3;
     background-color: #eff2f7;
     border: 1px solid #ccd5e3;

-    border-radius: 4px;

     line-height: 25px;
     line-height: 25px;

-    padding: 2px 5px;
-    margin: 3px;
+    max-width: 100%;
+}
+[dir='ltr'] .form-field-input-multicombo li.chips {
+    padding: 2px 0px 2px 5px;
+}
+[dir='rtl'] .form-field-input-multicombo li.chips {
+    padding: 2px 5px 2px 0px;

 }
 
 }
 

-.form-field-multicombo a {
+.form-field-input-multicombo li.chips span {
+    display: block;
+    flex: 1 1 auto;
+    overflow: hidden;
+    word-wrap: break-word;
+}
+
+.form-field-input-multicombo a {

     font-family: Arial, Helvetica, sans-serif !important;
     font-size: 16px !important;
     font-family: Arial, Helvetica, sans-serif !important;
     font-size: 16px !important;

-    line-height: 24px;
-    float: right;
-    margin: 1px 0 0 5px;
-    padding: 0;
+    padding: 0px 5px 0px 5px;
+    margin: 0;

     cursor: pointer;
     color: #a6b4ce;
     cursor: pointer;
     color: #a6b4ce;

+    display: block;
+    text-align: center;
+    flex: 0 0 auto;

 }
 
 }
 

-.form-field-multicombo input {
+.form-field-input-multicombo .input-wrap {

     border: 1px solid #ddd;
     width: 100px;
     border: 1px solid #ddd;
     width: 100px;

-    margin: 3px;

     height: 31px;
 }
     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;
 }
 
     border-radius: 4px !important;
 }
 

-
-/* Field - Numeric
-------------------------------------------------------- */
-input[type=number] {
-    position: relative;
-    padding-right: 20%;
-}
-
-.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.chips {
+    width: 100%;

 }
 }

-[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;
 }
     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;
 }
     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;
     border-bottom: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;


@@ -4232,135 +4659,155 @@ input[type=number] {
 
 /* Field - Checkbox
 ------------------------------------------------------- */
 
 /* Field - Checkbox
 ------------------------------------------------------- */

-.checkselect label:last-of-type {
-    display: block;
+.form-field-input-check {
+    display: flex;
+    align-items: end;

     background: #fff;
     padding: 5px 10px;
     color: #7092ff;
     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;
 }
     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;
 }
 
     display: none;
 }
 

+.form-field-input-check:hover {
+    background: #f1f1f1;
+}
+.form-field-input-check .set {
+    color: inherit;
+}
+.form-field-input-check label:not(.set) input[type="checkbox"] {
+    opacity: .5;
+}
+

 
 /* Field - Radio button
 ------------------------------------------------------- */
 
 /* Field - Radio button
 ------------------------------------------------------- */

-.toggle-list button.remove {
-    border-radius: 0 0 3px 3px;
+.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;

 }
 }

-.toggle-list button.remove .icon {
-    position: absolute;
-    left: 5px;
+.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;

 }
 
 
 /* Field - Maxspeed
 ------------------------------------------------------- */
 }
 
 
 /* Field - Maxspeed
 ------------------------------------------------------- */

-#preset-input-maxspeed_advisory,
-#preset-input-maxspeed {
-    border-right: none;
+.form-field-input-maxspeed > input:first-of-type {

     border-radius: 0 0 0 4px;
     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;
 }
     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;
     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;
 }
 
 
     border-right: 0;
     border-radius: 0 0 0 4px;
 }
 
 

-/* Field - Wikipedia
-------------------------------------------------------- */
-.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;
-}
-
-

 /* Field - Localized Name
 ------------------------------------------------------- */
 /* Field - Localized Name
 ------------------------------------------------------- */

-.form-field .localized-main {
-    padding-right: 12%;
+.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;
     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;
 }
 
     border-radius: 0 0 0 4px;
 }
 

-.form-field .localized-wrap {
+.form-field-input-localized button.localized-add.disabled,
+.form-field-input-localized input.localized-main.disabled,
+.form-field-input-localized input.localized-lang.disabled,
+.form-field-input-localized input.localized-value.disabled {
+    color: #777;
+    background-color: #eee;
+    cursor: not-allowed;
+}
+
+/* nested subfields for name in different languages */
+.localized-multilingual {

     padding: 0 10px;
     padding: 0 10px;

+    flex-basis: 100%;

 }
 }

-.form-field .localized-wrap .entry {
+.localized-multilingual .entry {

     position: relative;
     overflow: hidden;
 }
 
     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;
     content: "";
     display: block;
     position: absolute;


@@ -4373,22 +4820,38 @@ input[type=number] {
     margin: auto;
 }
 
     margin: auto;
 }
 

-.form-field .localized-wrap .entry .localized-lang {
+.localized-multilingual .entry .localized-lang {

     border-radius: 0;
     border-top-width: 0;
     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;
     border-top-width: 0;
     border-radius: 0 0 4px 4px;

-}
-.form-field .localized-wrap .form-label button {
-    border-top-right-radius: 3px;
+    width: 100%;

 }
 
 
 /* Field - Address
 ------------------------------------------------------- */
 }
 
 
 /* Field - Address
 ------------------------------------------------------- */

-.addr-row input {
+.form-field-input-address {
+    flex: 1 1 auto;
+    display: flex;
+    flex-flow: row wrap;
+    border: 1px solid #ccc;
+    border-top: 0px;
+}
+
+.addr-row {
+    flex: 1 1 auto;
+    display: flex;
+    width: 100%;
+    min-height: 30px;
+}
+
+.addr-row > input {
+    flex: 1 1 auto;
+    border-radius: 0;

     border-right: 0;
     border-bottom: 0;
 }
     border-right: 0;
     border-bottom: 0;
 }


@@ -4400,25 +4863,18 @@ input[type=number] {
 .addr-row:first-of-type input {
     border-top: 0;
 }
 .addr-row:first-of-type input {
     border-top: 0;
 }

-

 .addr-row input:first-of-type {
     border-left: 0;
 }
 [dir='rtl'] .addr-row input:first-of-type {
     border-right: 0;
 }
 .addr-row 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: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;
 }
 .addr-row:last-of-type input:last-of-type {
     border-radius: 0 0 4px 0;
 }


@@ -4427,13 +4883,59 @@ input[type=number] {
 }
 
 
 }
 
 

+/* 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,
+.form-field-wikidata ul.rows li:last-child button.form-field-button:last-child {
+    border-radius: 0 0 4px 0;
+}
+[dir='rtl'] .wiki-title-container > button.wiki-link,
+[dir='rtl'] .form-field-wikidata ul.rows li:last-child button.form-field-button:last-child {
+    border-radius: 0 0 0 4px;
+}
+
+

 /* Field - Restriction Editor
 ------------------------------------------------------- */
 /* Field - Restriction Editor
 ------------------------------------------------------- */

-.form-field-restrictions .restriction-controls-container {
+.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;
     background-color: #fff;

-    border-top: 1px solid #ccc;

     width: 100%;
     padding: 5px;
     width: 100%;
     padding: 5px;

+    border-top: 1px solid #ccc;
+    border-radius: 0 0 4px 4px;

 }
 
 .restriction-controls-container .restriction-controls {
 }
 
 .restriction-controls-container .restriction-controls {


@@ -4468,16 +4970,16 @@ input[type=number] {
     vertical-align: middle;
 }
 
     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 */
     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';
 }
 
     content: '\200b';
 }
 

-.form-field-restrictions svg.surface {
+.form-field-input-restrictions svg.surface {

     width: 100%;
     height: 100%;
 }
     width: 100%;
     height: 100%;
 }


@@ -4524,19 +5026,10 @@ input[type=number] {
 .form-field-comment:not(.present) #preset-input-comment {
     border-color: rgb(230, 100, 100);
 }
 .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) .field-label {

     border-color: rgb(230, 100, 100);
     background: rgba(230, 100, 100, 0.2);
 }
     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);
 }
 .form-field-comment:not(.present) button {
     border-color: rgb(230, 100, 100);
 }


@@ -4580,9 +5073,10 @@ div.combobox {
     display: inline-block;
     position: relative;
     height: 30px;
     display: inline-block;
     position: relative;
     height: 30px;

-    width: 30px;
+    width: 30px !important;

     margin-left: -30px;
     vertical-align: top;
     margin-left: -30px;
     vertical-align: top;

+    cursor: pointer;

 }
 [dir='rtl'] .combobox-caret {
   margin-left: 0;
 }
 [dir='rtl'] .combobox-caret {
   margin-left: 0;


@@ -4643,6 +5137,7 @@ div.combobox {
 }
 .field-help-nav-item.active {
     color: #7092ff;
 }
 .field-help-nav-item.active {
     color: #7092ff;

+    border-bottom: 2px solid;

 }
 .field-help-nav-item:hover {
     color: #597be7;
 }
 .field-help-nav-item:hover {
     color: #597be7;


@@ -4702,23 +5197,113 @@ div.combobox {
 }
 
 
 }
 
 

+/* More Fields dropdown
+------------------------------------------------------- */
+.more-fields {
+    padding: 0 20px 20px 20px;
+    font-weight: bold;
+}
+.changeset-editor .more-fields {
+    padding: 15px 20px 0 20px;
+}
+
+.more-fields label {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.more-fields input {
+    margin-left: 10px;
+    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
 ------------------------------------------------------- */
 /* Raw Tag Editor
 ------------------------------------------------------- */

-.tag-list {
-    padding-top: 10px;
+.raw-tag-options {
+    display: flex;
+    flex-flow: row nowrap;
+    flex-direction: row-reverse;
+    margin-top: -25px;
+    padding: 0 3px;
+}
+button.raw-tag-option {
+    flex: 0 0 20px;
+    height: 20px;
+    width: 20px;
+    background: #aaa;
+    color: #eee;
+    margin: 0 3px;
+}
+button.raw-tag-option:focus,
+button.raw-tag-option:hover,
+button.raw-tag-option.active {
+    color: #fff;
+    background: #597be7;
+}
+button.raw-tag-option.selected {
+    color: #fff;
+    background: #7092ff;
+}
+button.raw-tag-option svg.icon {
+    width: 14px;
+    height: 14px;
+    vertical-align: text-bottom;
+}
+[dir='ltr'] button.raw-tag-option-list {
+    -moz-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
+    -webkit-transform: scaleX(-1);
+    transform: scaleX(-1);
+    filter: FlipH;
+    -ms-filter: "FlipH";
+}
+
+
+.tag-text {
+    width: 100%;
+    height: 100%;
+    font-family: monospace;
+    white-space: pre;

 }
 
 }
 

+.tag-text,
+.tag-list {
+    margin-top: 10px;
+}

 .tag-row {
     width: 100%;
     position: relative;
 .tag-row {
     width: 100%;
     position: relative;

-    clear: both;
+}
+.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-text.readonly,

 .tag-row.readonly,
 .tag-row.readonly input.key,
 .tag-row.readonly input.value,
 .tag-row.readonly button.remove {
 .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;
 }
     background-color: #eee;
     cursor: not-allowed;
 }


@@ -4729,22 +5314,13 @@ div.combobox {
     border-radius: 0;
     border-bottom: 1px solid #ccc;
     border-left: 1px solid #ccc;
     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;
 }
 
 }
 [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;
 
 .tag-row input.key {
     font-weight: bold;


@@ -4770,17 +5346,15 @@ div.combobox {
 .tag-row:first-child input.value {
     border-top: 1px solid #ccc;
 }
 .tag-row:first-child input.value {
     border-top: 1px solid #ccc;
 }

-

 .tag-row button {
 .tag-row button {

-    position: absolute;
+    flex: 0 0 32px;

     height: 31px;
     height: 31px;

-    right: 10%;
+    width: 32px;

     border: 1px solid #ccc;
     border-top-width: 0;
     border-left-width: 0;
 }
 [dir='rtl'] .tag-row button {
     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;
 }
     border-left-width: 1px;
     border-right-width: 0;
 }


@@ -4788,11 +5362,9 @@ div.combobox {
 .tag-row button:hover {
     background: #f1f1f1;
 }
 .tag-row button:hover {
     background: #f1f1f1;
 }

-

 .tag-row button .icon {
     opacity: .5;
 }
 .tag-row button .icon {
     opacity: .5;
 }

-

 .tag-row:first-child button {
     border-top-width: 1px;
 }
 .tag-row:first-child button {
     border-top-width: 1px;
 }


@@ -4814,136 +5386,132 @@ div.combobox {
 }
 
 .tag-row .tag-reference-button {
 }
 
 .tag-row .tag-reference-button {

-    right: 0;

     border-radius: 0;
     border-radius: 0;

-    width: 10%;
-    top: 0;
-    background: #fafafa;

 }
 [dir='rtl'] .tag-row .tag-reference-button {
 }
 [dir='rtl'] .tag-row .tag-reference-button {

-    left: auto;
-    right: auto;
-    margin-right: 35px;

     border-left-width: 1px;
     border-right-width: 0;
 }
 
     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 */
 /* Tag reference */

-button.minor.tag-reference-loading {
+.tag-reference-loading {

     background-color: #f5f5f5;
 }
     background-color: #f5f5f5;
 }

-

 .tag-reference-loading .icon {
     background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
     background-position: 0 0;
 }
 
 .tag-reference-body {
 .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;
     overflow: hidden;

-    clear: both;
+    display: none;
+    padding-top: 10px;

 }
 }

-
-.tag-reference-body .tag-reference-description {
-    margin: 10px 5px 0 5px;
+.tag-reference-body.expanded {
+    padding-bottom: 10px;
+    display: inline-block;

 }
 }

+.tag-reference-description {

 
 

-.tag-reference-body a {
+}
+.tag-reference-link {

     display: block;
 }
 
     display: block;
 }
 

-.tag-reference-body .tag-reference-description:last-child,
-.tag-reference-body a:last-child {
-    margin-bottom: 15px;
+img.tag-reference-wiki-image {
+    float: right;
+    width: 33.3333%;
+    border-radius: 4px;
+    margin: 0 0 0 5px;
+}
+[dir='rtl'] img.tag-reference-wiki-image {
+    float: left;
+    margin: 0 5px 0 0;

 }
 
 .preset-list .tag-reference-body {
     position: relative;
     width: 100%;
 }
 }
 
 .preset-list .tag-reference-body {
     position: relative;
     width: 100%;
 }

-

 .raw-tag-editor .tag-reference-body {
 .raw-tag-editor .tag-reference-body {

-    float: left;

     width: 100%;
 }
     width: 100%;
 }

-

 .raw-tag-editor .tag-row.readonly .tag-reference-body {
     background: #f6f6f6;
     color: #333;
 }
 .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;
 }
     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-tag-editor .tag-row.readonly .tag-reference-body.expanded {
+    border-top: 1px solid #ccc;
+}

 
 
 /* Raw Member / Membership Editor
 ------------------------------------------------------- */
 
 
 /* Raw Member / Membership Editor
 ------------------------------------------------------- */

-.raw-member-editor .member-list li:first-child,
-.raw-membership-editor .member-list li:first-child {
+
+.raw-member-editor .member-list,
+.raw-membership-editor .member-list {

     padding-top: 10px;
 }
     padding-top: 10px;
 }

-
-.raw-member-editor .member-row,
-.raw-membership-editor .member-row {
+.raw-member-editor .member-list li,
+.raw-membership-editor .member-list li {

     position: relative;
     position: relative;

+    border-radius: 4px;
+    margin: 0;
+    padding-bottom: 10px;

 }
 }

-

 .raw-member-editor .member-row .member-entity-name,
 .raw-membership-editor .member-row .member-entity-name {
     font-weight: normal;
     padding-left: 10px;
 }
 
 .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 {
 .member-incomplete .member-delete {
     display: none;
 }
 
 .member-row-new .member-entity-input {

+    flex: 1 1 100%;

     border-radius: 4px 4px 0 0;
     border-radius: 4px 4px 0 0;

-    border: 1px solid #cfcfcf;
+    border: 0;

 }
 
 }
 

-.add-relation {
-    width: 40%;
-    height: 30px;
-    background: rgba(0,0,0,.5);
-    border-radius: 4px;
-    margin-top: 10px;
+.raw-member-editor .member-row.dragging {
+    opacity: 0.75;
+    z-index: 3000;
+    /*
+    -webkit-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3);
+    -moz-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3);
+    box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3);
+    */

 }
 }

+.raw-member-editor .member-row.dragging

 
 

-.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 */
 }
 
 /* hidden field to prevent user from tabbing out of the sidebar */


@@ -4955,9 +5523,42 @@ input.key-trap {
 }
 
 
 }
 
 

-/* OSM Note Editor
+/* 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);
+}
+
+.add-tag {
+    border-radius: 0 0 4px 4px;
+}
+.add-relation {
+    margin-top: 10px;
+    border-radius: 4px;
+}
+
+
+/* OSM Note / KeepRight Editors

 ------------------------------------------------------- */
 ------------------------------------------------------- */

-.note-header {
+.note-header,
+.error-header {

     background-color: #f6f6f6;
     border-radius: 5px;
     border: 1px solid #ccc;
     background-color: #f6f6f6;
     border-radius: 5px;
     border: 1px solid #ccc;


@@ -4966,7 +5567,8 @@ input.key-trap {
     align-items: center;
 }
 
     align-items: center;
 }
 

-.note-header-icon {
+.note-header-icon,
+.error-header-icon {

     background-color: #fff;
     padding: 10px;
     flex: 0 0 62px;
     background-color: #fff;
     padding: 10px;
     flex: 0 0 62px;


@@ -4976,18 +5578,31 @@ input.key-trap {
     border-right: 1px solid #ccc;
     border-radius: 5px 0 0 5px;
 }
     border-right: 1px solid #ccc;
     border-radius: 5px 0 0 5px;
 }

-[dir='rtl'] .note-header-icon {
+[dir='rtl'] .note-header-icon,
+[dir='rtl'] .error-header-icon {

     border-right: unset;
     border-left: 1px solid #ccc;
     border-radius: 0 5px 5px 0;
 }
 
     border-right: unset;
     border-left: 1px solid #ccc;
     border-radius: 0 5px 5px 0;
 }
 

-.note-header-icon .icon-wrap {
+.note-header-icon .icon-wrap,
+.error-header-icon .icon-wrap {

     position: absolute;
     top: 0px;
 }
     position: absolute;
     top: 0px;
 }

+.preset-icon-28 {
+    position: absolute;
+    top: 16px;
+    left: 16px;
+    margin: auto;
+}
+.preset-icon-28 .icon {
+    width: 28px;
+    height: 28px;
+}

 
 

-.note-header-label {
+.note-header-label,
+.error-header-label {

     background-color: #f6f6f6;
     padding: 0 15px;
     flex: 1 1 100%;
     background-color: #f6f6f6;
     padding: 0 15px;
     flex: 1 1 100%;


@@ -4995,7 +5610,8 @@ input.key-trap {
     font-weight: bold;
     border-radius: 0 5px 5px 0;
 }
     font-weight: bold;
     border-radius: 0 5px 5px 0;
 }

-[dir='rtl'] .note-header-label {
+[dir='rtl'] .note-header-label,
+[dir='rtl'] .error-header-label {

     border-radius: 5px 0 0 5px;
 }
 
     border-radius: 5px 0 0 5px;
 }
 


@@ -5061,18 +5677,41 @@ input.key-trap {
     border-left: none;
 }
 
     border-left: none;
 }
 

-.note-save {
+.note-save,
+.error-save {
+    padding-top: 20px;
+}
+
+.error-details {
+    padding: 10px;
+}
+.error-details-container {
+    background: #ececec;

     padding: 10px;
     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 {
+.note-save .new-comment-input,
+.error-save .new-comment-input {

     width: 100%;
     height: 100px;
     max-height: 300px;
     min-height: 100px;
 }
 
     width: 100%;
     height: 100px;
     max-height: 300px;
     min-height: 100px;
 }
 

-.note-save .detail-section {
+.note-save .detail-section,
+.error-save .detail-section {

     margin: 10px 0;
 }
 
     margin: 10px 0;
 }
 


@@ -5125,12 +5764,12 @@ input.key-trap {
     border-radius: 5px 0 0 5px;
 }
 
     border-radius: 5px 0 0 5px;
 }
 

-/* tag editor - no buttons */
-.data-editor.raw-tag-editor button {
+/* custom data editor - no info/delete buttons */
+.data-editor.raw-tag-editor .tag-row button {

     display: none;
 }
 .data-editor.raw-tag-editor .tag-row .key-wrap,
     display: none;
 }
 .data-editor.raw-tag-editor .tag-row .key-wrap,

-.data-editor.raw-tag-editor .tag-row .input-wrap-position {
+.data-editor.raw-tag-editor .tag-row .value-wrap {

     width: 50%;
 }
 
     width: 50%;
 }
 


@@ -5139,7 +5778,7 @@ input.key-trap {
 ------------------------------------------------------- */
 .map-controls {
     right: 0;
 ------------------------------------------------------- */
 .map-controls {
     right: 0;

-    top: 132px;
+    top: 141px;

     width: 40px;
     position: fixed;
     z-index: 100;
     width: 40px;
     position: fixed;
     z-index: 100;


@@ -5150,6 +5789,7 @@ input.key-trap {
 }
 
 .map-control > button {
 }
 
 .map-control > button {

+    position: relative;

     width: 40px;
     background: rgba(0,0,0,.5);
     border-radius: 0;
     width: 40px;
     background: rgba(0,0,0,.5);
     border-radius: 0;


@@ -5168,9 +5808,10 @@ input.key-trap {
 /* Fullscreen Button (disabled)
 ------------------------------------------------------- */
 div.full-screen {
 /* Fullscreen Button (disabled)
 ------------------------------------------------------- */
 div.full-screen {

-    float: right;
+    display: inline-block;

     width: 40px;
     margin-right: 10px;
     width: 40px;
     margin-right: 10px;

+    display: none;

 }
 
 div.full-screen .tooltip {
 }
 
 div.full-screen .tooltip {


@@ -5250,11 +5891,11 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
     border-radius: 4px;
 }
 

-.layer-list li {
-    position: relative;
+.layer-list > li {

     height: 30px;
     background-color: #fff;
     color: #7092ff;
     height: 30px;
     background-color: #fff;
     color: #7092ff;

+    position: relative;

 }
 
 .layer-list:empty {
 }
 
 .layer-list:empty {


@@ -5306,6 +5947,13 @@ div.full-screen > button:hover {
     cursor: pointer;
 }
 
     cursor: pointer;
 }
 

+[dir='ltr'] .layer-list .indented label {
+    padding-left: 24px;
+}
+[dir='rtl'] .layer-list .indented label {
+    padding-right: 24px;
+}
+

 .layer-list label > span {
     display: block;
     overflow: hidden;
 .layer-list label > span {
     display: block;
     overflow: hidden;


@@ -5313,40 +5961,384 @@ div.full-screen > button:hover {
     text-overflow: ellipsis;
 }
 
     text-overflow: ellipsis;
 }
 

-.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;
+.map-data-pane .layer-list button,
+.background-pane .layer-list button {
+    float: right;
+    height: 100%;
+    border-left: 1px solid #ccc;
+    border-radius: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+[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 .issue-label,
+.issue-label .issue-text {
+    width: 100%;
+    display: flex;
+    flex-flow: row nowrap;
+    cursor: pointer;
+}
+
+.issue-text .issue-icon {
+    flex: 0 0 auto;
+    padding: 5px 7px;
+}
+.issue-text .issue-message {
+    flex: 1 1 auto;
+    padding: 5px 0;
+}
+.issue-label .issue-autofix {
+    flex: 0 0 auto;
+    padding: 5px 8px;
+}
+.issue-label .issue-info-button {
+    height: unset;
+    width: 32px;
+    flex: 0 0 auto;
+    border-left: 1px solid #ccc;
+    background-color: rgba(0,0,0,0);
+}
+[dir='rtl'] .issue-label .issue-info-button {
+    border-left: 0;
+    border-right: 1px solid;
+}
+.issue-container .issue-label .issue-info-button .icon {
+    opacity: 0.5;
+}
+.issue-container.active .issue-label .issue-info-button .icon {
+    opacity: 0.7;
+}
+.issue-label .issue-info-button:last-child {
+    border-radius: 0 4px 4px 0;
+}
+[dir='rtl'] .issue-label .issue-info-button:last-child {
+    border-radius: 4px 0 0 4px;
+}
+
+button.autofix.action {
+    flex: 0 0 20px;
+    height: 20px;
+    width: 20px;
+    background: #7092ff;
+    color: #fff;
+}
+button.autofix.action:focus,
+button.autofix.action:hover,
+button.autofix.action.active {
+    background: #597be7;
+}
+
+/* fix all */
+.autofix-all {
+    display: flex;
+    flex-flow: row nowrap;
+    flex-direction: row-reverse;
+    margin-top: -25px;
+    padding-bottom: 5px;
+}
+.autofix-all-link-text {
+    padding: 0;
+}
+.autofix-all-link-icon svg {
+    margin: 0 9px;
+    background: currentColor;
+    border-radius: 4px;
+}
+.autofix-all-link-icon svg use {
+    color: #fff;
+}
+
+/* warning styles */
+.warnings-list,
+.warnings-list *,
+.issue-container.active .issue.severity-warning,
+.issue-container.active .issue.severity-warning * {
+    border-color: #fb2;
+}
+
+.warnings-list .issue.severity-warning .issue-label,
+.issue.severity-warning .issue-fix-list,
+.mode-save .warning-section {
+    background: #ffc;
+}
+
+.issue-container.active .issue.severity-warning .issue-label {
+    background: #ffa;
+}
+
+.warnings-list .issue.severity-warning .issue-label:hover,
+.issue.severity-warning .issue-fix-item.actionable:hover {
+    background: #ff8;
+}
+
+.issue.severity-warning .issue-icon {
+    color: #f90;
+}
+
+.issue.severity-warning .issue-fix-item.actionable,
+.issue-container.active .issue.severity-warning .issue-info-button {
+    color: #b15500;
+    fill: #b15500;
+    /*color: #7092ff;*/
+    /*fill: #7092ff;*/
+}
+.issue.severity-warning .issue-fix-item.actionable:hover,
+.issue-container.active .issue.severity-warning .issue-info-button:hover {
+    color: #7f3d00;
+    fill: #7f3d00;
+    /*color: #597be7;*/
+    /*fill: #597be7;*/
+}
+
+.notification-badge.warning {
+    color: #ffdf5c;
+}
+
+
+/* error styles */
+.errors-list,
+.errors-list *,
+.issue-container.active .issue.severity-error,
+.issue-container.active .issue.severity-error * {
+    border-color: #f77;
+}
+
+.errors-list .issue.severity-error .issue-label,
+.issue.severity-error .issue-fix-list,
+.mode-save .error-section {
+    background: #ffd6d6;
+}
+
+.issue-container.active .issue.severity-error .issue-label {
+    background: #ffc6c6;
+}
+
+.errors-list .issue.severity-error .issue-label:hover,
+.issue.severity-error .issue-fix-item.actionable:hover {
+    background: #ffb6b6;
+}
+
+.issue.severity-error .issue-icon {
+    color: #dd1400;
+}
+
+.issue.severity-error .issue-fix-item.actionable,
+.issue-container.active .issue.severity-error .issue-info-button {
+    color: #b91201;
+    fill: #b91201;
+    /*color: #7092ff;*/
+    /*fill: #7092ff;*/
+}
+.issue.severity-error .issue-fix-item.actionable:hover,
+.issue-container.active .issue.severity-error .issue-info-button:hover {
+    color: #840c00;
+    fill: #840c00;
+    /*color: #597be7;*/
+    /*fill: #597be7;*/
+}
+
+.notification-badge.error {
+    color: #ff0c05;
+}
+
+
+/* Issues Pane */
+.issues-options-container {
+    display: table;
+}
+.issues-option {
+    display: table-row;
+}
+.issues-option-title {
+    display: table-cell;
+    font-weight: bold;
+    padding-right: 10px;
+}
+[dir='rtl'] .issues-option-title {
+    padding-right: 0;
+    padding-left: 10px;
+}
+.issues-option label {
+    display: table-cell;
+    padding: 0 10px;
+}
+
+.layer-list.issues-list li.issue {
+    border-color: inherit;    /* override .layer-list styles */
+    color: inherit;
+    height: unset;
+}
+
+.layer-list.issue-rules-list,
+.layer-list.issues-list,
+.layer-list.layer-feature-list {
+    margin-bottom: 0;
+}
+.section-footer {
+    display: flex;
+    flex-flow: row nowrap;
+    flex-direction: row-reverse;
+    height: 30px;
+}
+.section-footer a {
+    padding: 5px;
+}
+
+.issues-none .box {
+    border-radius: 4px;
+    border: 1px solid #72d979;
+    background: #c6ffca;
+    padding: 5px !important;
+    display: flex;
+}
+.issues-none .icon {
+    color: #05ac10;
+}
+
+input.square-degrees-input {
+    padding: 2px;
+    height: unset;
+    text-align: center;
+    background: rgba(0,0,0,0);
+    color: currentColor;
+}
+
+
+/* Entity Issues List */
+.entity-issues .issue-container .issue {
+    border-radius: 4px;
+    border: 1px solid #ccc;
+    background: #f6f6f6;
+}
+.entity-issues .issue-container:not(.active) .issue-text:hover,
+.entity-issues .issue-container:not(.active) .issue-info-button:hover {
+    background: #f1f1f1;
+}
+.entity-issues .issue .issue-label .issue-text {
+    padding-right: 10px;
+}
+[dir='rtl'] .entity-issues .issue .issue-label .issue-text {
+    padding-right: unset;
+    padding-left: 10px;
+}
+
+.entity-issues .issue-container.active .issue-label .issue-text {
+    font-weight: bold;
+}
+.entity-issues .issue-container:not(:last-of-type) {
+    margin-bottom: 5px;
+}
+.entity-issues .issue-container.active:not(:first-of-type) {
+    margin-top: 10px;
+}
+.entity-issues .issue-container.active:not(:last-of-type) {
+    margin-bottom: 10px;
+}
+
+/* fixes */
+.entity-issues .issue-fix-list {
+    border-top: 1px solid;
+    border-color: inherit;
+}
+.entity-issues .issue-container.active .issue-fix-list:empty {
+    display: none;
+}
+
+li.issue-fix-item {
+    padding: 2px 10px 2px 20px;
+}
+[dir='rtl'] li.issue-fix-item {
+    padding: 2px 20px 2px 10px;
+}
+li.issue-fix-item:first-of-type {
+    padding-top: 5px;
+}
+li.issue-fix-item:last-of-type {
+    padding-bottom: 5px;
+}
+
+li.issue-fix-item .fix-message {
+    padding: 0 10px;
+}
+
+li.issue-fix-item.actionable {
+    cursor: pointer;

 }
 }

-[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;
+li.issue-fix-item:not(.actionable) .fix-icon {
+    color: #555;
+    fill: #555;

 }
 
 }
 

-.map-data-control .layer-list button .icon,
-.background-control .layer-list button .icon {
-    opacity: 0.5;
+.issue-container:not(.active) ul.issue-fix-list {
+    display: none;

 }
 
 }
 

-.map-data-control .layer-list button:first-of-type,
-.background-control .layer-list button:first-of-type {
-    border-radius: 0 3px 3px 0;
+.issue-info {
+    flex: 1 1 auto;
+    width: 100%;
+    overflow: hidden;
+    display: none;
+    padding: 10px 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;
+.issue-info.expanded {
+    display: inline-block;

 }
 
 }
 

-.map-data-control .vectortile-container .vectortile-header {
-    padding-bottom: 5px;
+.issue-info .issue-reference {
+    margin-bottom: 10px;

 }
 }

-.map-data-control .vectortile-container .vectortile-footer {
-    padding-bottom: 10px;
+.issue-info .tagDiff-table {
+    min-width: 60%;
+    width: unset;
+    border: 1px solid #ccc;
+}
+.issue-info .tagDiff-row {
+    border: 1px solid #ccc;
+}
+.issue-info .tagDiff-cell {
+    padding: 2px 10px;
+    font-family: monospace;
+    font-size: 10px;
+    border: 1px solid #ccc;
+}
+.issue-info .tagDiff-cell-add {
+    background: #dfd;
+}
+.issue-info .tagDiff-cell-remove {
+    background: #fdd;

 }
 
 
 }
 
 


@@ -5386,7 +6378,7 @@ div.full-screen > button:hover {
 
 /* Background - Adjust Alignment
 ------------------------------------------------------- */
 
 /* Background - Adjust Alignment
 ------------------------------------------------------- */

-.background-control .nudge-container {
+.background-pane .nudge-container {

     border: 1px solid #ccc;
     border-radius: 4px;
     padding: 10px;
     border: 1px solid #ccc;
     border-radius: 4px;
     padding: 10px;


@@ -5487,25 +6479,25 @@ div.full-screen > button:hover {
    cursor: move;
 }
 
    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;
 }
 
     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;
 }
 
     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;
 }
 
     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;
     border-right: 5px solid transparent;
     border-left: 5px solid transparent;
     border-top: 5px solid #222;


@@ -5514,18 +6506,23 @@ div.full-screen > button:hover {
 
 /* Side Panes - Background / Map Data / Help
 ------------------------------------------------------- */
 
 /* Side Panes - Background / Map Data / Help
 ------------------------------------------------------- */

+.map-panes {
+    flex: 0 1 auto;
+    position: relative;
+    height: 100%;
+}

 .map-pane {
 .map-pane {

-    position: fixed;
-    top: 60px;
-    bottom: 30px;
-    right: 0;
-    padding-bottom: 50px;
+    position: relative;
+    top: 0;
+    width: 400px;
+    height: 100%;
+    padding-bottom: 60px;

     overflow: hidden;
     overflow: hidden;

-    z-index: -1;
+    z-index: 10;

 }
 }

-[dir='rtl'] .map-pane {
-    left: 0;
-    right: auto !important;
+
+.map-pane.help-wrap {
+    width: 600px;

 }
 
 .pane-heading {
 }
 
 .pane-heading {


@@ -5533,26 +6530,28 @@ div.full-screen > button:hover {
     flex-flow: row nowrap;
     justify-content: space-between;
     border-bottom: 1px solid #ccc;
     flex-flow: row nowrap;
     justify-content: space-between;
     border-bottom: 1px solid #ccc;

+    height: 60px;

 }
 
 .pane-heading h2 {
 }
 
 .pane-heading h2 {

-    margin: 15px 20px;
+    margin: 14px 20px;

 }
 
 .pane-heading button {
     width: 40px;
 }
 
 .pane-heading button {
     width: 40px;

-    height: 61px;
+    height: 100%;

     border-radius: 0;
 }
 
 .pane-content {
     height: 100%;
     border-radius: 0;
 }
 
 .pane-content {
     height: 100%;

-    padding: 10px 50px 20px 20px;
+    padding: 10px 40px 20px 20px;

     overflow-x: hidden;
     overflow-y: scroll;
     overflow-x: hidden;
     overflow-y: scroll;

+    position: relative;

 }
 [dir='rtl'] .pane-content {
 }
 [dir='rtl'] .pane-content {

-    padding: 10px 20px 20px 50px;
+    padding: 10px 20px 20px 40px;

 }
 
 .pane-content > div {
 }
 
 .pane-content > div {


@@ -5662,6 +6661,155 @@ div.full-screen > button:hover {
 }
 
 
 }
 
 

+/* Inspector (hover styles)
+------------------------------------------------------- */
+.inspector-hover .entity-issues .issue-container .issue .issue-label,
+.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 {
+    background: #ececec;
+}
+.inspector-hover .preset-list-button,
+.inspector-hover .tag-row input {
+    background: #f6f6f6;
+}
+
+.inspector-hover a,
+.inspector-hover .form-field-input-multicombo .chips,
+.inspector-hover .form-field-input-check span,
+.inspector-hover .entity-issues .issue .icon {
+    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 .preset-favorite-button,
+.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-container .issue-fix-list,
+.inspector-hover .entity-issues .issue-container .issue-info-button {
+    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 .field-label button,
+.inspector-hover .tag-row button,
+.inspector-hover .footer * {
+    opacity: 0;
+}
+
+/* Unstyle the active entity issue on hover */
+.inspector-hover .entity-issues .issue-container.active {
+    margin-top: 1px;
+    margin-bottom: 1px;
+}
+.inspector-hover .entity-issues .issue-container * {
+    border-color: #ccc !important;
+}
+.inspector-hover .entity-issues .issue-container.active .issue-label {
+    border-bottom: 0;
+}
+.inspector-hover .entity-issues .issue-container.active .issue-label .issue-text {
+    font-weight: normal;
+}
+
+
+/* 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;
+}
+
+

 /* Raster Background Tiles
 ------------------------------------------------------- */
 img.tile {
 /* Raster Background Tiles
 ------------------------------------------------------- */
 img.tile {


@@ -5756,7 +6904,7 @@ img.tile-debug {
 .map-in-map {
     position: absolute;
     overflow: hidden;
 .map-in-map {
     position: absolute;
     overflow: hidden;

-    top: 60px;
+    top: 10px;

     width: 200px;
     height: 150px;
     z-index: 5;
     width: 200px;
     height: 150px;
     z-index: 5;


@@ -5764,6 +6912,12 @@ img.tile-debug {
     border: #aaa 1px solid;
     box-shadow: 0 0 2em black;
 }
     border: #aaa 1px solid;
     box-shadow: 0 0 2em black;
 }

+[dir='ltr'] .map-in-map {
+    left: 10px;
+}
+[dir='rtl'] .map-in-map {
+    right: 10px;
+}

 
 .map-in-map-tiles {
     transform-origin: 0 0;
 
 .map-in-map-tiles {
     transform-origin: 0 0;


@@ -5848,40 +7002,55 @@ img.tile-debug {
 }
 
 
 }
 
 

+.over-map {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 71px;
+    bottom: 30px;
+    pointer-events: none;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: flex-end;
+}
+.over-map > * {
+    pointer-events: auto;
+}
+

 /* Information Panels
 ------------------------------------------------------- */
 .info-panels {
     display: flex;
     flex-flow: row-reverse wrap-reverse;
 /* Information Panels
 ------------------------------------------------------- */
 .info-panels {
     display: flex;
     flex-flow: row-reverse wrap-reverse;

-    position: absolute;
+    width: 100%;

     z-index: 1;
     z-index: 1;

-    right: 0;
-    bottom: 30px;

     -ms-user-select: element;
     -ms-user-select: element;

+    pointer-events: none;

 }
 
 }
 

-.info-panels h1,
-.info-panels h2,
-.info-panels h3,
-.info-panels h4,
-.info-panels h5 {
+.panel-container h1,
+.panel-container h2,
+.panel-container h3,
+.panel-container h4,
+.panel-container h5 {

     display: inline-block;
     margin-bottom: 0;
 }
 
     display: inline-block;
     margin-bottom: 0;
 }
 

-.info-panels h1,
-.info-panels h2,
-.info-panels h3 {
+.panel-container h1,
+.panel-container h2,
+.panel-container h3 {

     color: #ff8;
 }
 
 .panel-container {
     flex: 0 0 auto;
     color: #ff8;
 }
 
 .panel-container {
     flex: 0 0 auto;

-    margin: 2px 0 0 2px;
+    margin: 0 2px 2px 0;

     border-radius: 4px;
     border: 1px solid rgba(0, 0, 0, 0.75);
     padding-bottom: 10px;
     width: 250px;
     border-radius: 4px;
     border: 1px solid rgba(0, 0, 0, 0.75);
     padding-bottom: 10px;
     width: 250px;

+    pointer-events: auto;

 }
 
 .panel-container .panel-title {
 }
 
 .panel-container .panel-title {


@@ -5942,12 +7111,9 @@ img.tile-debug {
     margin-left: auto;
     margin-right: 8px;
 }
     margin-left: auto;
     margin-right: 8px;
 }

-
-.panel-content-history .view-history-on-osm {
-    display: block;
-    margin-top: 10px;
+.panel-content-history h4 {
+    padding-bottom: 0;

 }
 }

-

 .panel-content-location .location-info {
     margin-top: 10px;
 }
 .panel-content-location .location-info {
     margin-top: 10px;
 }


@@ -6256,7 +7422,7 @@ img.tile-debug {
     vertical-align: baseline;
     width: 11px;
     height: 11px;
     vertical-align: baseline;
     width: 11px;
     height: 11px;

-    fill: #fff;
+    color: #fff;

 }
 
 /* For text (e.g. upcoming events) */
 }
 
 /* For text (e.g. upcoming events) */


@@ -6290,6 +7456,9 @@ img.tile-debug {
     right: 0;
     margin: auto;
     z-index: 50;
     right: 0;
     margin: auto;
     z-index: 50;

+    width: 50%;
+    min-width: 200px;
+    max-width: 600px;

 }
 
 .modal .loader {
 }
 
 .modal .loader {


@@ -6300,7 +7469,7 @@ img.tile-debug {
 }
 
 .shaded {
 }
 
 .shaded {

-    z-index: 49;
+    z-index: 5000;

     position: absolute;
     top: 0;
     bottom: 0;
     position: absolute;
     top: 0;
     bottom: 0;


@@ -6326,6 +7495,10 @@ img.tile-debug {
     text-align: center;
 }
 
     text-align: center;
 }
 

+.modal-section.buttons button {
+    min-width: 130px;
+}
+

 .modal-section.buttons .action {
     display: inline-block;
     margin: 0 10px;
 .modal-section.buttons .action {
     display: inline-block;
     margin: 0 10px;


@@ -6351,7 +7524,9 @@ img.tile-debug {
 .loading-modal {
     text-align: center;
 }
 .loading-modal {
     text-align: center;
 }

-
+.modal-actions {
+    display: flex;
+}

 .modal-actions button {
     font-weight: normal;
     color: #7092ff;
 .modal-actions button {
     font-weight: normal;
     color: #7092ff;


@@ -6359,7 +7534,7 @@ img.tile-debug {
     border-radius: 0;
     height: 160px;
     text-align: center;
     border-radius: 0;
     height: 160px;
     text-align: center;

-    display: inline-block;
+    width: 100%;

 }
 .modal-actions button:hover {
     background-color: #ececec;
 }
 .modal-actions button:hover {
     background-color: #ececec;


@@ -6525,6 +7700,7 @@ img.tile-debug {
 }
 .modal-shortcuts .tab.active {
     color: #7092ff;
 }
 .modal-shortcuts .tab.active {
     color: #7092ff;

+    border-bottom: 2px solid;

 }
 .modal-shortcuts .tab:hover {
     color: #597be7;
 }
 .modal-shortcuts .tab:hover {
     color: #597be7;


@@ -6534,11 +7710,11 @@ img.tile-debug {
 .modal-shortcuts .shortcut-tab {
     display: flex;
     flex-flow: row wrap;
 .modal-shortcuts .shortcut-tab {
     display: flex;
     flex-flow: row wrap;

+    justify-content: center;

 }
 
 .modal-shortcuts .shortcut-column {
 }
 
 .modal-shortcuts .shortcut-column {

-    flex: 1 1 50%;
-    width: 50%;
+    width: auto;

 }
 
 .modal-shortcuts .shortcut-tab-tools .shortcut-column {
 }
 
 .modal-shortcuts .shortcut-tab-tools .shortcut-column {


@@ -6555,13 +7731,12 @@ img.tile-debug {
 }
 
 .modal-shortcuts .shortcut-keys {
 }
 
 .modal-shortcuts .shortcut-keys {

-    padding-right: 10px;
+    padding: 0 10px;

     color: #767676;
     text-align: right;
     color: #767676;
     text-align: right;

+    white-space: nowrap;

 }
 [dir='rtl'] .modal-shortcuts .shortcut-keys {
 }
 [dir='rtl'] .modal-shortcuts .shortcut-keys {

-    padding-right: auto;
-    padding-left: 10px;

     text-align: left;
 }
 
     text-align: left;
 }
 


@@ -6601,9 +7776,7 @@ svg.mouseclick use.right {
 ------------------------------------------------------- */
 .settings-modal textarea {
     height: 70px;
 ------------------------------------------------------- */
 .settings-modal textarea {
     height: 70px;

-}
-.settings-modal .buttons .button.col3 {
-    float: none;   /* undo float left */
+    width: 100%;

 }
 
 .settings-custom-background .instructions-template {
 }
 
 .settings-custom-background .instructions-template {


@@ -6678,10 +7851,6 @@ svg.mouseclick use.right {
     margin-bottom: 10px;
 }
 
     margin-bottom: 10px;
 }
 

-.mode-save .warning-section {
-    background: #ffb;
-}
-

 .mode-save .warning-section .changeset-list button {
     border-left: 1px solid #ccc;
 }
 .mode-save .warning-section .changeset-list button {
     border-left: 1px solid #ccc;
 }


@@ -6771,7 +7940,7 @@ svg.mouseclick use.right {
 ------------------------------------------------------- */
 .notice {
     position: absolute;
 ------------------------------------------------------- */
 .notice {
     position: absolute;

-    top: 45px;
+    top: 15px;

     left: 0;
     right: 0;
     text-align: center;
     left: 0;
     right: 0;
     text-align: center;


@@ -6808,30 +7977,29 @@ svg.mouseclick use.right {
     display: none;
     color: #333;
     font-size: 12px;
     display: none;
     color: #333;
     font-size: 12px;

+    white-space: initial;
+}
+.tooltip:not(.curtain-tooltip) {
+    pointer-events: none;

 }
 }

-

 .tooltip.in {
     opacity: 0.9;
 .tooltip.in {
     opacity: 0.9;

-    z-index: 1030;
+    z-index: 5000;

     height: auto;
     display: block;
 }
     height: auto;
     display: block;
 }

-

 .tooltip.top {
     margin-top: -20px;
     text-align: center;
 }
 .tooltip.top {
     margin-top: -20px;
     text-align: center;
 }

-

 .tooltip.right {
     margin-left: 20px;
     text-align: left;
 }
 .tooltip.right {
     margin-left: 20px;
     text-align: left;
 }

-

 .tooltip.bottom {
     margin-top: 20px;
     text-align: center;
 }
 .tooltip.bottom {
     margin-top: 20px;
     text-align: center;
 }

-

 .tooltip.left {
     margin-left: -20px;
     text-align: right;
 .tooltip.left {
     margin-left: -20px;
     text-align: right;


@@ -6856,7 +8024,6 @@ svg.mouseclick use.right {
     position: absolute;
     background: transparent;
 }
     position: absolute;
     background: transparent;
 }

-

 .tail::after {
     content: "";
     position: absolute;
 .tail::after {
     content: "";
     position: absolute;


@@ -6903,7 +8070,6 @@ svg.mouseclick use.right {
     border-color: transparent;
     border-style: solid;
 }
     border-color: transparent;
     border-style: solid;
 }

-

 .tooltip.top .tooltip-arrow {
     bottom: -5px;
     left: 50%;
 .tooltip.top .tooltip-arrow {
     bottom: -5px;
     left: 50%;


@@ -6911,7 +8077,6 @@ svg.mouseclick use.right {
     border-top-color: #fff;
     border-width: 5px 5px 0;
 }
     border-top-color: #fff;
     border-width: 5px 5px 0;
 }

-

 .tooltip.right .tooltip-arrow {
     top: 50%;
     left: -5px;
 .tooltip.right .tooltip-arrow {
     top: 50%;
     left: -5px;


@@ -6919,7 +8084,6 @@ svg.mouseclick use.right {
     border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
     border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }

-

 .tooltip.left .tooltip-arrow {
     top: 50%;
     right: -5px;
 .tooltip.left .tooltip-arrow {
     top: 50%;
     right: -5px;


@@ -6927,7 +8091,6 @@ svg.mouseclick use.right {
     border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }
     border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }

-

 .tooltip.bottom .tooltip-arrow {
     top: -5px;
     left: 50%;
 .tooltip.bottom .tooltip-arrow {
     top: -5px;
     left: 50%;


@@ -6938,7 +8101,7 @@ svg.mouseclick use.right {
 
 .tooltip-heading {
     font-weight: bold;
 
 .tooltip-heading {
     font-weight: bold;

-    background: #F6F6F6;
+    background: #f6f6f6;

     padding: 10px;
     margin: -10px -10px 10px -10px;
     border-radius: 3px 3px 0 0;
     padding: 10px;
     margin: -10px -10px 10px -10px;
     border-radius: 3px 3px 0 0;


@@ -6946,52 +8109,57 @@ svg.mouseclick use.right {
 }
 
 .keyhint-wrap {
 }
 
 .keyhint-wrap {

-    background: #F6F6F6;
+    background: #f6f6f6;

     padding: 10px;
     margin: 10px -10px -10px -10px;
     border-radius: 0 0 3px 3px;
 }
     padding: 10px;
     margin: 10px -10px -10px -10px;
     border-radius: 0 0 3px 3px;
 }

-

 .tooltip-inner .keyhint {
     font-weight: bold;
     margin-left: 5px;
 }
 
 .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 */
+.tooltip.dark.top .tooltip-arrow,

 .map-pane .tooltip.top .tooltip-arrow,
 .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;
 }
     border-top-color: #000;
 }

-
+.tooltip.dark.bottom .tooltip-arrow,

 .map-pane .tooltip.bottom .tooltip-arrow,
 .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;
 }
     border-bottom-color: #000;
 }

-
+.tooltip.dark.left .tooltip-arrow,

 .map-pane .tooltip.left .tooltip-arrow,
 .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;
 }
     border-left-color: #000;
 }

-
+.tooltip.dark.right .tooltip-arrow,

 .map-pane .tooltip.right .tooltip-arrow,
 .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;
 }
     border-right-color: #000;
 }

-
+.tooltip.dark .tooltip-inner,
+.tooltip.dark .tooltip-heading,
+.tooltip.dark .keyhint-wrap,

 .map-pane .tooltip-inner,
 .map-pane .tooltip-heading,
 .map-pane .keyhint-wrap,
 .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;
 }
     background: #000;
     color: #ccc;
 }

+
+/* Exceptions for tooltip layouts */
+

 /* commit warning tooltips need to be closer */
 .warning-section .tooltip.top {
     margin-top: -5px;
 /* commit warning tooltips need to be closer */
 .warning-section .tooltip.top {
     margin-top: -5px;


@@ -7006,19 +8174,33 @@ svg.mouseclick use.right {
 }
 
 /* Move over tooltips that are near the edge of screen */
 }
 
 /* Move over tooltips that are near the edge of screen */

-.add-point .tooltip {
-    left: 33.3333% !important;
+[dir='ltr'] .sidebar-toggle .tooltip {
+    left: 0 !important;

 }
 }

-[dir='rtl'] .add-point .tooltip {
-    left: inherit !important;
+[dir='rtl'] .sidebar-toggle .tooltip {
+    right: 0 !important;

 }
 }

-
-.add-point .tooltip .tooltip-arrow {
-    left: 60px;
+[dir='ltr'] .sidebar-toggle .tooltip .tooltip-arrow {
+    left: 20px;
+}
+[dir='rtl'] .sidebar-toggle .tooltip .tooltip-arrow {
+    right: 20px;
+}
+[dir='ltr'] .save .tooltip {
+    left: auto !important;
+    right: 0 !important;
+}
+[dir='rtl'] .save .tooltip {
+    right: auto !important;
+    left: 0 !important;

 }
 }

-[dir='rtl'] .add-point .tooltip .tooltip-arrow {
+[dir='ltr'] .save .tooltip .tooltip-arrow {

     left: auto;
     left: auto;

-    right: 60px;
+    right: 36px;
+}
+[dir='rtl'] .save .tooltip .tooltip-arrow {
+    right: auto;
+    left: 36px;

 }
 
 li:first-of-type .badge .tooltip,
 }
 
 li:first-of-type .badge .tooltip,


@@ -7135,23 +8317,6 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
 }
 
 
 }
 
 

-/* 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 {
 /* Scrollbars
  ----------------------------------------------------- */
 ::-webkit-scrollbar {


@@ -7271,8 +8436,8 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     padding: 10px 20px 0 20px;
 }
 
     padding: 10px 20px 0 20px;
 }
 

-[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 {
-    float: right;
+.curtain-tooltip .tooltip-inner .button-section button {
+    width: 66.6666%;

 }
 
 .curtain-tooltip .tooltip-inner .instruction:only-child {
 }
 
 .curtain-tooltip .tooltip-inner .instruction:only-child {


@@ -7344,5 +8509,3 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
     width: 100px;
     color: #7092ff;
 }
     width: 100px;
     color: #7092ff;
 }

-
-