X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9c44641b3223b659c52fee00ce3d5c7b362af8f..942e62117ff7f12d40618a94ea3f4e86f8cb25af:/vendor/assets/iD/iD.css.erb?ds=inline

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index b1b94aef8..6ed4c3c09 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -161,53 +161,88 @@ input::-moz-focus-inner {
 .cf:after {
     clear: both;
 }
-/* tiles */
-img.tile {
-    position:absolute;
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
-
-    opacity: 0;
-
-    -webkit-transition: opacity 200ms linear;
-    transition: opacity 200ms linear;
-    -moz-transition: opacity 200ms linear;
+/* base styles */
+.layer-osm path:not(.oneway-marker-path) {                /* IE/Edge needs :not(.oneway) */
+    fill: none;
 }
-
-img.tile-loaded {
-    opacity: 1;
+.layer-osm path.viewfield-marker-path {                   /* IE/Edge rule for <use> marker style */
+    fill: #333;
+    fill-opacity: 0.75;
+    stroke: #fff;
+    stroke-width: 0.5px;
+    stroke-opacity: 0.75;
 }
-img.tile-removing {
-    opacity: 0;
+.fill-wireframe .layer-osm path.viewfield-marker-path {   /* IE/Edge rule for <use> marker style */
+    fill: none;
 }
 
-use { pointer-events: none; }
-
-/* base styles */
-.layer-osm path:not(.oneway) { fill: none; }     /* IE needs :not(.oneway) */
-
 /* the above fill: none rule affects paths in <use> shadow dom only in Firefox */
 .layer-osm use.icon path { fill: #333; }                       /* FF svg Maki icons */
 .layer-osm .turn use path { fill: #000; }                      /* FF turn restriction icons */
-#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; }  /* FF turn-only, turn-only-u */
-#turn-no-shape2, #turn-no-u-shape2     { fill: #E06D5F; }  /* FF turn-no, turn-no-u */
-#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8CD05F; }  /* FF turn-yes, turn-yes-u */
+#turn-only-shape2, #turn-only-u-shape2 { fill: #7092ff; }      /* FF turn-only, turn-only-u */
+#turn-no-shape2, #turn-no-u-shape2     { fill: #e06d5f; }      /* FF turn-no, turn-no-u */
+#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8cd05f; }      /* FF turn-yes, turn-yes-u */
 
-g.point .shadow,
-g.vertex .shadow,
-g.midpoint .shadow {
-    pointer-events: all;
+
+/* No interactivity except what we specifically allow */
+.layer-osm * {
+    pointer-events: none;
 }
 
-path.shadow {
+.lasso #map {
+    pointer-events: visibleStroke;
+}
+
+
+/* `.target` objects are interactive */
+/* They can be picked up, clicked, hovered, or things can connect to them */
+.node.target {
+    pointer-events: fill;
+    fill-opacity: 0.8;
+    fill: currentColor;
+    stroke: none;
+}
+
+.way.target {
     pointer-events: stroke;
+    fill: none;
+    stroke-width: 12;
+    stroke-opacity: 0.8;
+    stroke: currentColor;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+}
+
+/* `.target-nope` objects are explicitly forbidden to join to */
+.surface:not(.nope-disabled) .node.target.target-nope,
+.surface:not(.nope-disabled) .way.target.target-nope {
+    cursor: not-allowed;
 }
 
 
-/* points */
+/* `.active` objects (currently being drawn or dragged) are not interactive */
+/* This is important to allow the events to drop through to whatever is */
+/* below them on the map, so you can still hover and connect to other things. */
+.layer-osm .active {
+    pointer-events: none !important;
+}
+
+
+/* points & notes */
+
+g.note .stroke {
+    stroke: #222;
+    stroke-width: 1;
+    fill: #222;
+    opacity: 0.6;
+}
+
+g.note.active .stroke {
+    stroke: #222;
+    stroke-width: 1;
+    fill: #222;
+    opacity: 0.8;
+}
 
 g.point .stroke {
     stroke: #444;
@@ -215,25 +250,36 @@ g.point .stroke {
     fill: #fff;
 }
 
-g.point .shadow {
+g.point .shadow,
+g.note .shadow {
     fill: none;
     stroke: #f6634f;
-    stroke-width: 8;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 
+g.note.related: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.selected .shadow,
 g.point.selected .shadow {
     stroke-opacity: 0.7;
 }
 
-g.point.active, g.point.active * {
-    pointer-events: none;
+/* g.note ellipse.stroke, */
+g.point ellipse.stroke {
+    display: none;
+}
+.mode-drag-note g.note.active ellipse.stroke,
+.mode-drag-node g.point.active ellipse.stroke {
+    display: block;
 }
 
+
 /* vertices and midpoints */
 
 g.vertex .fill {
@@ -247,7 +293,7 @@ g.vertex .stroke {
 }
 
 g.vertex.shared .stroke {
-    fill: #aaa;
+    fill: #bbb;
 }
 
 g.midpoint .fill {
@@ -257,39 +303,16 @@ g.midpoint .fill {
     opacity: .7;
 }
 
-g.midpoint.tag-highway-corridor .fill,
-g.midpoint.tag-highway-pedestrian .fill,
-g.midpoint.tag-highway-steps .fill,
-g.midpoint.tag-highway-path .fill,
-g.midpoint.tag-highway-footway .fill,
-g.midpoint.tag-highway-cycleway .fill,
-g.midpoint.tag-highway-bridleway .fill {
-    fill: #fff;
-    stroke: #333;
-    stroke-opacity: .8;
-    opacity: .8;
-}
-
 g.vertex .shadow,
 g.midpoint .shadow {
+    stroke-width: 6;
     fill: #f6634f;
     fill-opacity: 0;
 }
 
-g.vertex.vertex-hover {
-    display: none;
-}
-
-.mode-draw-area g.vertex.vertex-hover,
-.mode-draw-line g.vertex.vertex-hover,
-.mode-add-area  g.vertex.vertex-hover,
-.mode-add-line  g.vertex.vertex-hover,
-.mode-add-point g.vertex.vertex-hover,
-.mode-drag-node g.vertex.vertex-hover {
-    display: block;
-}
-
+g.vertex.related:not(.selected) .shadow,
 g.vertex.hover:not(.selected) .shadow,
+g.midpoint.related:not(.selected) .shadow,
 g.midpoint.hover:not(.selected) .shadow {
     fill-opacity: 0.5;
 }
@@ -298,24 +321,17 @@ g.vertex.selected .shadow {
     fill-opacity: 0.7;
 }
 
-.mode-draw-area g.midpoint,
-.mode-draw-line g.midpoint,
-.mode-add-area g.midpoint,
-.mode-add-line g.midpoint,
-.mode-add-point g.midpoint {
-  display: none;
-}
 
 /* lines */
 
-.preset-icon .icon.other-line {
+.preset-icon .icon.iD-other-line {
     color: #fff;
     fill: #777;
 }
 
 path.line {
     stroke-linecap: round;
-    stroke-linejoin: bevel;
+    stroke-linejoin: round;
 }
 
 path.stroke {
@@ -325,10 +341,11 @@ path.stroke {
 
 path.shadow {
     stroke: #f6634f;
-    stroke-width: 10;
+    stroke-width: 16;
     stroke-opacity: 0;
 }
 
+path.shadow.related:not(.selected),
 path.shadow.hover:not(.selected) {
     stroke-opacity: 0.4;
 }
@@ -342,8 +359,120 @@ path.line.stroke {
     stroke-width: 2;
 }
 
-path.area.stroke {
+
+/* Labels / Markers */
+
+text {
+    font-size: 10px;
+    color: #222;
+    opacity: 1;
+}
+
+.oneway .textpath.tag-waterway {
+    fill: #002F35;
+}
+
+.onewaygroup path.oneway,
+.viewfieldgroup path.viewfield {
+    stroke-width: 6px;
+}
+
+text.arealabel-halo,
+text.linelabel-halo,
+text.pointlabel-halo,
+text.arealabel,
+text.linelabel,
+text.pointlabel {
+    dominant-baseline: middle;
+    text-anchor: middle;
+    font-size: 12px;
+    font-weight: bold;
+    fill: #333;
+    -webkit-transition: opacity 100ms linear;
+    transition: opacity 100ms linear;
+    -moz-transition: opacity 100ms linear;
+}
+
+/* Opera doesn't support dominant-baseline. See #715 */
+/* Safari 10 seems to have regressed too */
+.linelabel-halo .textpath,
+.linelabel .textpath {
+  baseline-shift: -33%;
+  dominant-baseline: auto;
+}
+
+.layer-labels-halo text {
+    opacity: 0.7;
     stroke: #fff;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+
+text.nolabel {
+    opacity: 0;
+}
+
+text.point {
+    font-size: 10px;
+}
+
+.icon.areaicon-halo {
+    opacity: 0.6;
+    stroke: #999;
+    stroke-width: 2px;
+    stroke-miterlimit: 1;
+}
+
+.icon.areaicon {
+    fill: #222;
+    opacity: 0.8;
+}
+
+
+/* Turn Restrictions */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    cursor: auto !important;
+    pointer-events: none;
+}
+
+/* Turn restriction paths and vertices */
+.surface.tr .way.target,
+.surface.tr path.shadow.selected,
+.surface.tr path.shadow.related {
+    stroke-width: 25px;
+}
+
+.surface.tr path.shadow.selected,
+.surface.tr path.shadow.related,
+.surface.tr g.vertex.selected .shadow,
+.surface.tr g.vertex.related .shadow {
+    stroke-opacity: 0.7;
+    stroke: #777;
+}
+.surface.tr path.shadow.related.allow,
+.surface.tr g.vertex.related.allow .shadow {
+    stroke: #5b3;
+}
+.surface.tr path.shadow.related.restrict,
+.surface.tr g.vertex.related.restrict .shadow {
+    stroke: #d53;
+}
+.surface.tr path.shadow.related.only,
+.surface.tr g.vertex.related.only .shadow {
+    stroke: #68f;
+}
+
+
+/* Default - light gray */
+path.area.stroke {
+    stroke: #ddd;
     stroke-width: 1;
 }
 path.area.fill {
@@ -357,33 +486,22 @@ path.area.fill {
     background-color: rgba(170, 170, 170, 0.3);
 }
 
-path.stroke.tag-natural {
-    stroke: rgb(182, 225, 153);
-}
-path.fill.tag-natural {
-    stroke: rgba(182, 225, 153, 0.3);
-    fill: rgba(182, 225, 153, 0.3);
-}
-.preset-icon-fill-area.tag-natural {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.3);
+path.shadow.old-multipolygon,
+path.stroke.old-multipolygon {
+    stroke-dasharray: 100, 5;
+    stroke-linecap: butt;
 }
 
+/* Green things */
 path.stroke.tag-landuse,
-path.stroke.tag-natural-wood,
-path.stroke.tag-natural-tree,
-path.stroke.tag-natural-grassland,
-path.stroke.tag-natural-grass,
+path.stroke.tag-natural,
 path.stroke.tag-leisure-nature_reserve,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
     stroke: rgb(140, 208, 95);
 }
 path.fill.tag-landuse,
-path.fill.tag-natural-wood,
-path.fill.tag-natural-tree,
-path.fill.tag-natural-grassland,
-path.fill.tag-natural-grass,
+path.fill.tag-natural,
 path.fill.tag-leisure-nature_reserve,
 path.fill.tag-leisure-pitch,
 path.fill.tag-leisure-park {
@@ -391,10 +509,7 @@ path.fill.tag-leisure-park {
     fill: rgba(140, 208, 95, 0.3);
 }
 .preset-icon-fill-area.tag-landuse,
-.preset-icon-fill-area.tag-natural-wood,
-.preset-icon-fill-area.tag-natural-tree,
-.preset-icon-fill-area.tag-natural-grassland,
-.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-natural,
 .preset-icon-fill-area.tag-leisure-nature_reserve,
 .preset-icon-fill-area.tag-leisure-pitch,
 .preset-icon-fill-area.tag-leisure-park {
@@ -402,16 +517,21 @@ path.fill.tag-leisure-park {
     background-color: rgba(140, 208, 95, 0.3);
 }
 
+/* Blue things */
 path.stroke.tag-amenity-swimming_pool,
 path.stroke.tag-leisure-swimming_pool,
 path.stroke.tag-natural-water,
+path.stroke.tag-landuse-aquaculture,
 path.stroke.tag-landuse-basin,
+path.stroke.tag-landuse-harbour,
 path.stroke.tag-landuse-reservoir {
     stroke: rgb(119, 211, 222);
 }
 path.fill.tag-amenity-swimming_pool,
 path.fill.tag-leisure-swimming_pool,
+path.fill.tag-landuse-aquaculture,
 path.fill.tag-landuse-basin,
+path.fill.tag-landuse-harbour,
 path.fill.tag-landuse-reservoir,
 path.fill.tag-natural-water {
     stroke: rgba(119, 211, 222, 0.3);
@@ -419,20 +539,36 @@ path.fill.tag-natural-water {
 }
 .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);
 }
 
+/* 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-natural-beach,
+path.stroke.tag-natural-sand,
+path.stroke.tag-natural-scrub,
 path.stroke.tag-amenity-childcare,
 path.stroke.tag-amenity-kindergarten,
 path.stroke.tag-amenity-school,
 path.stroke.tag-amenity-college,
 path.stroke.tag-amenity-university {
-    stroke: rgb(255, 255, 148);
+    stroke: rgba(255, 255, 148, 0.75);
 }
+path.fill.tag-leisure-pitch.tag-sport-beachvolleyball,
+path.fill.tag-natural-beach,
+path.fill.tag-natural-sand,
+path.fill.tag-natural-scrub,
 path.fill.tag-amenity-childcare,
 path.fill.tag-amenity-kindergarten,
 path.fill.tag-amenity-school,
@@ -441,436 +577,458 @@ 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(255, 255, 148);
+    border-color: rgb(232, 232, 0);
     background-color: rgba(255, 255, 148, 0.15);
 }
 
-path.stroke.tag-landuse-residential {
+/* Gold things */
+.pattern-color-construction {
+    fill: rgba(196, 189, 25, 0.3);
+}
+path.stroke.tag-landuse-residential,
+path.stroke.tag-landuse.tag-status,
+path.stroke.tag-landuse-construction {
     stroke: rgb(196, 189, 25);
 }
 path.fill.tag-landuse-residential {
     stroke: rgba(196, 189, 25, 0.3);
     fill: rgba(196, 189, 25, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-residential {
+.preset-icon-fill-area.tag-landuse-residential,
+.preset-icon-fill-area.tag-landuse.tag-status,
+.preset-icon-fill-area.tag-landuse-construction {
     border-color: rgb(196, 189, 25);
     background: rgba(196, 189, 25, 0.3);
 }
 
+/* Orange things */
 path.stroke.tag-landuse-retail,
-path.stroke.tag-landuse-commercial {
+path.stroke.tag-landuse-commercial,
+path.stroke.tag-landuse-landfill,
+path.stroke.tag-military,
+path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }
 path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
+path.fill.tag-landuse-commercial,
+path.fill.tag-landuse-landfill,
+path.fill.tag-military,
+path.fill.tag-landuse-military {
     stroke: rgba(214, 136, 26, 0.3);
     fill: rgba(214, 136, 26, 0.3);
 }
 .preset-icon-fill-area.tag-landuse-retail,
-.preset-icon-fill-area.tag-landuse-commercial {
+.preset-icon-fill-area.tag-landuse-commercial,
+.preset-icon-fill-area.tag-landuse-landfill,
+.preset-icon-fill-area.tag-military,
+.preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.3);
 }
 
-path.stroke.tag-landuse-industrial {
+/* Pink things */
+path.stroke.tag-landuse-industrial,
+path.stroke.tag-power-plant {
     stroke: rgb(228, 164, 245);
 }
-path.fill.tag-landuse-industrial {
+path.fill.tag-landuse-industrial,
+path.fill.tag-power-plant {
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-industrial {
+.preset-icon-fill-area.tag-landuse-industrial,
+.preset-icon-fill-area.tag-power-plant {
     border-color: rgb(228, 164, 245);
     background-color: rgba(228, 164, 245, 0.3);
 }
 
-path.stroke.tag-landuse-quarry {
-    stroke: rgb(166, 149, 123);
-}
-path.fill.tag-landuse-quarry {
-    stroke: rgba(166, 149, 123, 0.2);
-    fill: rgba(166, 149, 123, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-quarry {
-    border-color: rgb(166, 149, 123);
-    background-color: rgba(166, 149, 123, 0.2);
-}
-
-path.stroke.tag-landuse-landfill {
-    stroke: rgb(255, 153, 51);
-}
-path.fill.tag-landuse-landfill {
-    stroke: rgba(255, 153, 51, 0.2);
-    fill: rgba(255, 153, 51, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-landfill {
-    border-color: rgb(255, 153, 51);
-    background-color: rgba(255, 153, 51, 0.2);
-}
-
-.pattern-color-construction {
-    fill: rgba(196, 189, 25, 0.2);
-}
-path.stroke.tag-landuse.tag-status {
-    stroke: rgb(196, 189, 25);
-}
-.preset-icon-fill-area.tag-landuse.tag-status {
-    border-color: rgb(196, 189, 25);
-    background-color: rgba(196, 189, 25, 0.2);
-}
-
-path.stroke.tag-landuse-military {
-    stroke: rgb(214, 136, 26);
-}
-path.fill.tag-landuse-military {
-    stroke: rgba(214, 136, 26, 0.2);
-    fill: rgba(214, 136, 26, 0.2);
-}
-.preset-icon-fill-area.tag-landuse-military {
-    border-color: rgb(214, 136, 26);
-    background-color: rgba(214, 136, 26, 0.2);
-}
-
+/* Teal things */
 .pattern-color-wetland {
-    fill: rgba(182, 225, 153, 0.2);
+    fill: rgba(153, 225, 170, 0.3);
 }
 path.stroke.tag-natural-wetland {
-    stroke: rgb(182, 225, 153);
+    stroke: rgb(153, 225, 170);
 }
 .preset-icon-fill-area.tag-natural-wetland {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.2);
-}
-
-.pattern-color-meadow {
-    fill: rgba(182, 225, 153, 0.2);
-}
-path.stroke.tag-landuse-meadow {
-    stroke: rgb(182, 225, 153);
-}
-.preset-icon-fill-area.tag-landuse-meadow {
-    border-color: rgb(182, 225, 153);
-    background-color: rgba(182, 225, 153, 0.2);
-}
-
-.pattern-color-beach {
-    fill: rgba(255, 255, 126, 0.2);
-}
-path.stroke.tag-natural-beach {
-    stroke: rgb(255, 255, 126);
-}
-.preset-icon-fill-area.tag-natural-beach {
-    border-color: rgb(255, 255, 126);
-    background-color: rgba(255, 255, 126, 0.2);
-}
-
-.pattern-color-scrub {
-    fill: rgba(219, 240, 139, 0.2);
-}
-path.stroke.tag-natural-scrub {
-    stroke: rgb(219, 240, 139);
-}
-.preset-icon-fill-area.tag-natural-scrub {
-    border-color: rgb(219, 240, 139);
-    background-color: rgba(219, 240, 139, 0.2);
+    border-color: rgb(153, 225, 170);
+    background-color: rgba(153, 225, 170, 0.2);
 }
 
+/* Light Green things */
+.pattern-color-cemetery,
+.pattern-color-orchard,
+.pattern-color-meadow,
 .pattern-color-farm,
 .pattern-color-farmland {
-    fill: rgba(140, 208, 95, 0.2);
+    fill: rgba(191, 232, 63, 0.2);
 }
+path.stroke.tag-landuse-cemetery,
+path.stroke.tag-landuse-orchard,
+path.stroke.tag-landuse-meadow,
 path.stroke.tag-landuse-farm,
 path.stroke.tag-landuse-farmland {
-    stroke: rgb(140, 208, 95);
+    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(140, 208, 95, 0.2);
+    background-color: rgba(191, 232, 63, 0.2);
 }
 
-.pattern-color-cemetery,
-.pattern-color-orchard {
-    fill: rgba(140, 208, 95, 0.2);
+/* Tan things */
+path.stroke.tag-landuse-farmyard {
+    stroke: rgb(245, 220, 186);
 }
-path.stroke.tag-landuse-cemetery,
-path.stroke.tag-landuse-orchard {
-    stroke: rgb(140, 208, 95);
+path.fill.tag-landuse-farmyard {
+    stroke: rgba(245, 220, 186, 0.3);
+    fill: rgba(245, 220, 186, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-cemetery,
-.preset-icon-fill-area.tag-landuse-orchard {
-    background-color: rgba(140, 208, 95, 0.2);
+.preset-icon-fill-area.tag-landuse-farmyard {
+    border-color: rgb(226, 177, 111);
+    background: rgba(245, 220, 186, 0.3);
 }
 
-path.stroke.tag-amenity-parking {
-    stroke: rgb(170, 170, 170);
-}
-path.fill.tag-amenity-parking {
-    stroke: rgba(170, 170, 170, 0.3);
-    fill: rgba(170, 170, 170, 0.3);
+/* Dark Gray things */
+path.stroke.tag-amenity-parking,
+path.stroke.tag-leisure-pitch.tag-sport-basketball,
+path.stroke.tag-leisure-pitch.tag-sport-skateboard,
+path.stroke.tag-natural-bare_rock,
+path.stroke.tag-natural-scree,
+path.stroke.tag-landuse-railway,
+path.stroke.tag-landuse-quarry {
+    stroke: #bbb;
 }
-.preset-icon-fill-area.tag-amenity-parking {
+path.fill.tag-amenity-parking,
+path.fill.tag-leisure-pitch.tag-sport-basketball,
+path.fill.tag-leisure-pitch.tag-sport-skateboard,
+path.fill.tag-natural-bare_rock,
+path.fill.tag-natural-scree,
+path.fill.tag-landuse-railway,
+path.fill.tag-landuse-quarry {
+    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(170, 170, 170, 0.3);
+    background-color: rgba(140, 140, 140, 0.5);
 }
 
-
-/* highway areas */
-
-path.stroke.area.tag-highway {
-    stroke:#fff;
-    stroke-dasharray: none;
-    stroke-width: 2;
+/* Light gray overrides */
+path.stroke.tag-natural-cave_entrance,
+path.stroke.tag-natural-glacier {
+    stroke: #ddd;
+}
+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);
 }
 
-/* wide highways */
+/* highways */
 
 .preset-icon .icon.tag-highway.other-line {
     color: #fff;
     fill: #777;
 }
-
-path.shadow.tag-highway {
-    stroke-width:16;
-}
 path.casing.tag-highway {
-    stroke:#444;
-    stroke-width:10;
+    stroke: #444;
 }
 path.stroke.tag-highway {
-    stroke:#ccc;
-    stroke-width:8;
+    stroke: #ccc;
+}
+
+/* highway areas */
+
+path.stroke.area.tag-highway,
+.low-zoom path.stroke.area.tag-highway {
+    stroke: #fff;
+    stroke-dasharray: none;
+    stroke-width: 1;
+}
+
+/* wide highways */
+
+path.shadow.tag-highway {
+    stroke-width: 20;
+}
+path.casing.tag-highway {
+    stroke-width: 10;
+}
+path.stroke.tag-highway {
+    stroke-width: 8;
 }
 
 .low-zoom path.shadow.tag-highway {
-    stroke-width:12;
+    stroke-width: 16;
 }
 .low-zoom path.casing.tag-highway {
-    stroke-width:6;
+    stroke-width: 7;
 }
 .low-zoom path.stroke.tag-highway {
-    stroke-width:4;
+    stroke-width: 5;
 }
 
-.preset-icon .icon.highway-motorway,
-.preset-icon .icon.highway-motorway-link {
+.preset-icon .icon.iD-highway-motorway,
+.preset-icon .icon.iD-highway-motorway-link {
     color: #CF2081;
     fill: #70372f;
 }
 path.stroke.tag-highway-motorway,
 path.stroke.tag-highway-motorway_link,
 path.stroke.tag-motorway {
-    stroke:#CF2081;
+    stroke: #CF2081;
 }
 path.casing.tag-highway-motorway,
 path.casing.tag-highway-motorway_link,
 path.casing.tag-motorway {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-trunk,
-.preset-icon .icon.highway-trunk-link {
+.preset-icon .icon.iD-highway-trunk,
+.preset-icon .icon.iD-highway-trunk-link {
     color: #DD2F22;
     fill: #70372f;
 }
 path.stroke.tag-highway-trunk,
 path.stroke.tag-highway-trunk_link,
 path.stroke.tag-trunk {
-    stroke:#DD2F22;
+    stroke: #DD2F22;
 }
 path.casing.tag-highway-trunk,
 path.casing.tag-highway-trunk_link,
 path.casing.tag-trunk {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-primary,
-.preset-icon .icon.highway-primary-link {
+.preset-icon .icon.iD-highway-primary,
+.preset-icon .icon.iD-highway-primary-link {
     color: #F99806;
     fill: #70372f;
 }
 path.stroke.tag-highway-primary,
 path.stroke.tag-highway-primary_link,
 path.stroke.tag-primary {
-    stroke:#F99806;
+    stroke: #F99806;
 }
 path.casing.tag-highway-primary,
 path.casing.tag-highway-primary_link,
 path.casing.tag-primary {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-secondary,
-.preset-icon .icon.highway-secondary-link {
+.preset-icon .icon.iD-highway-secondary,
+.preset-icon .icon.iD-highway-secondary-link {
     color: #F3F312;
     fill: #70372f;
 }
 path.stroke.tag-highway-secondary,
 path.stroke.tag-highway-secondary_link,
 path.stroke.tag-secondary {
-    stroke:#F3F312;
+    stroke: #F3F312;
 }
 path.casing.tag-highway-secondary,
 path.casing.tag-highway-secondary_link,
 path.casing.tag-secondary {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.preset-icon .icon.highway-tertiary,
-.preset-icon .icon.highway-tertiary-link {
+.preset-icon .icon.iD-highway-tertiary,
+.preset-icon .icon.iD-highway-tertiary-link {
     color: #FFF9B3;
     fill: #70372f;
 }
 path.stroke.tag-highway-tertiary,
 path.stroke.tag-highway-tertiary_link,
 path.stroke.tag-tertiary {
-    stroke:#FFF9B3;
+    stroke: #FFF9B3;
 }
 path.casing.tag-highway-tertiary,
 path.casing.tag-highway-tertiary_link,
 path.casing.tag-tertiary {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.highway-motorway,
-.legacy-carto .preset-icon .icon.highway-motorway-link {
+.legacy-carto .preset-icon .icon.iD-highway-motorway,
+.legacy-carto .preset-icon .icon.iD-highway-motorway-link {
     color: #58a9ed;
     fill: #2c5476;
 }
 .legacy-carto path.stroke.tag-highway-motorway,
 .legacy-carto path.stroke.tag-highway-motorway_link,
 .legacy-carto path.stroke.tag-motorway {
-    stroke:#58a9ed;
+    stroke: #58a9ed;
 }
 .legacy-carto path.casing.tag-highway-motorway,
 .legacy-carto path.casing.tag-highway-motorway_link,
 .legacy-carto path.casing.tag-motorway {
-    stroke:#2c5476;
+    stroke: #2c5476;
 }
 
-.legacy-carto .preset-icon .icon.highway-trunk,
-.legacy-carto .preset-icon .icon.highway-trunk-link {
+.legacy-carto .preset-icon .icon.iD-highway-trunk,
+.legacy-carto .preset-icon .icon.iD-highway-trunk-link {
     color: #8cd05f;
     fill: #46682f;
 }
 .legacy-carto path.stroke.tag-highway-trunk,
 .legacy-carto path.stroke.tag-highway-trunk_link,
 .legacy-carto path.stroke.tag-trunk {
-    stroke:#8cd05f;
+    stroke: #8cd05f;
 }
 .legacy-carto path.casing.tag-highway-trunk,
 .legacy-carto path.casing.tag-highway-trunk_link,
 .legacy-carto path.casing.tag-trunk {
-    stroke:#46682f;
+    stroke: #46682f;
 }
 
-.legacy-carto .preset-icon .icon.highway-primary,
-.legacy-carto .preset-icon .icon.highway-primary-link {
+.legacy-carto .preset-icon .icon.iD-highway-primary,
+.legacy-carto .preset-icon .icon.iD-highway-primary-link {
     color: #e06d5f;
     fill: #70372f;
 }
 .legacy-carto path.stroke.tag-highway-primary,
 .legacy-carto path.stroke.tag-highway-primary_link,
 .legacy-carto path.stroke.tag-primary {
-    stroke:#e06d5f;
+    stroke: #e06d5f;
 }
 .legacy-carto path.casing.tag-highway-primary,
 .legacy-carto path.casing.tag-highway-primary_link,
 .legacy-carto path.casing.tag-primary {
-    stroke:#70372f;
+    stroke: #70372f;
 }
 
-.legacy-carto .preset-icon .icon.highway-secondary,
-.legacy-carto .preset-icon .icon.highway-secondary-link {
+.legacy-carto .preset-icon .icon.iD-highway-secondary,
+.legacy-carto .preset-icon .icon.iD-highway-secondary-link {
     color: #eab056;
     fill: #75582b;
 }
 .legacy-carto path.stroke.tag-highway-secondary,
 .legacy-carto path.stroke.tag-highway-secondary_link,
 .legacy-carto path.stroke.tag-secondary {
-    stroke:#eab056;
+    stroke: #eab056;
 }
 .legacy-carto path.casing.tag-highway-secondary,
 .legacy-carto path.casing.tag-highway-secondary_link,
 .legacy-carto path.casing.tag-secondary {
-    stroke:#75582b;
+    stroke: #75582b;
 }
 
-.legacy-carto .preset-icon .icon.highway-tertiary,
-.legacy-carto .preset-icon .icon.highway-tertiary-link {
+.legacy-carto .preset-icon .icon.iD-highway-tertiary,
+.legacy-carto .preset-icon .icon.iD-highway-tertiary-link {
     color: #ffff7e;
     fill: #7f7f3f;
 }
 .legacy-carto path.stroke.tag-highway-tertiary,
 .legacy-carto path.stroke.tag-highway-tertiary_link,
 .legacy-carto path.stroke.tag-tertiary {
-    stroke:#ffff7e;
+    stroke: #ffff7e;
 }
 .legacy-carto path.casing.tag-highway-tertiary,
 .legacy-carto path.casing.tag-highway-tertiary_link,
 .legacy-carto path.casing.tag-tertiary {
-    stroke:#7f7f3f;
+    stroke: #7f7f3f;
 }
 
-.preset-icon .icon.highway-residential {
+.preset-icon .icon.iD-highway-residential {
     color: #fff;
     fill: #444;
 }
 path.stroke.tag-highway-residential,
 path.stroke.tag-residential {
-    stroke:#fff;
+    stroke: #fff;
 }
 path.casing.tag-highway-residential,
 path.casing.tag-residential {
-    stroke:#444;
+    stroke: #444;
 }
 
-.preset-icon .icon.highway-unclassified {
-    color: #dcd9b9;
+.preset-icon .icon.iD-highway-unclassified {
+    color: #dca;
     fill: #444;
 }
 path.stroke.tag-highway-unclassified,
 path.stroke.tag-unclassified {
-    stroke:#dcd9b9;
+    stroke: #dca;
 }
 path.casing.tag-highway-unclassified,
 path.casing.tag-unclassified {
-    stroke:#444;
+    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 {
+    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 {
+    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-path,
-path.stroke.tag-highway-footway,
-path.stroke.tag-highway-cycleway,
-path.stroke.tag-highway-bridleway,
-path.stroke.tag-highway-corridor,
-path.stroke.tag-highway-pedestrian,
-path.stroke.tag-highway-steps,
 path.stroke.tag-highway-road,
 path.stroke.tag-living_street,
 path.stroke.tag-service,
 path.stroke.tag-track,
-path.stroke.tag-path,
-path.stroke.tag-footway,
-path.stroke.tag-cycleway,
-path.stroke.tag-bridleway,
-path.stroke.tag-corridor,
-path.stroke.tag-pedestrian,
-path.stroke.tag-steps,
 path.stroke.tag-road {
-    stroke-width:4;
+    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 {
+    stroke-width: 16;
 }
-path.casing.tag-highway-living_street,
-path.casing.tag-highway-service,
-path.casing.tag-highway-track,
 path.casing.tag-highway-path,
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
@@ -878,48 +1036,82 @@ path.casing.tag-highway-bridleway,
 path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian,
 path.casing.tag-highway-steps,
-path.casing.tag-highway-road,
-path.casing.tag-living_street,
-path.casing.tag-service,
-path.casing.tag-track,
 path.casing.tag-path,
 path.casing.tag-footway,
 path.casing.tag-cycleway,
 path.casing.tag-bridleway,
 path.casing.tag-corridor,
 path.casing.tag-pedestrian,
-path.casing.tag-steps,
-path.casing.tag-road {
-    stroke-width:6;
+path.casing.tag-steps {
+    stroke-width: 5;
+}
+path.stroke.tag-highway-path,
+path.stroke.tag-highway-footway,
+path.stroke.tag-highway-cycleway,
+path.stroke.tag-highway-bridleway,
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-highway-steps,
+path.stroke.tag-path,
+path.stroke.tag-footway,
+path.stroke.tag-cycleway,
+path.stroke.tag-bridleway,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian,
+path.stroke.tag-steps {
+    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 {
+    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 {
+    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-path,
-.low-zoom path.stroke.tag-highway-footway,
-.low-zoom path.stroke.tag-highway-cycleway,
-.low-zoom path.stroke.tag-highway-bridleway,
-.low-zoom path.stroke.tag-highway-corridor,
-.low-zoom path.stroke.tag-highway-pedestrian,
-.low-zoom path.stroke.tag-highway-steps,
 .low-zoom path.stroke.tag-highway-road,
 .low-zoom path.stroke.tag-living_street,
 .low-zoom path.stroke.tag-service,
 .low-zoom path.stroke.tag-track,
-.low-zoom path.stroke.tag-path,
-.low-zoom path.stroke.tag-footway,
-.low-zoom path.stroke.tag-cycleway,
-.low-zoom path.stroke.tag-bridleway,
-.low-zoom path.stroke.tag-corridor,
-.low-zoom path.stroke.tag-pedestrian,
-.low-zoom path.stroke.tag-steps,
 .low-zoom path.stroke.tag-road {
-    stroke-width:2;
+    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 {
+    stroke-width: 12;
 }
-.low-zoom path.casing.tag-highway-living_street,
-.low-zoom path.casing.tag-highway-service,
-.low-zoom path.casing.tag-highway-track,
 .low-zoom path.casing.tag-highway-path,
 .low-zoom path.casing.tag-highway-footway,
 .low-zoom path.casing.tag-highway-cycleway,
@@ -927,36 +1119,48 @@ path.casing.tag-road {
 .low-zoom path.casing.tag-highway-corridor,
 .low-zoom path.casing.tag-highway-pedestrian,
 .low-zoom path.casing.tag-highway-steps,
-.low-zoom path.casing.tag-highway-road,
-.low-zoom path.casing.tag-living_street,
-.low-zoom path.casing.tag-service,
-.low-zoom path.casing.tag-track,
 .low-zoom path.casing.tag-path,
 .low-zoom path.casing.tag-footway,
 .low-zoom path.casing.tag-cycleway,
 .low-zoom path.casing.tag-bridleway,
 .low-zoom path.casing.tag-corridor,
 .low-zoom path.casing.tag-pedestrian,
-.low-zoom path.casing.tag-steps,
-.low-zoom path.casing.tag-road {
-    stroke-width:4;
+.low-zoom path.casing.tag-steps {
+    stroke-width: 3;
+}
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway,
+.low-zoom path.stroke.tag-highway-corridor,
+.low-zoom path.stroke.tag-highway-pedestrian,
+.low-zoom path.stroke.tag-highway-steps,
+.low-zoom path.stroke.tag-path,
+.low-zoom path.stroke.tag-footway,
+.low-zoom path.stroke.tag-cycleway,
+.low-zoom path.stroke.tag-bridleway,
+.low-zoom path.stroke.tag-corridor,
+.low-zoom path.stroke.tag-pedestrian,
+.low-zoom path.stroke.tag-steps {
+    stroke-width: 1;
 }
 
-.preset-icon .icon.highway-living-street {
-    color: #ccc;
-    fill: #fff;
+
+.preset-icon .icon.iD-highway-living-street {
+    color: #bbb;
+    fill: #ddd;
 }
 path.stroke.tag-highway-living_street,
 path.stroke.tag-living_street {
-    stroke:#ccc;
+    stroke: #ccc;
 }
 path.casing.tag-highway-living_street,
 path.casing.tag-living_street {
-    stroke:#fff;
+    stroke: #fff;
 }
 
-.preset-icon .icon.highway-footway.tag-highway-corridor,
-.preset-icon .icon.highway-footway.tag-highway-pedestrian {
+.preset-icon .icon.iD-highway-footway.tag-highway-corridor,
+.preset-icon .icon.iD-highway-footway.tag-highway-pedestrian {
     color: #8cd05f;
     fill: #fff;
 }
@@ -964,9 +1168,15 @@ path.stroke.tag-highway-corridor,
 path.stroke.tag-highway-pedestrian,
 path.stroke.tag-corridor,
 path.stroke.tag-pedestrian {
-    stroke:#fff;
+    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 {
+    stroke-dasharray: 1, 4;
+}
 path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian,
 path.casing.tag-corridor,
@@ -980,33 +1190,51 @@ path.casing.tag-pedestrian.tag-unpaved {
     stroke-dasharray: none;
 }
 
-.preset-icon .icon.highway-road {
+.preset-icon .icon.iD-highway-road {
     color: #9e9e9e;
     fill: #666;
 }
 path.stroke.tag-highway-road,
 path.stroke.tag-road {
-    stroke:#9e9e9e;
+    stroke: #9e9e9e;
 }
 path.casing.tag-highway-road,
 path.casing.tag-road {
-    stroke:#666;
+    stroke: #666;
 }
 
-.preset-icon .icon.highway-service {
+.preset-icon .icon.iD-highway-service {
     color: #fff;
     fill: #666;
 }
 path.stroke.tag-highway-service,
 path.stroke.tag-service {
-    stroke:#fff;
+    stroke: #fff;
 }
 path.casing.tag-highway-service,
 path.casing.tag-service {
-    stroke:#666;
+    stroke: #666;
 }
 
-.preset-icon .icon.highway-track {
+/* 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 {
+    color: #dca;
+    fill: #666;
+}
+path.stroke.tag-highway-bus_guideway,
+path.stroke.tag-highway-service.tag-service,
+path.stroke.tag-service.tag-service {
+    stroke: #dca;
+}
+path.casing.tag-highway-bus_guideway,
+path.casing.tag-highway-service.tag-service,
+path.casing.tag-service.tag-service {
+    stroke: #666;
+}
+
+.preset-icon .icon.iD-highway-track {
     color: #eaeaea;
     fill: #c5b59f;
 }
@@ -1026,10 +1254,17 @@ path.stroke.tag-highway-bridleway {
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway {
+    stroke-linecap: butt;
+    stroke-dasharray: 3, 3;
+}
 
 path.casing.tag-highway-path,
 path.casing.tag-highway-path.tag-unpaved {
-    stroke: #c5b59f;
+    stroke: #dca;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
@@ -1044,35 +1279,28 @@ path.casing.tag-highway-bridleway.tag-unpaved {
     stroke-dasharray: none;
 }
 
-.preset-icon .icon.category-path,
-.preset-icon .icon.highway-path {
-    color: #746f6f;
-    fill: #c5b59f;
+.preset-icon .icon.iD-category-path,
+.preset-icon .icon.iD-highway-path {
+    color: #988;
+    fill: #dca;
 }
 path.stroke.tag-highway-path {
-    stroke: #746f6f;
+    stroke: #988;
 }
 
 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
-.preset-icon .icon.highway-footway {
-    color: #ae8681;
+.preset-icon .icon.iD-highway-footway {
+    color: #988;
     fill: #fff;
 }
 path.stroke.tag-highway-footway {
-    stroke: #ae8681;
+    stroke: #988;
 }
 
-.preset-icon .icon.highway-footway.tag-crossing {
-    color: #444;
-}
-path.stroke.tag-highway-footway.tag-crossing {
-    stroke: #444;
-    stroke-dasharray: 6, 4;
-}
 
 .preset-icon .icon.tag-route-bicycle,
-.preset-icon .icon.highway-cycleway {
+.preset-icon .icon.iD-highway-cycleway {
     color: #58a9ed;
     fill: #fff;
 }
@@ -1080,7 +1308,8 @@ path.stroke.tag-highway-cycleway {
     stroke: #58a9ed;
 }
 
-.preset-icon .icon.highway-bridleway {
+.preset-icon .icon.tag-route-horse,
+.preset-icon .icon.iD-highway-bridleway {
     color: #e06d5f;
     fill: #fff;
 }
@@ -1088,7 +1317,7 @@ path.stroke.tag-highway-bridleway {
     stroke: #e06d5f;
 }
 
-.preset-icon .icon.highway-steps {
+.preset-icon .icon.iD-highway-steps {
     color: #81d25c;
     fill: #fff;
 }
@@ -1097,6 +1326,9 @@ path.stroke.tag-highway-steps {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
+.low-zoom path.stroke.tag-highway-steps {
+    stroke-dasharray: 2, 2;
+}
 path.casing.tag-highway-steps,
 path.casing.tag-highway-steps.tag-unpaved {
     stroke: #fff;
@@ -1104,38 +1336,107 @@ path.casing.tag-highway-steps.tag-unpaved {
     stroke-dasharray: none;
 }
 
-
+/* highway midpoints */
+g.midpoint.tag-highway-corridor .fill,
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
+}
 /* aeroways */
-path.stroke.tag-aeroway-taxiway {
-    stroke: #805C80;
-    stroke-width: 4;
+
+/* areas */
+path.stroke.area.tag-aeroway,
+.low-zoom path.stroke.area.tag-aeroway {
+    stroke: #fff;
+    stroke-dasharray: none;
+    stroke-width: 1;
+}
+
+/* narrow aeroways (taxiway) */
+path.shadow.tag-aeroway-taxiway,
+path.shadow.tag-taxiway {
+    stroke-width: 16;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke-width: 7;
+}
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke-width: 5;
+}
+
+.low-zoom path.shadow.tag-aeroway-taxiway,
+.low-zoom path.shadow.tag-taxiway {
+    stroke-width: 12;
+}
+.low-zoom path.casing.tag-aeroway-taxiway,
+.low-zoom path.casing.tag-taxiway {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-aeroway-taxiway,
+.low-zoom path.stroke.tag-taxiway {
+    stroke-width: 3;
+}
+
+.preset-icon .icon.tag-aeroway-taxiway,
+.preset-icon .icon.tag-taxiway {
+    color: #ff0;
+    fill: #666;
+}
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke: #ff0;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke: #666;
+}
+
+
+/* wide aeroways (runway) */
+.preset-icon .icon.tag-aeroway-runway,
+.preset-icon .icon.tag-runway {
+    color: #444;
+    fill: #000;
 }
 path.shadow.tag-aeroway-runway {
     stroke-width: 20;
 }
+path.casing.tag-aeroway-runway {
+    stroke-width: 10;
+    stroke: #000;
+    stroke-linecap: square;
+}
 path.stroke.tag-aeroway-runway {
     stroke: #fff;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 24, 48;
 }
-path.casing.tag-aeroway-runway {
-    stroke-width: 10;
-    stroke: #000;
-    stroke-linecap: square;
+
+.low-zoom path.shadow.tag-aeroway-runway {
+    stroke-width: 16;
+}
+.low-zoom path.casing.tag-aeroway-runway {
+    stroke-width: 7;
+}
+.low-zoom path.stroke.tag-aeroway-runway {
+    stroke-width: 2;
+    stroke-dasharray: 12, 24;
 }
+
 path.fill.tag-aeroway-runway {
     stroke: rgba(0, 0, 0, 0.6);
     fill: rgba(0, 0, 0, 0.6);
 }
-path.stroke.tag-aeroway-apron {
-    stroke: #805C80;
-}
-path.fill.tag-aeroway-apron {
-    stroke: rgba(128, 92, 128, 0.2);
-    fill: rgba(128, 92, 128, 0.2);
-}
-
 
 /* railways */
 .preset-icon .icon.tag-railway.other-line {
@@ -1146,66 +1447,87 @@ path.fill.tag-aeroway-apron {
     color: #555;
     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;
+}
+
+/* narrow widths */
+path.shadow.tag-railway {
+    stroke-width: 16;
+}
+path.casing.tag-railway {
+    stroke-width: 7;
+}
 path.stroke.tag-railway {
-    stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
+
+.low-zoom path.shadow.tag-railway {
+    stroke-width: 12;
+}
+.low-zoom path.casing.tag-railway {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-railway {
+    stroke-width: 2;
+    stroke-dasharray: 6,6;
+}
+
+
+/* styles */
 path.casing.tag-railway {
     stroke: #555;
-    stroke-width: 4;
+}
+path.stroke.tag-railway {
+    stroke: #eee;
 }
 
+
 .preset-icon .icon.tag-railway-disused,
 .preset-icon .icon.tag-railway-abandoned {
     color: #999;
     fill: #eee;
 }
-path.stroke.tag-railway-abandoned {
-    stroke: #eee;
-}
+path.casing.tag-railway-disused,
 path.casing.tag-railway-abandoned {
     stroke: #999;
 }
-
-.preset-icon .icon.tag-railway-subway {
+path.stroke.tag-railway-disused,
+path.stroke.tag-railway-abandoned {
+    stroke: #eee;
+}
+
+
+.preset-icon .icon.tag-railway-subway {
     color: #222;
     fill: #bbb;
 }
-path.stroke.tag-railway-subway {
-    stroke: #bbb;
-}
 path.casing.tag-railway-subway {
     stroke: #222;
 }
-
-path.stroke.tag-railway-platform {
-    stroke: #999;
-    stroke-width: 4;
-    stroke-dasharray: none;
-}
-path.casing.tag-railway-platform {
-    stroke: none;
-}
-
-.area.stroke.tag-railway {
-    stroke: white;
-    stroke-width: 1;
-    stroke-dasharray: none;
-}
-.area.casing.tag-railway {
-    stroke: none;
+path.stroke.tag-railway-subway {
+    stroke: #bbb;
 }
-
-
 /* waterways */
 .preset-icon .icon.tag-waterway.other-line {
     color: #77d3de;
     fill: #77d3de;
 }
-.preset-icon .icon.category-water,
+.preset-icon .icon.iD-category-water,
 .preset-icon .icon.tag-route-ferry,
+.preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
     color: #77d3de;
     fill: #fff;
@@ -1215,35 +1537,68 @@ path.fill.tag-waterway {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
-
+path.casing.tag-waterway {
+    stroke: #3d6c71;
+}
 path.stroke.tag-waterway {
     stroke: #77d3de;
-    stroke-width: 2;
+}
+
+
+/* narrow waterways (default) */
+path.shadow.tag-waterway {
+    stroke-width: 16;
 }
 path.casing.tag-waterway {
-    stroke: #77d3de;
-    stroke-width: 4;
+    stroke-width: 7;
+}
+path.stroke.tag-waterway {
+    stroke-width: 5;
 }
 
-path.stroke.tag-waterway-river {
-    stroke-width: 4;
+.low-zoom path.shadow.tag-waterway {
+    stroke-width: 12;
+}
+.low-zoom path.casing.tag-waterway {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-waterway {
+    stroke-width: 3;
+}
+
+
+/* wide waterways (river) */
+path.shadow.tag-waterway-river {
+    stroke-width: 20;
 }
 path.casing.tag-waterway-river {
-    stroke-width: 6;
+    stroke-width: 10;
+}
+path.stroke.tag-waterway-river {
+    stroke-width: 8;
+}
+
+.low-zoom path.shadow.tag-waterway-river {
+    stroke-width: 16;
+}
+.low-zoom path.casing.tag-waterway-river {
+    stroke-width: 7;
+}
+.low-zoom path.stroke.tag-waterway-river {
+    stroke-width: 5;
 }
 
+
+/* ditch */
 .preset-icon .icon.tag-waterway-ditch {
-    color: #6591ff;
+    color: #8eabf3;
 }
 path.stroke.tag-waterway-ditch {
-    stroke: #6591ff;
-    stroke-width: 1;
-}
-path.casing.tag-waterway-ditch {
-    stroke: #6591ff;
-    stroke-width: 3;
+    stroke: #8eabf3;
 }
 
+
+/* waterway areas */
 path.area.stroke.tag-waterway-dock,
 path.area.stroke.tag-waterway-boatyard,
 path.area.stroke.tag-waterway-fuel {
@@ -1262,7 +1617,6 @@ path.area.fill.tag-waterway-fuel {
     fill: rgba(255, 255, 255, 0.3);
 }
 
-
 /* power */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
@@ -1297,6 +1651,28 @@ path.casing.tag-boundary-national_park {
 }
 
 
+/* Tree Rows */
+path.shadow.tag-natural-tree_row {
+    stroke-width: 16;
+}
+path.casing.tag-natural-tree_row {
+    stroke-width: 7;
+}
+path.stroke.tag-natural-tree_row {
+    stroke-width: 5;
+}
+
+.low-zoom path.shadow.tag-natural-tree_row {
+    stroke-width: 12;
+}
+.low-zoom path.casing.tag-natural-tree_row {
+    stroke-width: 5;
+}
+.low-zoom path.stroke.tag-natural-tree_row {
+    stroke-width: 3;
+}
+
+
 /* barriers */
 path.stroke.tag-barrier {
     stroke: #ddd;
@@ -1313,29 +1689,25 @@ path.stroke.tag-barrier {
 
 /* bridges */
 path.casing.tag-bridge {
-    stroke-width: 16;
     stroke-opacity: 0.6;
-    stroke: #000;
+    stroke: #000 !important;
     stroke-linecap: butt;
     stroke-dasharray: none;
 }
 
 path.shadow.tag-bridge {
-    stroke-width: 22;
+    stroke-width: 24;
 }
-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.casing.tag-bridge {
+    stroke-width: 16;
+}
+.low-zoom path.shadow.tag-bridge {
+    stroke-width: 16;
+}
+.low-zoom path.casing.tag-bridge {
     stroke-width: 10;
 }
+
 path.shadow.line.tag-railway.tag-bridge,
 path.shadow.tag-highway-living_street.tag-bridge,
 path.shadow.tag-highway-path.tag-bridge,
@@ -1347,15 +1719,35 @@ path.shadow.tag-highway-steps.tag-bridge,
 path.shadow.tag-highway-footway.tag-bridge,
 path.shadow.tag-highway-cycleway.tag-bridge,
 path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 17;
+    stroke-width: 18;
 }
-.low-zoom path.casing.tag-bridge {
+path.casing.line.tag-railway.tag-bridge,
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge,
+path.casing.tag-highway-corridor.tag-bridge,
+path.casing.line.tag-highway-pedestrian.tag-bridge,
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
     stroke-width: 10;
 }
-.low-zoom path.shadow.tag-bridge {
+
+.low-zoom path.shadow.line.tag-railway.tag-bridge,
+.low-zoom path.shadow.tag-highway-living_street.tag-bridge,
+.low-zoom path.shadow.tag-highway-path.tag-bridge,
+.low-zoom path.shadow.tag-highway-corridor.tag-bridge,
+.low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.shadow.tag-highway-service.tag-bridge,
+.low-zoom path.shadow.tag-highway-track.tag-bridge,
+.low-zoom path.shadow.tag-highway-steps.tag-bridge,
+.low-zoom path.shadow.tag-highway-footway.tag-bridge,
+.low-zoom path.shadow.tag-highway-cycleway.tag-bridge,
+.low-zoom path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 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,
@@ -1370,20 +1762,6 @@ path.shadow.tag-highway-bridleway.tag-bridge {
     stroke-width: 6;
 }
 
-.low-zoom path.shadow.line.tag-railway.tag-bridge,
-.low-zoom path.shadow.tag-highway-living_street.tag-bridge,
-.low-zoom path.shadow.tag-highway-path.tag-bridge,
-.low-zoom path.shadow.tag-highway-corridor.tag-bridge,
-.low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
-.low-zoom path.shadow.tag-highway-service.tag-bridge,
-.low-zoom path.shadow.tag-highway-track.tag-bridge,
-.low-zoom path.shadow.tag-highway-steps.tag-bridge,
-.low-zoom path.shadow.tag-highway-footway.tag-bridge,
-.low-zoom path.shadow.tag-highway-cycleway.tag-bridge,
-.low-zoom path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 13;
-}
-
 
 /* tunnels */
 path.stroke.tag-tunnel {
@@ -1397,6 +1775,10 @@ path.casing.tag-tunnel {
 
 
 /* embankments / cuttings */
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
+}
 path.casing.tag-embankment,
 path.casing.tag-cutting {
     stroke-opacity: 0.5;
@@ -1406,21 +1788,15 @@ path.casing.tag-cutting {
     stroke-linecap: butt;
 }
 
-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
-    stroke-width: 28;
+.low-zoom path.shadow.tag-embankment,
+.low-zoom path.shadow.tag-cutting {
+    stroke-width: 14;
 }
-
 .low-zoom path.casing.tag-embankment,
 .low-zoom path.casing.tag-cutting {
     stroke-width: 10;
 }
 
-.low-zoom path.shadow.tag-embankment,
-.low-zoom path.shadow.tag-cutting {
-    stroke-width: 14;
-}
-
 
 /* Surface - unpaved */
 path.casing.tag-unpaved {
@@ -1454,98 +1830,128 @@ path.casing.tag-status {
 
 
 /* Buildings */
-path.stroke.tag-building,
-path.stroke.tag-amenity-shelter {
+path.stroke.tag-building {
     stroke: rgb(224, 110, 95);
 }
-path.fill.tag-building,
-path.fill.tag-amenity-shelter {
+path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
-.preset-icon-fill-area.tag-building,
-.preset-icon-fill-area.tag-amenity-shelter {
+.preset-icon-fill-area.tag-building {
     border-color: rgb(224, 110, 95);
     background-color: rgba(224, 110, 95, 0.3);
 }
 
 
-/* Labels / Markers */
-
-text {
-    font-size:10px;
-    pointer-events: none;
-    color: #222;
-    opacity: 1;
+/* "Special" paths - platforms, piers, crossings */
+.preset-icon .icon.tag-public_transport-platform,
+.preset-icon .icon.tag-railway-platform,
+.preset-icon .icon.tag-man_made-pier,
+.preset-icon .icon.tag-footway.tag-footway-crossing,
+.preset-icon .icon.tag-crossing {
+    color: #988;
+    fill: #dca;
 }
 
-.oneway .textpath.tag-waterway {
-    fill: #002F35;
+.preset-icon-fill-area.tag-public_transport-platform,
+.preset-icon-fill-area.tag-railway-platform,
+.preset-icon-fill-area.tag-man_made-pier,
+.preset-icon-fill-area.tag-footway.tag-footway-crossing,
+.preset-icon-fill-area.tag-crossing {
+    border-color: #988;
+    background-color: #dca;
 }
 
-path.oneway {
-    stroke-width: 6px;
+path.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;
 }
-
-
-text.arealabel-halo,
-text.linelabel-halo,
-text.pointlabel-halo,
-text.arealabel,
-text.linelabel,
-text.pointlabel {
-    font-size: 12px;
-    font-weight: bold;
-    fill: #333;
-    text-anchor: middle;
-    pointer-events: none;
-    -webkit-transition: opacity 100ms linear;
-    transition: opacity 100ms linear;
-    -moz-transition: opacity 100ms linear;
+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;
 }
-
-.linelabel-halo .textpath,
-.linelabel .textpath {
-  dominant-baseline: middle;
+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;
 }
 
-/* Opera doesn't support dominant-baseline. See #715 */
-.opera .linelabel-halo .textpath,
-.opera .linelabel .textpath {
-  baseline-shift: -33%;
-  dominant-baseline: auto;
+.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;
 }
-
-.layer-halo text {
-    opacity: 0.7;
-    stroke: #fff;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
+.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;
 }
-
-text.proximate {
-    opacity: 0;
+.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;
 }
 
-text.point {
-  font-size: 10px;
+g.midpoint.tag-public_transport-platform .fill,
+g.midpoint.tag-railway-platform .fill,
+g.midpoint.tag-man_made-pier .fill,
+g.midpoint.tag-footway.tag-footway-crossing .fill,
+g.midpoint.tag-crossing .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
 }
 
-/* Turns */
-
-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
+/* marked crossings, zebras */
+.preset-icon .icon.tag-crossing.tag-crossing-marked,
+.preset-icon .icon.tag-crossing.tag-crossing-zebra {
+    color: #444;
+    fill: #dca;
 }
-
-.form-field-restrictions .vertex {
-    pointer-events: none;
-    cursor: auto !important;
+path.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;
+}
+.low-zoom path.stroke.tag-crossing.tag-crossing-marked,
+.low-zoom path.stroke.tag-crossing.tag-crossing-zebra {
+    stroke-dasharray: 3, 2;
 }
 
 /* Cursors */
 
+.nope,
+.nope * {
+    cursor: not-allowed !important;
+}
+
 .map-in-map,
 #map {
     cursor: auto; /* Opera */
@@ -1595,44 +2001,36 @@ g.turn circle {
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
 }
 
-#map .point:active,
-#map .vertex:active,
-#map .line:active,
-#map .area:active,
-#map .midpoint:active,
-#map .mode-select .selected {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-acting.png") %>), pointer; /* FF */
-}
-
 .mode-draw-line #map,
 .mode-draw-area #map,
 .mode-add-line  #map,
 .mode-add-area  #map,
-.mode-drag-node #map {
+.mode-drag-node #map,
+.mode-drag-note #map {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .way.hover,
-.mode-draw-area .way.hover,
-.mode-add-line  .way.hover,
-.mode-add-area  .way.hover,
-.mode-drag-node .way.hover {
+.mode-draw-line .way.target,
+.mode-draw-area .way.target,
+.mode-add-line  .way.target,
+.mode-add-area  .way.target,
+.mode-drag-node .way.target {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */
 }
 
-.mode-draw-line .vertex.hover,
-.mode-draw-area .vertex.hover,
-.mode-add-line  .vertex.hover,
-.mode-add-area  .vertex.hover,
-.mode-drag-node .vertex.hover {
+.mode-draw-line .vertex.target,
+.mode-draw-area .vertex.target,
+.mode-add-line  .vertex.target,
+.mode-add-area  .vertex.target,
+.mode-drag-node .vertex.target {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */
 }
 
 .mode-add-point #map,
+.mode-add-note #map,
 .mode-browse.lasso #map,
 .mode-browse.lasso .way,
 .mode-browse.lasso .vertex,
@@ -1647,146 +2045,494 @@ g.turn circle {
 
 .turn rect,
 .turn circle {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
+    cursor: pointer;
 }
-
-.lasso #map {
-    pointer-events: visibleStroke;
+/* photo viewer div */
+#photoviewer {
+    position: absolute;
+    bottom: 30px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
 }
 
-/* GPX Paths */
-.layer-gpx {
-    pointer-events: none;
+@media screen and (min-width: 1600px) {
+    #photoviewer {
+        width: 490px;
+        height: 370px;
+    }
 }
 
-path.gpx {
-    stroke: #FF26D4;
-    stroke-width: 2;
-    fill: none;
+#photoviewer button.thumb-hide {
+    border-radius: 0;
+    padding: 5px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    z-index: 50;
 }
 
-text.gpx {
-    fill: #FF26D4;
+#photoviewer button.resize-handle-xy {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 49;
+    cursor: nesw-resize;
+    height: 25px;
+    width: 25px;
 }
 
-/* Mapillary Image Layer */
+#photoviewer button.resize-handle-x {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 48;
+    cursor: ew-resize;
+    height: auto;
+    width: 6px;
+}
 
-.layer-mapillary-images {
-    pointer-events: none;
+#photoviewer button.resize-handle-y {
+    border-radius: 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 48;
+    cursor: ns-resize;
+    height: 6px;
+    width: 100%;
+}
+
+
+.photo-wrapper,
+.photo-wrapper img {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    object-fit: cover;
+}
+
+.photo-wrapper .photo-attribution {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    font-size: 10px;
+    text-align: right;
+    line-height: 1.1em;
+    padding: 4px 2px;
+    z-index: 10;
+}
+
+.photo-attribution a,
+.photo-attribution a:visited,
+.photo-attribution span {
+    padding: 4px 2px;
+    color: #fff;
 }
 
-.layer-mapillary-images .viewfield-group {
+/* markers and sequences */
+.viewfield-group {
+    pointer-events: none;
+}
+.mode-browse .viewfield-group,
+.mode-select .viewfield-group {
     pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
+    cursor: pointer;
 }
 
-.layer-mapillary-images .viewfield-group * {
-    stroke-width: 1;
-    stroke: #444;
-    fill: #ffc600;
-    z-index: 50;
+.viewfield-group.selected * {
+    fill: #ffee00 !important;
+}
+.viewfield-group.hovered * {
+    fill: #eebb00 !important;
 }
 
-.layer-mapillary-images .viewfield-group:hover * {
+.viewfield-group circle {
+    stroke: #555;
     stroke-width: 1;
-    stroke: #333;
-    fill: #ff9900;
-    z-index: 60;
+    stroke-opacity: 0.4;
+    fill-opacity: 0.4;
 }
-
-.layer-mapillary-images .viewfield-group.selected  * {
+.viewfield-group.highlighted circle {
+    stroke: #222;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.hovered circle {
+    stroke: #222;
     stroke-width: 2;
+    stroke-opacity: 0.9;
+    fill-opacity: 0.9;
+}
+.viewfield-group.highlighted.selected circle {
     stroke: #222;
-    fill: #ff5800;
-    z-index: 60;
+    stroke-width: 2;
+    stroke-opacity: 1;
+    fill-opacity: 1;
 }
 
-.layer-mapillary-images .viewfield-group:hover path.viewfield,
-.layer-mapillary-images .viewfield-group.selected path.viewfield,
-.layer-mapillary-images .viewfield-group path.viewfield {
+.viewfield-group .viewfield {
     stroke-width: 0;
-    fill-opacity: 0.6;
+    stroke: #222;
+    fill-opacity: 0.4;
+}
+.viewfield-group.highlighted .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.hovered .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.8;
+}
+.viewfield-group.highlighted.selected .viewfield {
+    stroke-width: 1;
+    fill-opacity: 0.9;
 }
 
-/* Mapillary Sign Layer */
+.viewfield-group.selected .viewfield-scale {
+    transform: scale(2,2);
+}
 
-.layer-mapillary-signs {
+.sequence {
+    fill: none;
+    stroke-width: 2;
+    stroke-opacity: 0.4;
+}
+.sequence.highlighted,
+.sequence.selected {
+    stroke-width: 4;
+    stroke-opacity: 1;
+}
+
+
+/* Streetside Image Layer */
+.layer-streetside-images {
     pointer-events: none;
 }
+.layer-streetside-images .viewfield-group * {
+    fill: #0fffc4;
+}
+.layer-streetside-images .sequence {
+    stroke: #0fffc4;
+    stroke-opacity: 0.85;  /* bump opacity - only one per road */
+}
 
-.layer-mapillary-signs .icon-sign body {
-    min-width: 20px;
-    height: 28px;
-    width: 28px;
-    border: 2px solid transparent;
+
+/* Mapillary Image Layer */
+.layer-mapillary-images {
+    pointer-events: none;
+}
+.layer-mapillary-images .viewfield-group * {
+    fill: #55ff22;
+}
+.layer-mapillary-images .sequence {
+    stroke: #55ff22;
+}
+
+
+/* Mapillary Sign Layer */
+.layer-mapillary-signs {
+    pointer-events: none;
+}
+.layer-mapillary-signs .icon-sign {
+    outline: 2px solid transparent;
     pointer-events: visible;
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
-    z-index: 70;
+    cursor: pointer;
+}
+.layer-mapillary-signs .icon-sign:hover {
+    outline: 5px solid #eebb00;
+    background-color: #eebb00;
+}
+.layer-mapillary-signs .icon-sign.selected {
+    outline: 5px solid #ffee00;
+    background-color: #ffee00;
+}
+
+
+/* OpenStreetCam Image Layer */
+.layer-openstreetcam-images {
+    pointer-events: none;
+}
+.layer-openstreetcam-images .viewfield-group * {
+    fill: #20c4ff;
 }
+.layer-openstreetcam-images .sequence {
+    stroke: #20c4ff;
+}
+
 
-.layer-mapillary-signs .icon-sign:hover body {
-    border: 2px solid rgba(255,198,0,0.8);
-    z-index: 80;
- }
+/* Streetside Viewer (pannellum) */
+.ms-wrapper .photo-attribution .image-link {
+    display: block;
+}
+.ms-wrapper .photo-attribution .attribution-row {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 5px;
+}
+.ms-wrapper .photo-attribution .image-view-link {
+    text-align: left;
+    margin: 0 5px;
+}
+.ms-wrapper .photo-attribution .image-report-link {
+    text-align: right;
+}
 
-.layer-mapillary-signs .icon-sign.selected body {
-    border: 2px solid rgba(255,0,0,0.8);
-    z-index: 80;
- }
+.ms-wrapper .photo-attribution a:active,
+.ms-wrapper .photo-attribution a:hover {
+    color: #0fffc4;
+}
 
-.layer-mapillary-signs .icon-sign .t {
-    font-size: 28px;
-    z-index: 70;
-    position: absolute;
+.ms-wrapper .pnlm-compass.pnlm-control {
+    width: 26px;
+    height: 26px;
+    left: 4px;
+    top: 60px;
+    background-size: contain;
+    background-repeat: no-repeat no-repeat;
 }
 
-.layer-mapillary-signs .icon-sign:hover .t,
-.layer-mapillary-signs .icon-sign.selected .t {
-    z-index: 80;
+label.streetside-hires {
+    cursor: pointer;
+}
+.streetside-hires span {
+    margin-top: 2px;
+}
+.streetside-hires input[type="checkbox"] {
+    float: left;
+    width: 12px;
+    height: 12px;
+    margin: 0 5px;
 }
 
-/* Modes */
 
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
+/* Mapillary viewer */
+#mly .domRenderer .TagSymbol {
+    font-size: 10px;
+    background-color: rgba(0,0,0,0.4);
+    padding: 0 4px;
+    border-radius: 4px;
+    top: -25px;
+}
+#mly .domRenderer .Attribution {
+    /* we will roll our own to avoid async update issues like #4526 */
     display: none;
 }
 
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
+.mly-wrapper .photo-attribution a:active,
+.mly-wrapper .photo-attribution a:hover {
+    color: #35af6d;
+}
+
+.mly-wrapper .mapillary-js-dom {
+    z-index: 9;
+}
+
+
+/* OpenStreetCam viewer */
+.osc-wrapper {
+    position: relative;
+    background-color: #000;
+    background-image: url(<%= asset_path("iD/img/loader-black.gif") %>);
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.osc-wrapper .photo-attribution a:active,
+.osc-wrapper .photo-attribution a:hover {
+    color: #20c4ff;
+}
+
+.osc-image-wrap {
+    width: 100%;
+    height: 100%;
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+}
+
+
+/* photo-controls (step forward, back, rotate) */
+.photo-controls-wrap {
+    text-align: center;
+    position: absolute;
+    top: 10px;
+    width: 100%;
+    z-index: 10;
+}
+
+.photo-controls {
+    display: inline-block;
+    z-index: 10;
+}
+
+.photo-controls button,
+.photo-controls button:focus {
+    height: 18px;
+    width: 18px;
+    background: rgba(0,0,0,0.65);
+    color: #eee;
+    border-radius: 0;
+}
+.photo-controls button:first-of-type {
+    border-radius: 3px 0 0 3px;
+}
+.photo-controls button:last-of-type {
+    border-radius: 0 3px 3px 0;
+}
+.photo-controls button:hover,
+.photo-controls button:active {
+    background: rgba(0,0,0,0.85);
+    color: #fff;
+}
+
+
+/* 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 */
+}
+
+.note-header-icon .note-shadow,
+.layer-notes .note .note-shadow {
+    color: #000;
+}
+.note-header-icon .note-fill,
+.layer-notes .note .note-fill {
+    color: #ff3300;
+    stroke: #333;
+    stroke-width: 40px;
+}
+.note-header-icon.new .note-fill,
+.layer-notes .note.new .note-fill {
+    color: #ffee00;
+    stroke: #333;
+    stroke-width: 40px;
+}
+.note-header-icon.closed .note-fill,
+.layer-notes .note.closed .note-fill {
+    color: #55dd00;
+    stroke: #333;
+    stroke-width: 40px;
+}
 
-/* Ensure drawing doesn't interact with area fills. */
-.mode-add-point .area.fill,
-.mode-draw-line .area.fill,
-.mode-draw-area .area.fill,
-.mode-add-line .area.fill,
-.mode-add-area .area.fill,
-.mode-drag-node .area.fill {
+/* slight adjustments to preset icon for note icons */
+.note-header-icon .preset-icon-28 {
+    top: 18px;
+}
+.note-header-icon .note-icon-annotation {
+    position: absolute;
+    top: 22px;
+    left: 22px;
+    margin: auto;
+}
+.note-header-icon .note-icon-annotation .icon {
+    width: 15px;
+    height: 15px;
+}
+
+
+/* Custom Map Data (geojson, gpx, kml, vector tile) */
+
+.layer-mapdata {
     pointer-events: none;
 }
 
+.layer-mapdata path.shadow {
+    pointer-events: stroke;
+    stroke: #f6634f;
+    stroke-width: 16;
+    stroke-opacity: 0;
+    fill: none;
+}
+.layer-mapdata path.MultiPoint.shadow,
+.layer-mapdata path.Point.shadow {
+    pointer-events: fill;
+    fill: #f6634f;
+    fill-opacity: 0;
+}
+.layer-mapdata path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4;
+}
+.layer-mapdata path.shadow.selected {
+    stroke-opacity: 0.7;
+}
+
+.layer-mapdata path.stroke {
+    stroke: #ff26d4;
+    stroke-width: 2;
+    fill: none;
+}
+
+.layer-mapdata path.fill {
+    stroke-width: 0;
+    stroke-opacity: 0.3;
+    stroke: #ff26d4;
+    fill: #ff26d4;
+    fill-opacity: 0.3;
+    fill-rule: evenodd;
+}
+
+.layer-mapdata text.label-halo,
+.layer-mapdata text.label {
+    font-size: 10px;
+    font-weight: bold;
+    dominant-baseline: middle;
+}
+.layer-mapdata text.label {
+    fill: #ff26d4;
+}
+.layer-mapdata text.label.hover,
+.layer-mapdata text.label.selected {
+    fill: #f6634f;
+}
+.layer-mapdata text.label-halo {
+    opacity: 0.7;
+    stroke: #000;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
 
 /* Fill Styles */
+
 .low-zoom.fill-wireframe path.stroke,
 .fill-wireframe path.stroke {
-    stroke-width: 1;
-    stroke-opacity: 0.5;
-    stroke-dasharray: none;
-    fill: none;
+    stroke-width: 1 !important;
+    stroke-opacity: 0.5 !important;
+    stroke-dasharray: none !important;
+    fill: none !important;
+}
+.low-zoom.fill-wireframe .layer-mapdata path.stroke,
+.fill-wireframe .layer-mapdata path.stroke {
+    stroke-width: 2 !important;
+    stroke-opacity: 1 !important;
 }
 
 .low-zoom.fill-wireframe path.shadow,
 .fill-wireframe path.shadow {
-    stroke-width: 8;
+    stroke-width: 12;
 }
 
+.fill-wireframe path.shadow.related:not(.selected),
 .fill-wireframe path.shadow.hover:not(.selected) {
     stroke-opacity: 0.4;
 }
@@ -1795,21 +2541,26 @@ text.gpx {
 }
 
 .fill-wireframe .point,
+.fill-wireframe .vertex.active,
 .fill-wireframe .areaicon,
+.fill-wireframe .areaicon-halo,
 .fill-wireframe path.casing,
 .fill-wireframe path.fill,
 .fill-wireframe path.oneway {
-    display: none;
+    display: none !important;
 }
 
-.fill-partial path.fill {
+.fill-partial path.area.fill {
     fill-opacity: 0;
     stroke-width: 60px;
+    pointer-events: none;
+}
+.mode-browse .fill-partial path.area.fill,
+.mode-select .fill-partial path.area.fill {
     pointer-events: visibleStroke;
 }
 /* Basics
 ------------------------------------------------------- */
-
 /*
   Opera misbehaves when the window is resized vertically unless 100% width + height are
   applied to both html and body. https://gist.github.com/jfirebaugh/bd225bcfdd3a633850c4
@@ -1820,12 +2571,16 @@ html, body {
 }
 
 body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
-    margin:0;
-    padding:0;
+    font: normal 12px/1.6667 "-apple-system", BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
+    margin: 0;
+    padding: 0;
     min-width: 768px;
-    color:#333;
+    color: #333;
     overflow: hidden;
+    -ms-user-select: none;
 }
 
 .unsupported {
@@ -1847,6 +2602,36 @@ body {
     height: 100%;
 }
 
+#content.active {
+    -webkit-filter: none !important;
+    filter: none !important;
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+#content.inactive {
+    -webkit-filter: grayscale(80%) brightness(80%);
+    filter: grayscale(80%) brightness(80%);
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+/* 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;
@@ -1868,6 +2653,9 @@ body {
     opacity: .5;
     float: right;
 }
+[dir='rtl'] .spinner {
+    float: left;
+}
 
 .spinner img {
     height: 40px;
@@ -1876,6 +2664,17 @@ body {
     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;
@@ -1884,17 +2683,15 @@ div, textarea, label, input, form, span, ul, li, ol, a, button, h1, h2, h3, h4,
 }
 
 a, button, input, textarea {
-    -webkit-tap-highlight-color:rgba(0,0,0,0);
-    -webkit-touch-callout:none;
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+    -webkit-touch-callout: none;
 }
 
 a,
 button,
 .checkselect label:hover,
-.opacity-options li,
 .radial-menu-item {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
+    cursor: pointer;
 }
 
 h2 {
@@ -1926,10 +2723,21 @@ h4, h5 {
     outline-style: none;
 }
 
+::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: #aaa;
+    opacity: 1; /* Firefox */
+}
+:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: #aaa;
+}
+::-ms-input-placeholder { /* Microsoft Edge */
+    color: #aaa;
+}
+
 p {
     font-size: 12px;
-    margin:0;
-    padding:0;
+    margin: 0;
+    padding: 0;
 }
 
 p:last-child {
@@ -1949,15 +2757,17 @@ a:visited, a {
 }
 
 a:hover {
-    color:#597be7;
+    color: #597be7;
 }
 
 /* Forms
 ------------------------------------------------------- */
-
 textarea  {
     resize: vertical;
-    font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/20px "-apple-system", BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
 }
 
 textarea,
@@ -1967,14 +2777,24 @@ input[type=number],
 input[type=url],
 input[type=tel],
 input[type=email] {
-    background-color: white;
-    border:1px solid #ccc;
-    padding:5px 10px;
-    height:30px;
-    width: 100%;
-    border-radius:4px;
+    background-color: #fff;
+    color: #333;
+    border: 1px solid #ccc;
+    padding: 5px 20px 5px 10px;
+    height: 30px;
+    width: 100%;
+    border-radius: 4px;
     text-overflow: ellipsis;
 }
+[dir='rtl'] textarea,
+[dir='rtl'] input[type=text],
+[dir='rtl'] input[type=search],
+[dir='rtl'] input[type=number],
+[dir='rtl'] input[type=url],
+[dir='rtl'] input[type=tel],
+[dir='rtl'] input[type=email] {
+    padding: 5px 10px 5px 20px;
+}
 
 textarea:focus,
 input:focus {
@@ -1989,6 +2809,12 @@ input[type="radio"] {
     margin-right: 5px;
     margin-top: 3px;
 }
+[dir='rtl'] input[type="checkbox"],
+[dir='rtl'] input[type="radio"] {
+    float: right;
+    margin-left: 5px;
+    margin-right: 0;
+}
 
 /* remove bottom border radius when combobox is open */
 .combobox + * textarea:focus,
@@ -2000,18 +2826,18 @@ input[type="radio"] {
 /* tables */
 
 table {
-    background-color: white;
+    background-color: #fff;
     border-collapse: collapse;
-    width:100%;
-    border-spacing:0;
+    width: 100%;
+    border-spacing: 0;
 }
 
 table th {
-    text-align:left;
+    text-align: left;
 }
 
 table.tags, table.tags td, table.tags th {
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     padding: 4px;
 }
 
@@ -2021,24 +2847,22 @@ table.tags, table.tags td, table.tags th {
 
 /* Grid
 ------------------------------------------------------- */
-
-.col0    { float:left; width:04.1666%; }
-.col1    { float:left; width:08.3333%; }
-.col2    { float:left; width:16.6666%; }
-.col3    { float:left; width:25.0000%; max-width: 300px; }
-.col4    { float:left; width:33.3333%; max-width: 400px; }
-.col5    { float:left; width:41.6666%; max-width: 500px; }
-.col6    { float:left; width:50.0000%; max-width: 600px; }
-.col7    { float:left; width:58.3333%; }
-.col8    { float:left; width:66.6666%; }
-.col9    { float:left; width:75.0000%; }
-.col10   { float:left; width:83.3333%; }
-.col11   { float:left; width:91.6666%; }
-.col12   { float:left; width:100.0000%; }
+.col0    { float: left; width: 04.1666%; }
+.col1    { float: left; width: 08.3333%; }
+.col2    { float: left; width: 16.6666%; }
+.col3    { float: left; width: 25.0000%; max-width: 300px; }
+.col4    { float: left; width: 33.3333%; max-width: 400px; }
+.col5    { float: left; width: 41.6666%; max-width: 500px; }
+.col6    { float: left; width: 50.0000%; max-width: 600px; }
+.col7    { float: left; width: 58.3333%; }
+.col8    { float: left; width: 66.6666%; }
+.col9    { float: left; width: 75.0000%; }
+.col10   { float: left; width: 83.3333%; }
+.col11   { float: left; width: 91.6666%; }
+.col12   { float: left; width: 100.0000%; }
 
 /* UI Lists
 ------------------------------------------------------- */
-
 ul li { list-style: none;}
 
 .toggle-list > label {
@@ -2046,8 +2870,8 @@ ul li { list-style: none;}
     padding: 5px 10px;
     display: block;
     height: 30px;
-    background-color: white;
-    color: #7092FF;
+    background-color: #fff;
+    color: #7092ff;
     cursor: pointer;
 }
 
@@ -2078,28 +2902,24 @@ ul li { list-style: none;}
 /* Utility Classes
 ------------------------------------------------------- */
 .fillL {
-    background: white;
+    background: #fff;
     color: #333;
 }
-
 .fillL2 {
     background: #f6f6f6;
     color: #333;
 }
-
 .fillL3 {
     background: #ececec;
     color: #333;
 }
-
 .fillD {
-    background:rgba(0,0,0,.5);
-    color: white;
+    background: rgba(0,0,0,.5);
+    color: #fff;
 }
-
 .fillD2 {
-    background:rgba(0,0,0,.75);
-    color: white;
+    background: rgba(0,0,0,.75);
+    color: #fff;
 }
 
 .fl { float: left;}
@@ -2107,6 +2927,7 @@ ul li { list-style: none;}
 .al { left: 0; }
 .ar { right: 0; }
 
+input.hide,
 div.hide,
 form.hide,
 button.hide,
@@ -2125,45 +2946,23 @@ li.hide {
 
 .loading {
     background: url(<%= asset_path("iD/img/loader_bg.gif") %>);
-    background-size:5px 5px;
-}
-
-.panewrap {
-    position:absolute;
-    width:200%;
-    height:100%;
-    right: -100%;
-}
-
-
-.pane {
-    position:absolute;
-    width:50%;
-    top: 0;
-    bottom: 30px;
-}
-
-.pane:first-child {
-    left: 0;
+    background-size: 5px 5px;
 }
 
-.pane:last-child {
-    right: 0;
-}
-
-/* Buttons */
 
+/* Buttons
+------------------------------------------------------- */
 button {
     text-align: center;
-    line-height:20px;
-    border:0;
-    background: white;
+    line-height: 20px;
+    border: 0;
+    background: #fff;
     font-weight: bold;
-    color:#333;
-    font-size:12px;
+    color: #333;
+    font-size: 12px;
     display: inline-block;
-    height:40px;
-    border-radius:4px;
+    height: 40px;
+    border-radius: 4px;
 }
 
 button:focus,
@@ -2174,7 +2973,7 @@ button:hover {
 button[disabled],
 button.disabled {
     background-color: rgba(255,255,255,.25);
-    color: rgba(0,0,0,.5);
+    color: rgba(0,0,0,.4);
     cursor: auto;
 }
 
@@ -2191,6 +2990,9 @@ button.minor {
     border-radius: 0;
     background-color: #fafafa;
 }
+[dir='rtl'] button.minor {
+    right: auto;
+}
 
 button.minor .icon {
     opacity: .5;
@@ -2202,7 +3004,7 @@ button.minor:hover {
 
 .button-wrap {
     display: inline-block;
-    padding-right:10px;
+    padding-right: 10px;
     margin: 0;
 }
 
@@ -2213,28 +3015,42 @@ button.minor:hover {
 .button-wrap:last-of-type {
     padding-right: 0;
 }
+[dir='rtl'] .button-wrap:last-of-type {
+    padding-left: 0;
+    padding-right: 10px;
+}
 
 .joined button {
-    border-radius:0;
+    border-radius: 0;
     border-right: 1px solid rgba(0,0,0,.5);
 }
+[dir='rtl'] .joined button {
+    border-left: 1px solid rgba(0,0,0,.5);
+    border-right: none;
+}
 
 .fillL .joined button {
-    border-right: 1px solid white;
+    border-right: 1px solid #fff;
 }
 
 .joined button:first-child {
-    border-radius:4px 0 0 4px;
+    border-radius: 4px 0 0 4px;
+}
+[dir='rtl'] .joined button:first-child {
+    border-radius: 0 4px 4px 0;
 }
 
 .joined button:last-child {
     border-right-width: 0;
-    border-radius:0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+}
+[dir='rtl'] .joined button:last-child {
+    border-radius: 4px 0 0 4px;
 }
 
 button.action {
     background: #7092ff;
-    color: white;
+    color: #fff;
 }
 
 button[disabled].action,
@@ -2257,10 +3073,6 @@ button.secondary-action:hover {
     background: #cccccc;
 }
 
-button.save.has-count {
-    padding: 9px;
-}
-
 button.save .count {
     display: none;
 }
@@ -2269,14 +3081,20 @@ button.save.has-count .count {
     display: block;
     position: absolute;
     top: 5px;
-    background: rgba(255, 255, 255, .5);
+    background: #fff;
+    border-color: #fff;
+    opacity: 0.5;
     color: #333;
     padding: 10px;
     height: 30px;
     line-height: 12px;
     border-radius: 4px;
     margin: auto;
-    margin-left: 8.3333%;
+    margin-left: 9.3333%;
+}
+[dir='rtl'] button.save.has-count .count {
+    margin-left: auto;
+    margin-right: 8%;
 }
 
 button.save.has-count .count::before {
@@ -2290,11 +3108,42 @@ button.save.has-count .count::before {
     bottom: 0;
     border-top:    6px solid transparent;
     border-bottom: 6px solid transparent;
-    border-right:  6px solid rgba(255,255,255,.5);
+    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;
 }
 
-/* Icons */
 
+/* Icons
+------------------------------------------------------- */
 .icon {
     vertical-align: top;
     width: 20px;
@@ -2309,7 +3158,16 @@ button.save.has-count .count::before {
 }
 
 .icon.pre-text {
-    margin-right: 3px;
+    margin-right: 5px;
+}
+[dir='rtl'] .icon.pre-text {
+    margin-left: 5px;
+    margin-right: 0;
+}
+
+.icon.pre-text.user-icon {
+    margin-left: 5px;
+    margin-right: 5px;
 }
 
 .icon.light {
@@ -2337,23 +3195,28 @@ button.save.has-count .count::before {
 }
 
 
-/* ToolBar / Persistent UI Elements
+/* Toolbar / Persistent UI Elements
 ------------------------------------------------------- */
-
 #bar {
     position: fixed;
     padding: 10px 0;
-    left:0;
-    top:0;
-    right:0;
-    height:60px;
+    left: 0;
+    top: 0;
+    right: 0;
+    height: 60px;
     z-index: 9;
     min-width: 768px;
 }
 
+[dir='rtl'] #bar .spacer,
+[dir='rtl'] #bar .button-wrap,
+[dir='rtl'] #bar .button-wrap button {
+    float: right;
+}
+
+
 /* Header for modals / panes
 ------------------------------------------------------- */
-
 .header {
     border-bottom: 1px solid #ccc;
     height: 60px;
@@ -2361,12 +3224,12 @@ button.save.has-count .count::before {
 }
 
 .header h3 {
-    text-align: left;
+    text-align: center;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
-    padding: 20px 20px 20px 40px;
+    padding: 20px;
 }
 
 .header button,
@@ -2382,18 +3245,33 @@ button.save.has-count .count::before {
     height: 100%;
 }
 
+.field-help-title button.close,
+.sidebar-component .header button.data-editor-close,
+.sidebar-component .header button.note-editor-close,
 .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'] .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;
@@ -2408,14 +3286,28 @@ button.save.has-count .count::before {
     height: 59px;
     z-index: 50;
 }
+[dir='rtl'] .modal > button {
+    left: 0;
+    right: unset;
+}
 
 .footer {
     position: absolute;
     bottom: 0;
+    margin: 0;
     padding: 5px 20px 5px 20px;
     border-top: 1px solid #ccc;
     background-color: #fafafa;
     width: 100%;
+    z-index: 1;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    list-style: none;
+    display: flex;
+}
+
+.footer > a {
+    justify-content: center;
 }
 
 .sidebar-component .body {
@@ -2426,9 +3318,31 @@ button.save.has-count .count::before {
     position: absolute;
 }
 
-/* Inspector
+
+/* Hide/Toggle collapsable sections (aka Disclosure)
 ------------------------------------------------------- */
+.hide-toggle .icon.pre-text {
+    vertical-align: text-top;
+    width: 16px;
+    height: 16px;
+    margin-left: -3px;
+}
+[dir='rtl'] .hide-toggle .icon.pre-text {
+    margin-left: 0;
+    margin-right: -3px;
+}
+
+a:visited.hide-toggle,
+a.hide-toggle {
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    padding-bottom: 5px;
+}
 
+
+/* Sidebar / Inspector
+------------------------------------------------------- */
 #sidebar {
     position: relative;
     float: left;
@@ -2436,6 +3350,10 @@ button.save.has-count .count::before {
     overflow: hidden;
     z-index: 10;
     background: #f6f6f6;
+    -ms-user-select: element;
+}
+[dir='rtl'] #sidebar {
+    float: right;
 }
 
 .sidebar-component {
@@ -2446,76 +3364,55 @@ button.save.has-count .count::before {
     right: 0;
 }
 
-.inspector-wrap {
-    width: 100%;
-    height: 100%;
-}
-
-.inspector-hidden {
-    display: none;
-}
-
-.inspector-body {
-    overflow-y: scroll;
-    overflow-x: hidden;
+.panewrap {
     position: absolute;
-    right: 0;
-    left: 0;
-    bottom: 0;
+    width: 200%;
+    height: 100%;
+    right: -100%;
 }
 
-.mapillary-image {
+.pane {
     position: absolute;
+    width: 50%;
+    top: 0;
     bottom: 30px;
-    width: 330px;
-    height: 250px;
-    padding: 5px;
-    background-color: #fff;
 }
 
-.mapillary-image a {
-    display: block;
-    position: absolute;
-    height: auto;
-    background-color: rgba(0,0,0,.5);
-    bottom: 0;
-    padding: 5px 10px;
+.pane:first-child {
+    left: 0;
 }
 
-.mapillary-image img {
-    width: 100%;
-    height: auto;
-    display: block;
+.pane:last-child {
+    right: 0;
 }
 
-.mapillary-image.hidden {
-    visibility: hidden;
+.inspector-wrap {
+    width: 100%;
+    height: 100%;
 }
 
-.mapillary-image.temp button {
+.inspector-hidden {
     display: none;
 }
 
-.mapillary-image button {
-    border-radius: 0;
-    padding: 5px;
+.inspector-body {
+    overflow-y: scroll;
+    overflow-x: hidden;
     position: absolute;
     right: 0;
-    top: 0;
+    left: 0;
+    bottom: 0;
 }
 
 .feature-list-pane .inspector-body {
     top: 120px;
 }
-
 .preset-list-pane .inspector-body {
     top: 120px;
 }
-
 .entity-editor-pane .inspector-body {
     top: 60px;
 }
-
 .selection-list-pane .inspector-body {
     top: 60px;
 }
@@ -2532,6 +3429,10 @@ button.save.has-count .count::before {
     top: 80px;
     pointer-events: none;
 }
+[dir='rtl'] #sidebar .search-header .icon {
+    left: auto;
+    right: 10px;
+}
 
 #sidebar .search-header input {
     position: absolute;
@@ -2547,12 +3448,12 @@ button.save.has-count .count::before {
     font-weight: bold;
 }
 
-/* Feature list */
 
+/* Feature List / Search Results
+------------------------------------------------------- */
 .feature-list  {
-    width:100%;
+    width: 100%;
 }
-
 .no-results-item,
 .geocode-item,
 .feature-list-item {
@@ -2562,29 +3463,52 @@ button.save.has-count .count::before {
     border-radius: 0;
 }
 
+.feature-list-item {
+    background-color: #fff;
+    font-weight: bold;
+    height: 40px;
+    line-height: 20px;
+}
+
+.feature-list-item:hover {
+    background-color: #ececec;
+}
+
+.feature-list-item button {
+    background: transparent;
+}
+
 .feature-list-item .label {
     text-align: left;
-    padding: 5px 10px;
+    padding: 10px 10px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
 }
+[dir='rtl'] .feature-list-item .label {
+    text-align: right;
+}
 
 .feature-list-item .label .icon {
     opacity: .5;
 }
 
-.feature-list-item:hover .label {
-    background-color: #ececec;
+.feature-list-item .close {
+    float: right;
+    padding: 10px;
+}
+
+.feature-list-item .close .icon {
+    opacity: 1;
 }
 
 .feature-list-item .entity-type {
-    color:#7092ff;
+    color: #7092ff;
 }
 
 .feature-list-item:hover .entity-type {
-    color:#597be7;
+    color: #597be7;
 }
 
 .feature-list-item .entity-name {
@@ -2592,14 +3516,16 @@ button.save.has-count .count::before {
     color: #666;
     padding-left: 10px;
 }
+[dir='rtl'] .feature-list-item .entity-name {
+    padding-left: 0;
+    padding-right: 10px;
+}
 
-/* Presets
-------------------------------------------------------- */
-
-/* Preset grid  */
 
+/* Preset List and Icons
+------------------------------------------------------- */
 .preset-list  {
-    width:100%;
+    width: 100%;
     padding: 20px 20px 10px 20px;
     border-bottom: 1px solid #ccc;
 }
@@ -2631,14 +3557,35 @@ button.save.has-count .count::before {
     top: 10px;
 }
 
+.preset-icon-fill-vertex {
+    height: 40px;
+    width: 40px;
+    margin: auto;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+    border: 1.5px solid #333;
+    border-radius: 20px;
+    background-color: #efefef;
+    backface-visibility: hidden;
+}
+
+[dir='rtl'] .preset-icon-fill-vertex,
+[dir='rtl'] .preset-icon-fill-area {
+  left: auto;
+  right: 10px;
+}
+
 .preset-icon-frame {
     position: absolute;
     top: 7px;
     left: 7px;
-    height: 42px;
-    width: 42px;
     margin: auto;
 }
+[dir='rtl'] .preset-icon-frame {
+    left: auto;
+    right: 7px;
+}
 
 .preset-icon-frame .icon {
     width: 46px;
@@ -2669,16 +3616,41 @@ button.save.has-count .count::before {
     height: 44px;
 }
 
-.preset-icon-32 {
+.preset-icon-28 {
     position: absolute;
-    top: 14px;
-    left: 13px;   /* Maki icons off center? */
+    top: 16px;
+    left: 16px;
     margin: auto;
 }
 
-.preset-icon-32 .icon {
-    width: 32px;
-    height: 32px;
+.preset-icon-28 .icon {
+    width: 28px;
+    height: 28px;
+}
+
+.preset-icon-24 {
+    position: absolute;
+    top: 18px;
+    left: 18px;
+    margin: auto;
+}
+
+.preset-icon-24 .icon {
+    width: 24px;
+    height: 24px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon {
+    left: auto;
+    right: auto;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-28 {
+    right: 16px;
+}
+
+[dir='rtl'] .preset-list-button-wrap .preset-icon-24 {
+    right: 18px;
 }
 
 .preset-list-button .label {
@@ -2696,7 +3668,15 @@ button.save.has-count .count::before {
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
     border-radius: 0 3px 3px 0;
-    }
+}
+[dir='rtl'] .preset-list-button .label {
+    text-align: right;
+    left: 0;
+    right: 60px;
+    border-left: none;
+    border-right: 1px solid rgba(0, 0, 0, .1);
+    border-radius: 3px 0 0 3px;
+}
 
 .preset-list-button:hover .label {
     background-color: #ececec;
@@ -2704,19 +3684,23 @@ button.save.has-count .count::before {
 
 .preset-list-item button.tag-reference-button {
     height: 100%;
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     border-radius: 0 3px 3px 0;
     position: absolute;
     top: 0;
     right: 0;
-    width: 10%;
+    width: 32px;
     background: #fafafa;
 }
+[dir='rtl'] .preset-list-item button.tag-reference-button {
+    left: 0;
+    right: auto;
+    border-radius: 3px 0 0 3px;
+}
 
 .preset-list-item button.tag-reference-button:hover {
     background: #f1f1f1;
 }
-
 .preset-list-item button.tag-reference-button .icon {
     opacity: .5;
 }
@@ -2763,23 +3747,23 @@ button.save.has-count .count::before {
 }
 
 
-/* preset form basics */
-
-.inspector-preset {
+/* Entity/Preset Editor
+------------------------------------------------------- */
+.preset-editor {
     overflow: hidden;
     padding-bottom: 10px;
 }
-
-.inspector-preset a.hide-toggle {
-    margin: 0 20px 10px 20px;
+.preset-editor a.hide-toggle {
+    margin: 0 20px 5px 20px;
 }
-
-.inspector-preset .preset-form {
+.preset-editor .form-fields-container {
     padding: 10px;
     margin: 0 10px 10px 10px;
     border-radius: 8px;
 }
-
+.preset-editor .form-fields-container:empty {
+    display: none;
+}
 .entity-editor-pane .preset-list-item .preset-list-button-wrap {
     margin-bottom: 0;
 }
@@ -2793,7 +3777,8 @@ button.save.has-count .count::before {
             transition: margin-bottom 200ms;
 }
 
-.form-field:last-child {
+.form-field.nowrap,
+.wrap-form-field:last-child .form-field {
     margin-bottom: 0;
 }
 
@@ -2807,6 +3792,9 @@ button.save.has-count .count::before {
     border-radius: 4px 4px 0 0;
     overflow: hidden;
 }
+[dir='rtl'] .form-label {
+    padding: 5px 10px 5px 0;
+}
 
 .form-label-button-wrap {
     position: absolute;
@@ -2817,6 +3805,9 @@ button.save.has-count .count::before {
     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;
@@ -2827,12 +3818,18 @@ button.save.has-count .count::before {
 }
 
 .form-label button {
-    border-left: 1px solid #CCC;
-    width: 10%;
+    border-left: 1px solid #ccc;
+    width: 32px;
     height: 100%;
     border-radius: 0;
     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;
 }
@@ -2850,11 +3847,12 @@ button.save.has-count .count::before {
 .form-field > input,
 .form-field > textarea,
 .form-field .preset-input-wrap {
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
     overflow: hidden;
+    position: relative;
 }
 
 .form-field textarea {
@@ -2862,23 +3860,39 @@ button.save.has-count .count::before {
 }
 
 .inspector-border {
-    border-bottom: 1px solid #CCC
+    border-bottom: 1px solid #ccc
 }
 
-/* Preset form (hover mode) */
-
+/* 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;
+}
+
+/* no scrollbars */
+.inspector-hover div {
+    overflow-x: hidden;
+    overflow-y: hidden;
+}
+
 /* hide and remove from layout */
 .inspector-hidden,
 .inspector-hover label input[type="checkbox"],
@@ -2887,6 +3901,7 @@ button.save.has-count .count::before {
 .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;
@@ -2900,13 +3915,14 @@ button.save.has-count .count::before {
 /* hide but preserve in layout */
 .inspector-hover .entity-editor-pane button.minor,
 .inspector-hover .combobox-caret,
-.inspector-hover .entity-editor-pane .header button,
+.inspector-hover .header button,
 .inspector-hover .spin-control,
+.inspector-hover .form-field-multicombo .chips .remove,
 .inspector-hover .hide-toggle:before,
 .inspector-hover .more-fields,
 .inspector-hover .form-label-button-wrap,
 .inspector-hover .tag-reference-button,
-.inspector-hover .view-on-osm {
+.inspector-hover .footer * {
     opacity: 0;
 }
 
@@ -2915,18 +3931,34 @@ button.save.has-count .count::before {
 .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;
@@ -2967,17 +3999,31 @@ button.save.has-count .count::before {
     overflow: hidden;
 }
 
-/* adding additional preset fields */
-
+/* More Fields dropdown
+------------------------------------------------------- */
 .more-fields {
     padding: 0 20px 20px 20px;
     font-weight: bold;
 }
+.changeset-editor .more-fields {
+    padding: 15px 20px 0 20px;
+}
 
-.more-fields label { padding: 5px 10px 5px 0; }
-.more-fields input { width: 50%;}
+.more-fields label {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+}
 
-/* preset form access */
+.more-fields input {
+    margin-left: 10px;
+    flex: 1 1 50%;
+}
+[dir='rtl'] .more-fields input {
+    margin-left: auto;
+    margin-right: 10px;
+}
 
 .preset-input-wrap .label {
     height: 30px;
@@ -2985,68 +4031,184 @@ button.save.has-count .count::before {
     padding: 5px 10px;
 }
 
+[dir='rtl'] .preset-input-wrap .col6 {
+    float: right;
+}
+
+
+/* Field - Access, Cycleway, Structure
+------------------------------------------------------- */
+.structure-extras-wrap li,
+.form-field-cycleway .preset-input-wrap li,
 .form-field-access .preset-input-wrap li {
-    border-bottom: 1px solid #CCC;
+    border-bottom: 1px solid #ccc;
 }
+.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;
 }
-
+.structure-input-type-wrap input,
+.structure-input-layer-wrap input,
+.preset-input-cycleway-wrap input,
 .preset-input-access-wrap input {
     border-radius: 0;
     border-width: 0;
     border-left-width: 1px;
 }
+[dir='rtl'] .structure-input-type-wrap input,
+[dir='rtl'] .structure-input-layer-wrap input,
+[dir='rtl'] .preset-input-cycleway-wrap input,
+[dir='rtl'] .preset-input-access-wrap input {
+    border-left-width: 0;
+    border-right-width: 1px;
+}
 
 .preset-input-wrap li:last-child input {
     border-bottom-right-radius: 4px;
 }
 
-/* preset form cycleway */
+.structure-extras-wrap {
+    padding: 10px 10px;
+    background: #fff;
+}
+.structure-extras-wrap ul {
+    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;
+}
+[dir='rtl'] .structure-extras-wrap li:last-child span {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 4px;
+}
+[dir='rtl'] .structure-extras-wrap li:last-child input {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 4px;
+}
+
 
-.form-field-cycleway .preset-input-wrap li {
-    border-bottom: 1px solid #CCC;
+/* Field - Multicombo
+------------------------------------------------------- */
+.form-field-multicombo {
+    border: 1px solid #cfcfcf;
+    border-top: 0px;
+    padding: 5px 0 5px 10px;
+    background: #fff;
+    display: block;
+    border-radius: 0 0 4px 4px;
+    overflow: hidden;
 }
-.form-field-cycleway .preset-input-wrap li:last-child {
-    border-bottom: 0;
+.form-field-multicombo:focus {
+    border-bottom: 0px;
+}
+.form-field-multicombo.active {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
 }
 
-.preset-input-cycleway-wrap input {
-    border-radius: 0;
-    border-width: 0;
-    border-left-width: 1px;
+.form-field-multicombo li {
+    display: inline-flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    border-radius: 4px;
+    line-height: 25px;
+    padding: 2px 5px;
+    margin: 3px;
+}
+
+.form-field-multicombo a {
+    font-family: Arial, Helvetica, sans-serif !important;
+    font-size: 16px !important;
+    line-height: 24px;
+    float: right;
+    margin: 1px 0 0 5px;
+    padding: 0;
+    cursor: pointer;
+    color: #a6b4ce;
+}
+
+.form-field-multicombo input {
+    border: 1px solid #ddd;
+    width: 100px;
+    margin: 3px;
+    height: 31px;
+}
+
+.form-field-multicombo .combobox-caret {
+    margin: 3px 3px 3px -30px;
+}
+
+.form-field-multicombo input:focus {
+    border-radius: 4px !important;
 }
 
-/* preset form numbers */
 
+/* Field - Numeric
+------------------------------------------------------- */
 input[type=number] {
     position: relative;
     padding-right: 20%;
 }
 
 .spin-control {
-    width: 20%;
-    height: 29px;
+    width: 64px;
+    height: 30px;
     display: inline-block;
-    margin-left: -20%;
+    margin-left: -64px;
     margin-bottom: -11px;
     position: relative;
 }
+[dir='rtl'] .spin-control{
+    margin-left: 0;
+    margin-right: -64px;
+}
 
 .spin-control button {
     right: 1px;
     position: relative;
     float: left;
     height: 100%;
-    width: 50%;
-    border-left: 1px solid #CCC;
+    width: 32px;
+    border-left: 1px solid #ccc;
     border-radius: 0;
     background: rgba(0, 0, 0, 0);
 }
+[dir='rtl'] .spin-control button{
+    border-left: 0;
+    border-right: 1px solid #ccc;
+}
 
 .spin-control button.decrement {
     border-bottom-right-radius: 3px;
 }
+[dir='rtl'] .spin-control button.decrement {
+    border-bottom-right-radius: 0;
+}
+[dir='rtl'] .spin-control button.increment {
+    border-bottom-left-radius: 3px;
+    right: 0;
+}
 
 .spin-control button.decrement::after,
 .spin-control button.increment::after {
@@ -3056,113 +4218,143 @@ input[type=number] {
     left: 0; right: 0; bottom: 0; top: 0;
     margin: auto;
 }
-
 .spin-control button.decrement::after {
-    border-top: 5px solid #CCC;
+    border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
-
 .spin-control button.increment::after {
-    border-bottom: 5px solid #CCC;
+    border-bottom: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
 
-/* preset form checkbox */
 
+/* Field - Checkbox
+------------------------------------------------------- */
 .checkselect label:last-of-type {
     display: block;
-    background: white;
+    background: #fff;
     padding: 5px 10px;
-    color: #7092FF;
+    color: #7092ff;
 }
-
 .checkselect label:hover {
     background: #f1f1f1;
 }
-
 .checkselect .set {
     color: inherit;
 }
-
 .checkselect label:not(.set) input[type="checkbox"] {
     opacity: .5;
 }
+.checkselect .reverser.button {
+    display: block;
+    float: right;
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    border-radius: 2px;
+    padding: 0px 8px;
+}
+[dir='rtl'] .checkselect .reverser.button {
+    float: left;
+}
+.checkselect .reverser.button.hide {
+    display: none;
+}
 
-/* Preset form radio button */
 
+/* Field - Radio button
+------------------------------------------------------- */
 .toggle-list button.remove {
     border-radius: 0 0 3px 3px;
 }
-
 .toggle-list button.remove .icon {
     position: absolute;
     left: 5px;
 }
-
 .toggle-list button.remove::before {
     content: none;
 }
 
-.form-field .wiki-lang {
-    border-radius: 0;
-}
-
-.form-field .wiki-title {
-    padding-right: 10%;
-}
-
-.form-field .wiki-title ~ .combobox-caret {
-    margin-left: -18%;
-    margin-right: 9%;
-}
-
-.form-field .wiki-link {
-    float: right;
-    background: #fafafa;
-    padding: 5px;
-    text-align: center;
-}
-
-.form-field .wiki-link:hover {
-    background: #f1f1f1;
-}
 
+/* Field - Maxspeed
+------------------------------------------------------- */
+#preset-input-maxspeed_advisory,
 #preset-input-maxspeed {
     border-right: none;
     border-radius: 0 0 0 4px;
     width: 80%;
 }
+[dir='rtl'] #preset-input-maxspeed_advisory,
+[dir='rtl'] #preset-input-maxspeed {
+    border-right: 1px solid #ccc;
+    border-radius: 0 0 4px 0;
+}
 
 .form-field .maxspeed-unit {
     border-radius: 0 0 4px 0;
     width: 20%;
 }
+[dir='rtl'] .form-field .maxspeed-unit {
+    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;
+}
 
-/* Name + translate form */
 
+/* Field - Localized Name
+------------------------------------------------------- */
 .form-field .localized-main {
-    padding-right: 10%;
+    padding-right: 12%;
+}
+[dir='rtl'] .form-field .localized-main {
+    padding-left: 12%;
+    padding-right: 10px;
 }
 
 .form-field .button-input-action {
     position: relative;
     right: 1px;
-    width: 10%;
-    margin-left: -10%;
-    border: 1px solid #CCC;
+    width: 32px;
+    margin-left: -32px;
+    border: 1px solid #ccc;
     border-top-width: 0;
     border-right-width: 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;
+    border-radius: 0 0 0 4px;
+}
 
 .form-field .localized-wrap {
     padding: 0 10px;
 }
-
 .form-field .localized-wrap .entry {
     position: relative;
     overflow: hidden;
@@ -3172,7 +4364,7 @@ input[type=number] {
     content: "";
     display: block;
     position: absolute;
-    background:#ccc;
+    background: #ccc;
     height: 11px;
     width: 1px;
     left: 0;
@@ -3185,22 +4377,25 @@ input[type=number] {
     border-radius: 0;
     border-top-width: 0;
 }
-
 .form-field .localized-wrap .entry .localized-value {
     border-top-width: 0;
     border-radius: 0 0 4px 4px;
 }
-
 .form-field .localized-wrap .form-label button {
     border-top-right-radius: 3px;
 }
 
-/* Preset form address */
 
+/* Field - Address
+------------------------------------------------------- */
 .addr-row input {
     border-right: 0;
     border-bottom: 0;
 }
+[dir='rtl'] .addr-row input {
+    border-right: 1px solid #ccc;
+    border-left: 0;
+}
 
 .addr-row:first-of-type input {
     border-top: 0;
@@ -3209,6 +4404,9 @@ input[type=number] {
 .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;
@@ -3217,24 +4415,74 @@ input[type=number] {
 .addr-row:last-of-type input:first-of-type {
     border-radius: 0 0 0 4px;
 }
+[dir='rtl'] .addr-row:last-of-type input:first-of-type {
+    border-radius: 0 0 4px 0;
+}
 
 .addr-row:last-of-type input:last-of-type {
     border-radius: 0 0 4px 0;
 }
+[dir='rtl'] .addr-row:last-of-type input:last-of-type {
+    border-radius: 0 0 0 4px;
+}
+
+
+/* Field - Restriction Editor
+------------------------------------------------------- */
+.form-field-restrictions .restriction-controls-container {
+    background-color: #fff;
+    border-top: 1px solid #ccc;
+    width: 100%;
+    padding: 5px;
+}
+
+.restriction-controls-container .restriction-controls {
+    display: table;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.restriction-controls .restriction-control {
+    display: table-row;
+    padding: 5px 10px;
+    height: 25px;
+}
+
+.restriction-control input,
+.restriction-control span {
+    display: table-cell;
+    text-align: start;
+    padding: 0px 5px;
+}
 
-/* Restrictions editor */
+.restriction-control span.restriction-control-label {
+    text-align: end;
+}
+
+.restriction-control input {
+    width: 60px;
+    padding: 0;
+    margin: 0px 5px;
+    vertical-align: middle;
+}
 
-.form-field-restrictions .preset-input-wrap {
+.form-field-restrictions .restriction-container {
     position: relative;
-    height: 300px;
+    height: 370px;
+}
+/* zero width space, so container takes up space */
+.form-field-restrictions .restriction-container:after {
+    content: '\200b';
 }
 
-.form-field-restrictions svg {
+.form-field-restrictions svg.surface {
     width: 100%;
     height: 100%;
 }
 
-.form-field-restrictions .restriction-help {
+.restriction-container .restriction-help {
     z-index: 1;
     position: absolute;
     top: 0;
@@ -3242,19 +4490,67 @@ input[type=number] {
     right: 0;
     padding: 2px 6px;
     background-color: rgba(255, 255, 255, .8);
-    color: #999;
+    color: #888;
     text-align: center;
+    pointer-events: none;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.restriction-help span {
+    margin: 2px;
+}
+
+.restriction-help .qualifier {
+    color: #666;
+    font-weight: bold;
+}
+.restriction-help .qualifier.allow {
+    color: #8b5;
+}
+.restriction-help .qualifier.restrict {
+    color: #d53;
+}
+.restriction-help .qualifier.only {
+    color: #78f;
 }
 
-/* combobox dropdown */
 
+/* Field - Changeset Comment
+------------------------------------------------------- */
+.form-field-comment:not(.present) #preset-input-comment {
+    border-color: rgb(230, 100, 100);
+}
+
+.form-field-comment:not(.present) .form-label {
+    border-color: rgb(230, 100, 100);
+    background: rgba(230, 100, 100, 0.2);
+}
+
+.form-field-comment:not(.present) .form-label {
+}
+
+.form-field-comment:not(.present) .form-label-button-wrap {
+    border-color: rgb(230, 100, 100);
+}
+
+.form-field-comment:not(.present) button {
+    border-color: rgb(230, 100, 100);
+}
+
+
+/* Field - Combobox
+------------------------------------------------------- */
 div.combobox {
     z-index: 9999;
     display: none;
-    box-shadow: 0 0 10px 0 rgba(0,0,0,.1);
+    box-shadow: 0 4px 10px 1px rgba(0,0,0,.2);
     margin-top: -1px;
-    background: white;
-    max-height: 120px;
+    background: #fff;
+    max-height: 245px;
     overflow-y: auto;
     overflow-x: hidden;
     border: 1px solid #ccc;
@@ -3264,7 +4560,7 @@ div.combobox {
 .combobox a {
     display: block;
     padding: 5px 10px;
-    border-top:1px solid #ccc;
+    border-top: 1px solid #ccc;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
@@ -3277,6 +4573,7 @@ div.combobox {
 
 .combobox a:first-child {
     border-top: 0;
+    padding: 4px 10px;
 }
 
 .combobox-caret {
@@ -3287,9 +4584,13 @@ div.combobox {
     margin-left: -30px;
     vertical-align: top;
 }
+[dir='rtl'] .combobox-caret {
+  margin-left: 0;
+  margin-right: -30px;
+}
 
 .combobox-caret::after {
-    content:"";
+    content: "";
     height: 0; width: 0;
     position: absolute;
     left: 0; right: 0; bottom: 0; top: 0;
@@ -3299,24 +4600,139 @@ div.combobox {
     border-right: 5px solid transparent;
 }
 
-/* Raw Tag Editor */
 
-.tag-list {
-    padding-top: 10px;
+/* Field Help
+------------------------------------------------------- */
+.field-help-body {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 20px;
+    right: 20px;
+    margin: 5px;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-top: 0;
+    border-radius: 0 0 4px 4px;
+    z-index: 20;
+    background: rgba(255,255,255,0.95);
+    box-shadow: 0 0 30px 5px rgba(0,0,0,.4);
 }
 
-.tag-row {
-    width: 100%;
-    position: relative;
-    clear: both;
+.field-help-title h2 {
+    padding: 10px;
+    margin-bottom: 0px;
+    font-size: 17px;
+}
+.field-help-title button {
+    width: 45px;
+    height: 55px;
+    border-radius: 0;
+}
+
+.field-help-nav {
+    font-size: 13px;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.field-help-nav-item {
+    display: inline-block;
+    padding: 5px 10px;
+    cursor: pointer;
+    color: #666;
+}
+.field-help-nav-item.active {
+    color: #7092ff;
+}
+.field-help-nav-item:hover {
+    color: #597be7;
+    background-color: #efefef;
+}
+
+.field-help-content {
+    padding: 10px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+.field-help-content h3 {
+    font-size: 12px;
+    margin-bottom: 5px;
+}
+.field-help-content p {
+    margin-bottom: 15px;
+}
+.field-help-content ul li {
+    list-style: inside;
+    margin-bottom: 5px;
+}
+
+.field-help-content .field-help-image {
+    width: 100%;
+    margin-bottom: 15px;
+}
+
+.field-help-content svg.turn {
+    width: 40px;
+    height: 20px;
+}
+.field-help-content svg.shadow {
+    opacity: 0.7;
+    width: 60px;
+    height: 20px;
+}
+.field-help-content svg.from {
+    color: #777;
+}
+.field-help-content svg.allow {
+    color: #5b3;
+}
+.field-help-content svg.restrict {
+    color: #d53;
+}
+.field-help-content svg.only {
+    color: #68f;
+}
+
+.field-help-content p.from_shadow,
+.field-help-content p.allow_shadow,
+.field-help-content p.restrict_shadow,
+.field-help-content p.allow_turn,
+.field-help-content p.restrict_turn {
+    margin-bottom: 5px;
+}
+
+
+/* Raw Tag Editor
+------------------------------------------------------- */
+.tag-list {
+    padding-top: 10px;
+}
+
+.tag-row {
+    width: 100%;
+    position: relative;
+    clear: both;
+}
+
+.tag-row.readonly,
+.tag-row.readonly input.key,
+.tag-row.readonly input.value,
+.tag-row.readonly button.remove {
+    color: #777777;
+    background-color: #eee;
+    cursor: not-allowed;
 }
 
 .tag-row input {
     height: 31px;
     border: 0;
     border-radius: 0;
-    border-bottom: 1px solid #CCC;
-    border-left: 1px solid #CCC;
+    border-bottom: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+}
+[dir='rtl'] .tag-row input {
+    border-left: none;
+    border-right: 1px solid #ccc;
 }
 
 .tag-row .key-wrap,
@@ -3325,6 +4741,10 @@ div.combobox {
     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;
@@ -3332,26 +4752,38 @@ div.combobox {
 }
 
 .tag-row input.value {
-    border-right: 1px solid #CCC;
+    border-right: 1px solid #ccc;
+}
+[dir='rtl'] .tag-row input.value {
+    border-left: 1px solid #ccc;
 }
 
 .tag-row:first-child input.key {
-    border-top: 1px solid #CCC;
+    border-top: 1px solid #ccc;
     border-top-left-radius: 4px;
 }
+[dir='rtl'] .tag-row:first-child input.key {
+    border-top-left-radius: 0;
+    border-top-right-radius: 4px;
+}
 
 .tag-row:first-child input.value {
-    border-top: 1px solid #CCC;
+    border-top: 1px solid #ccc;
 }
 
 .tag-row button {
     position: absolute;
     height: 31px;
     right: 10%;
-    border: 1px solid #CCC;
+    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;
+}
 
 .tag-row button:hover {
     background: #f1f1f1;
@@ -3368,10 +4800,18 @@ div.combobox {
 .tag-row:first-child .tag-reference-button {
     border-top-right-radius: 4px;
 }
+[dir='rtl'] .tag-row:first-child .tag-reference-button {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 0;
+}
 
 .tag-row:last-child .tag-reference-button {
     border-bottom-right-radius: 4px;
 }
+[dir='rtl'] .tag-row:last-child .tag-reference-button {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 0;
+}
 
 .tag-row .tag-reference-button {
     right: 0;
@@ -3380,10 +4820,16 @@ div.combobox {
     top: 0;
     background: #fafafa;
 }
+[dir='rtl'] .tag-row .tag-reference-button {
+    left: auto;
+    right: auto;
+    margin-right: 35px;
+    border-left-width: 1px;
+    border-right-width: 0;
+}
 
 /* Adding form fields to tag editor */
-
-.inspector-inner .add-tag {
+.raw-tag-editor .add-tag {
     width: 40%;
     height: 30px;
     border-top: 0;
@@ -3391,16 +4837,15 @@ div.combobox {
     border-radius: 0 0 4px 4px;
 }
 
-.inspector-inner .add-tag:hover {
+.raw-tag-editor .add-tag:hover {
     background: rgba(0,0,0,.8);
 }
 
-.inspector-inner .add-tag .label {
+.raw-tag-editor .add-tag .label {
     display: none;
 }
 
 /* Tag reference */
-
 button.minor.tag-reference-loading {
     background-color: #f5f5f5;
 }
@@ -3415,18 +4860,17 @@ button.minor.tag-reference-loading {
     clear: both;
 }
 
-.tag-reference-body p,
-.tag-reference-body img {
-    margin-top: 20px;
-}
-
-.tag-reference-body p:last-child {
-    padding-bottom: 10px;
+.tag-reference-body .tag-reference-description {
+    margin: 10px 5px 0 5px;
 }
 
 .tag-reference-body a {
     display: block;
-    padding-bottom: 10px;
+}
+
+.tag-reference-body .tag-reference-description:last-child,
+.tag-reference-body a:last-child {
+    margin-bottom: 15px;
 }
 
 .preset-list .tag-reference-body {
@@ -3434,43 +4878,37 @@ button.minor.tag-reference-loading {
     width: 100%;
 }
 
-.preset-list .tag-reference-body a {
-    padding-bottom: 20px;
-}
-
-.preset-list .tag-reference-body p,
-.preset-list .tag-reference-body img {
-    margin-top: 10px;
-}
-
 .raw-tag-editor .tag-reference-body {
-    border-bottom: 1px solid #ccc;
     float: left;
     width: 100%;
 }
 
-.raw-tag-editor .tag-reference-body p:last-child {
-    padding-bottom: 20px;
+.raw-tag-editor .tag-row.readonly .tag-reference-body {
+    background: #f6f6f6;
+    color: #333;
+}
+
+.raw-tag-editor .tag-row:not(:last-child) .tag-reference-body {
+    border-bottom: 1px solid #ccc;
 }
 
-.raw-tag-editor .tag-reference-body a {
-    padding-bottom: 20px;
+.raw-tag-editor .tag-row.readonly .tag-reference-body.expanded {
+    border-top: 1px solid #ccc;
 }
 
-img.wiki-image {
+img.tag-reference-wiki-image {
     float: right;
     width: 33.3333%;
     width: -webkit-calc(33.3333% - 10px);
     width: calc(33.3333% - 10px);
-    margin-left: 20px;
-    margin-right: 10px;
     border-radius: 4px;
     max-height: 200px;
-    margin-bottom: 20px;
+    margin: 10px 5px 15px 20px;
 }
 
-/* Raw relation membership editor */
 
+/* Raw Member / Membership Editor
+------------------------------------------------------- */
 .raw-member-editor .member-list li:first-child,
 .raw-membership-editor .member-list li:first-child {
     padding-top: 10px;
@@ -3508,36 +4946,208 @@ img.wiki-image {
     background: rgba(0,0,0,.8);
 }
 
-/* Fullscreen button */
-div.full-screen {
-    float: right;
-    width: 40px;
-    margin-right: 10px;
+/* hidden field to prevent user from tabbing out of the sidebar */
+input.key-trap {
+    height: 0px;
+    width: 0px;
+    padding: 0px;
+    border: 1px solid rgba(0,0,0,0);
 }
 
-div.full-screen .tooltip {
-    min-width: 160px;
+
+/* OSM Note Editor
+------------------------------------------------------- */
+.note-header {
+    background-color: #f6f6f6;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
 }
 
-div.full-screen > button, div.full-screen > button.active {
+.note-header-icon {
+    background-color: #fff;
+    padding: 10px;
+    flex: 0 0 62px;
+    position: relative;
+    width: 60px;
+    height: 60px;
+    border-right: 1px solid #ccc;
+    border-radius: 5px 0 0 5px;
+}
+[dir='rtl'] .note-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
+}
+
+.note-header-icon .icon-wrap {
+    position: absolute;
+    top: 0px;
+}
+
+.note-header-label {
+    background-color: #f6f6f6;
+    padding: 0 15px;
+    flex: 1 1 100%;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 0 5px 5px 0;
+}
+[dir='rtl'] .note-header-label {
+    border-radius: 5px 0 0 5px;
+}
+
+.note-category {
+    margin: 20px 0px;
+}
+
+.comments-container {
+    background: #ececec;
+    padding: 1px 10px;
+    border-radius: 8px;
+    margin-top: 20px;
+}
+
+.comment {
+    background-color: #fff;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin: 10px auto;
+    display: flex;
+    flex-flow: row nowrap;
+}
+.comment-avatar {
+    padding: 10px;
+    flex: 0 0 62px;
+}
+.comment-avatar .icon.comment-avatar-icon {
     width: 40px;
     height: 40px;
-    background: transparent;
+    object-fit: cover;
+    border: 1px solid #ccc;
+    border-radius: 20px;
+}
+.comment-main {
+    padding: 10px 10px 10px 0;
+    flex: 1 1 100%;
+    flex-flow: column nowrap;
+    overflow: hidden;
+    overflow-wrap: break-word;
+}
+[dir='rtl'] .comment-main {
+    padding: 10px 0 10px 10px;
 }
 
-div.full-screen > button:hover {
-    background-color: rgba(0, 0, 0, .8);
+.comment-metadata {
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+.comment-author {
+    font-weight: bold;
+    color: #333;
+}
+.comment-date {
+    color: #aaa;
+}
+.comment-text {
+    color: #333;
+    margin-top: 10px;
+    overflow-y: auto;
+    max-height: 250px;
+}
+.comment-text::-webkit-scrollbar {
+    border-left: none;
+}
+
+.note-save {
+    padding: 10px;
+}
+
+.note-save #new-comment-input {
+    width: 100%;
+    height: 100px;
+    max-height: 300px;
+    min-height: 100px;
+}
+
+.note-save .detail-section {
+    margin: 10px 0;
+}
+
+.note-report {
+    float: right;
+}
+
+
+/* Custom Data Editor
+------------------------------------------------------- */
+.data-header {
+    background-color: #f6f6f6;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+}
+
+.data-header-icon {
+    background-color: #fff;
+    padding: 10px;
+    flex: 0 0 62px;
+    position: relative;
+    width: 60px;
+    height: 60px;
+    border-right: 1px solid #ccc;
+    border-radius: 5px 0 0 5px;
+}
+[dir='rtl'] .data-header-icon {
+    border-right: unset;
+    border-left: 1px solid #ccc;
+    border-radius: 0 5px 5px 0;
+}
+
+.data-header-icon .icon-wrap {
+    position: absolute;
+    top: 0px;
+}
+
+.data-header-label {
+    background-color: #f6f6f6;
+    padding: 0 15px;
+    flex: 1 1 100%;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 0 5px 5px 0;
+}
+[dir='rtl'] .data-header-label {
+    border-radius: 5px 0 0 5px;
+}
+
+/* tag editor - no buttons */
+.data-editor.raw-tag-editor button {
+    display: none;
+}
+.data-editor.raw-tag-editor .tag-row .key-wrap,
+.data-editor.raw-tag-editor .tag-row .input-wrap-position {
+    width: 50%;
 }
 
-/* Map Controls */
 
+/* Map Controls
+------------------------------------------------------- */
 .map-controls {
     right: 0;
-    top: 70px;
+    top: 132px;
     width: 40px;
     position: fixed;
     z-index: 100;
 }
+[dir='rtl'] .map-controls {
+    left: 0;
+    right: auto;
+}
 
 .map-control > button {
     width: 40px;
@@ -3554,56 +5164,97 @@ div.full-screen > button:hover {
     background: #7092ff;
 }
 
-/* Zoomer */
 
-.zoombuttons button.zoom-in {
+/* Fullscreen Button (disabled)
+------------------------------------------------------- */
+div.full-screen {
+    float: right;
+    width: 40px;
+    margin-right: 10px;
+}
+
+div.full-screen .tooltip {
+    min-width: 160px;
+}
+
+div.full-screen > button, div.full-screen > button.active {
+    width: 40px;
+    height: 40px;
+    background: transparent;
+}
+
+div.full-screen > button:hover {
+    background-color: rgba(0, 0, 0, .8);
+}
+
+
+/* Zoom Buttons
+------------------------------------------------------- */
+.zoombuttons > button.zoom-in {
     border-radius: 4px 0 0 0;
 }
+[dir='rtl'] .zoombuttons > button.zoom-in {
+    border-radius: 0 4px 0 0;
+}
+
+
+/* Geolocate Button
+------------------------------------------------------- */
+.geolocate-control {
+    margin-bottom: 10px;
+}
+.geolocate-control > button {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .geolocate-control > button {
+    border-radius: 0 0 4px 0;
+}
 
-/* Background / Map Data Settings */
 
+/* Background / Map Data / Help Pane buttons
+------------------------------------------------------- */
+.help-control > button {
+    border-radius: 0 0 0 4px;
+}
+[dir='rtl'] .help-control > button {
+    border-radius: 0 0 4px 0;
+}
 
 .map-data-control button {
     border-radius: 0;
 }
 
-.background-control button {
+.background-control > button {
     border-radius: 4px 0 0 0;
 }
+[dir='rtl'] .background-control > button {
+    border-radius: 0 4px 0 0;
+}
+
 
+/* Background / Map Data Settings
+------------------------------------------------------- */
 .map-data-control,
 .background-control {
     position: relative;
 }
 
-.nudge-container {
-    border: 1px solid #CCC;
-}
-
 .imagery-faq {
-  margin-bottom: 10px;
+    margin-bottom: 10px;
+    white-space: nowrap;
 }
 
-.background-control .adjustments button:last-child {
-    border: 0;
-}
-
-.map-data-control .hide-toggle,
-.background-control .hide-toggle {
-    padding-bottom: 10px;
-}
-
-.layer-list, .controls-list {
-    margin-bottom: 10px;
-    border: 1px solid #CCC;
-    border-radius: 4px;
+.layer-list, .controls-list {
+    margin-bottom: 10px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
 }
 
 .layer-list li {
     position: relative;
     height: 30px;
-    background-color: white;
-    color: #7092FF;
+    background-color: #fff;
+    color: #7092ff;
 }
 
 .layer-list:empty {
@@ -3613,25 +5264,24 @@ div.full-screen > button:hover {
 .layer-list > li:first-child {
     border-radius: 3px 3px 0 0;
 }
-
 .layer-list > li:last-child {
     border-radius: 0 0 3px 3px;
 }
-
 .layer-list > li:only-child {
     border-radius: 3px;
 }
-
 .layer-list li:not(:last-child) {
     border-bottom: 1px solid #ccc;
 }
-
 .layer-list li:hover {
     background-color: #ececec;
 }
 
-.layer-list li.active {
-    background: #E8EBFF;
+.layer-list li.active button,
+.layer-list li.switch button,
+.layer-list li.active,
+.layer-list li.switch {
+    background: #e8ebff;
 }
 
 .layer-list li.best > div.best {
@@ -3640,6 +5290,10 @@ div.full-screen > button:hover {
     float: right;
 }
 
+[dir='rtl'] .list-item-data-browse svg {
+    transform: rotateY(180deg);
+}
+
 /* make sure tooltip fits in map-control panel */
 /* if too wide, placement will be wrong the first time it displays */
 .layer-list li.best .tooltip-inner {
@@ -3659,57 +5313,112 @@ div.full-screen > button:hover {
     text-overflow: ellipsis;
 }
 
-.minimap-toggle {
-    display: block;
-    padding: 5px 10px;
-    cursor: pointer;
-    color: #7092FF;
-    border-radius: 3px;
+.map-data-control .layer-list button,
+.background-control .layer-list button {
+    float: right;
+    height: 100%;
+    width: 10%;
+    border-left: 1px solid #ccc;
+    border-radius: 0;
+}
+[dir='rtl'] .map-data-control .layer-list button,
+[dir='rtl'] .background-control .layer-list button {
+    float: left;
+    border-left: none;
+    border-right: 1px solid #ccc;
 }
 
-.minimap-toggle.active {
-    background: #E8EBFF;
+.map-data-control .layer-list button .icon,
+.background-control .layer-list button .icon {
+    opacity: 0.5;
 }
 
-.minimap-toggle:hover {
-    background-color: #ececec;
+.map-data-control .layer-list button:first-of-type,
+.background-control .layer-list button:first-of-type {
+    border-radius: 0 3px 3px 0;
+}
+[dir='rtl'] .map-data-control .layer-list button:first-of-type,
+[dir='rtl'] .background-control .layer-list button:first-of-type {
+    border-radius: 3px 0 0 3px;
 }
 
-.hide-toggle {
-    display: block;
-    padding-left:12px;
-    position: relative;
+.map-data-control .vectortile-container .vectortile-header {
+    padding-bottom: 5px;
+}
+.map-data-control .vectortile-container .vectortile-footer {
+    padding-bottom: 10px;
 }
 
-.hide-toggle:before {
-    content: '';
-    display: block;
-    position: absolute;
-    height: 0;
-    width: 0;
-    left: 0;
-    top: 5px;
-    border-top:  4px solid transparent;
-    border-bottom:  4px solid transparent;
-    border-left:  8px solid #7092ff;
+
+/* Background - Display Options Sliders
+------------------------------------------------------- */
+.display-options-container {
+    padding: 10px;
 }
 
-.hide-toggle.expanded:before {
-    border-top:  8px solid #7092ff;
-    border-bottom: 0;
-    border-right:  4px solid transparent;
-    border-left:  4px solid transparent;
+.display-control h5 {
+    padding-bottom: 0;
+    padding-top: 10px;
 }
 
-.background-control .nudge-container button {
-    float: left;
-    display: block;
-    width:20%;
-    border-right: 1px solid #CCC;
-    position: relative;
+.display-control h5 span {
+    margin: 5px;
+}
+
+.display-control .display-option-input {
+    height: 20px;
+    width: 155px;
+}
+
+.display-control button {
+    height: 30px;
+    width: 30px;
+    margin-left: 5px;
+    margin-right: 0px;
+    vertical-align: text-bottom;
+    border-radius: 4px;
+}
+[dir='rtl'] .display-control button {
+    margin-left: 0px;
+    margin-right: 5px;
+}
+
+
+/* Background - Adjust Alignment
+------------------------------------------------------- */
+.background-control .nudge-container {
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.nudge-container .nudge-instructions {
+    padding-bottom: 15px;
+}
+
+.nudge-container .nudge-outer-rect {
+    background-color: #eee;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    padding: 20px 0;
+    width: 70%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0 auto;
+    margin-top: 20px;
+    cursor: move;
+}
+
+.nudge-container .nudge-inner-rect {
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    width: 65%;
+    min-height: 20px;
 }
 
-.background-control .nudge::after {
+.nudge-container .nudge::after {
     content: '';
     display: block;
     position: absolute;
@@ -3719,150 +5428,177 @@ div.full-screen > button:hover {
     width: 0;
 }
 
-.background-control .nudge.left::after {
-    border-top:  5px solid transparent;
-    border-bottom:  5px solid transparent;
-    border-left:  5px solid #222;
+.nudge-container input {
+    width: 100%;
+    height: 20px;
+    text-align: center;
+    border: 0;
 }
 
-.background-control .nudge.right::after {
-    border-top:  5px solid transparent;
-    border-bottom:  5px solid transparent;
-    border-right:  5px solid #222;
+.nudge-container input.error {
+    border: 1px solid #ff7878;
+    border-radius: 2px;
+    background: #ffb;
 }
 
-.background-control .nudge.top::after {
-    border-right:  5px solid transparent;
-    border-left:  5px solid transparent;
-    border-bottom:  5px solid #222;
+.nudge-container input:focus {
+    background-color: transparent;
 }
 
-.background-control .nudge.bottom::after {
-    border-right:  5px solid transparent;
-    border-left:  5px solid transparent;
-    border-top:  5px solid #222;
+.nudge-container button {
+    float: left;
+    display: block;
+    width: 20%;
+    position: relative;
+    background-color: transparent;
 }
 
-.opacity-options {
-    background: url(<%= asset_path("iD/img/background-pattern-opacity.png") %>) 0 0 repeat;
-    height:20px;
-    width:82px;
-    position: absolute;
-    right: 50px;
-    top: 20px;
-    border: 1px solid #ccc;
+.nudge-container button.right {
+    top: -50px;
+    right: -85%;
 }
 
-.opacity-options li {
-    height: 100%;
-    display: block;
-    float: left;
+.nudge-container button.left {
+    top: -50px;
+    right: 45%;
 }
 
-.opacity-options li .select-box{
-    position: absolute;
-    width:20px;
-    height:18px;
-    z-index: 9999;
+.nudge-container button.top {
+    left: 20%;
+    top: -104px;
 }
 
-.map-data-control li:hover .select-box,
-.map-data-control li.selected .select-box,
-.background-control li:hover .select-box,
-.background-control li.selected .select-box {
-    border: 2px solid #7092ff;
-    background: rgba(89, 123, 231, .5);
-    opacity: .5;
+.nudge-container button.bottom {
+    left: -20%;
 }
 
-.map-data-control li.selected:hover .select-box,
-.map-data-control li.selected .select-box,
-.background-control li.selected:hover .select-box,
-.background-control li.selected .select-box {
-    opacity: 1;
+.nudge-container button.nudge-reset {
+    right: -10px;
 }
 
-.background-control .opacity {
-    background:#222;
-    display:inline-block;
-    width:20px;
-    height:18px;
+.nudge-surface {
+   position: absolute;
+   z-index: 5000;
+   left: 0;
+   top: 0;
+   width: 100%;
+   height: 100%;
+   background-color: transparent;
+   cursor: move;
 }
 
-.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;
+.background-control .nudge.right::after {
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-left: 5px solid #222;
 }
 
-.map-data-control .layer-list button .icon,
-.background-control .layer-list button .icon {
-    opacity: 0.5;
+.background-control .nudge.left::after {
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-right: 5px solid #222;
 }
 
-.map-data-control .layer-list button:first-of-type,
-.background-control .layer-list button:first-of-type {
-    border-radius: 0 3px 3px 0;
+.background-control .nudge.top::after {
+    border-right: 5px solid transparent;
+    border-left: 5px solid transparent;
+    border-bottom: 5px solid #222;
 }
 
-.map-data-control .map-overlay,
-.background-control .map-overlay,
-.help-control .map-overlay {
-    z-index: -1;
+.background-control .nudge.bottom::after {
+    border-right: 5px solid transparent;
+    border-left: 5px solid transparent;
+    border-top: 5px solid #222;
 }
 
 
-/* Geolocator */
+/* Side Panes - Background / Map Data / Help
+------------------------------------------------------- */
+.map-pane {
+    position: fixed;
+    top: 60px;
+    bottom: 30px;
+    right: 0;
+    padding-bottom: 50px;
+    overflow: hidden;
+    z-index: -1;
+}
+[dir='rtl'] .map-pane {
+    left: 0;
+    right: auto !important;
+}
 
-.geolocate-control {
-    margin-bottom: 10px;
+.pane-heading {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    border-bottom: 1px solid #ccc;
 }
 
-.geolocate-control button {
-    border-radius: 0 0 0 4px;
+.pane-heading h2 {
+    margin: 15px 20px;
 }
 
-.map-overlay.content {
-    position: fixed;
-    top:60px;
-    bottom: 30px;
-    padding: 20px 50px 20px 20px;
-    right: 0;
-    overflow: auto;
+.pane-heading button {
+    width: 40px;
+    height: 61px;
+    border-radius: 0;
 }
 
-/* Help */
+.pane-content {
+    height: 100%;
+    padding: 10px 50px 20px 20px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+}
+[dir='rtl'] .pane-content {
+    padding: 10px 20px 20px 50px;
+}
 
-.help-control button {
-    border-radius: 0 0 0 4px;
+.pane-content > div {
+    padding-bottom: 15px;
 }
 
+
+/* Help
+------------------------------------------------------- */
 .help-wrap p {
     font-size: 15px;
     margin-bottom: 20px;
 }
 
 .help-wrap .left-content .body p code {
-    padding:2px 4px;
-    background:#eee;
+    padding: 3px 4px;
+    font-size: 12px;
+    color: #555;
+    vertical-align: baseline;
+    background-color: #f6f6f6;
+    border: solid 1px #ccc;
+    margin: 0 2px;
+    border-bottom-color: #bbb;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #bbb;
+}
+
+.help-wrap .left-content .icon.pre-text {
+    vertical-align: text-top;
+    margin-right: 0;
+    margin-left: 0;
+    display: inline-block;
 }
 
 .help-wrap .toc {
-    /* This is two columns, 41.66666 x .4 = 16.6666 */
-    width:40%;
-    float:right;
+    width: 40%;
+    float: right;
     margin-left: 20px;
     margin-bottom: 20px;
-    padding-left: 5px
+    padding-left: 5px;
 }
 
 .help-wrap .toc li a,
 .help-wrap .nav a {
     display: block;
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     padding: 5px 10px;
 }
 
@@ -3871,23 +5607,24 @@ div.full-screen > button:hover {
 }
 
 .help-wrap .toc li a:hover,
-.help-wrap .nav a:hover  {
+.help-wrap .nav a:hover {
     background: #ececec;
 }
 
 .help-wrap .toc li a.selected {
-    background: #E8EBFF;
+    background: #e8ebff;
 }
 
 .help-wrap .toc li:first-child a {
     border-radius: 4px 4px 0 0;
 }
 
-.help-wrap .toc li:nth-last-child(2) a {
-    border-bottom: 1px solid #CCC;
+.help-wrap .toc li:nth-last-child(3) a {
+    border-bottom: 1px solid #ccc;
     border-radius: 0 0 4px 4px
 }
 
+.help-wrap .toc li.shortcuts a,
 .help-wrap .toc li.walkthrough a {
     overflow: hidden;
     margin-top: 10px;
@@ -3895,8 +5632,13 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
+.help-wrap .toc li.walkthrough a {
+    text-align: center;
+}
+
 .help-wrap .nav {
     position: relative;
+    padding-bottom: 30px;
 }
 
 .help-wrap .nav a {
@@ -3919,28 +5661,87 @@ div.full-screen > button:hover {
     border-radius: 4px;
 }
 
-/* Map
+
+/* Raster Background Tiles
 ------------------------------------------------------- */
+img.tile {
+    position: absolute;
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
 
-#map {
-    position:relative;
-    overflow:hidden;
-    height:100%;
-    background:#000;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    opacity: 0;
+
+    -webkit-transition: opacity 200ms linear;
+    -moz-transition: opacity 200ms linear;
+    transition: opacity 200ms linear;
 }
 
-#supersurface {
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
+img.tile-loaded {
+    opacity: 1;
+}
+
+img.tile-removing {
+    opacity: 0;
+}
+
+.tile-label-debug {
+    font-size: 10px;
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    position: absolute;
+    text-align: center;
+    padding: 5px;
+    border-radius: 3px;
+    z-index: 2;
+    margin-left: -70px;
+    margin-top: -20px;
+
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+img.tile-debug {
+    outline: 1px solid red;
+}
+
+
+/* Map
+------------------------------------------------------- */
+#map {
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+    background: #000;
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
 
+#supersurface {
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+}
+
 #supersurface, .layer {
     position: absolute;
     top: 0;
@@ -3949,9 +5750,9 @@ div.full-screen > button:hover {
     bottom: 0;
 }
 
+
 /* Map-In-Map
 ------------------------------------------------------- */
-
 .map-in-map {
     position: absolute;
     overflow: hidden;
@@ -3965,19 +5766,20 @@ div.full-screen > button:hover {
 }
 
 .map-in-map-tiles {
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
+    transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
 }
 
-.map-in-map-svg,
-.map-in-map-gpx {
+.map-in-map-viewport,
+.map-in-map-data {
     top: 0;
     left: 0;
     overflow: hidden;
@@ -3985,11 +5787,11 @@ div.full-screen > button:hover {
     width: 100%;
 }
 
-.map-in-map-svg {
+.map-in-map-viewport {
     position: absolute;
 }
 
-.map-in-map-gpx {
+.map-in-map-data {
     position: relative;
     z-index: 10;
 }
@@ -4005,57 +5807,170 @@ div.full-screen > button:hover {
     stroke-width: 5;
 }
 
-/* Info Box
+
+/* Debug Data
 ------------------------------------------------------- */
-.infobox {
-    position: absolute;
-    z-index: 1;
-    right: 0;
-    bottom: 30px;
-    width: 240px;
-    border-radius: 4px 0 0 0;
-    border-bottom: 1px solid black;
+.debug {
+    stroke: currentColor;
+    fill: none;
+    stroke-width: 2;
+}
+.map-in-map-data .debug {
+    stroke-width: 1;
 }
 
-.infobox .infobox-heading {
-    display: block;
-    border-radius: 4px 0 0 0;
+.nocolor { color: rgba(0, 0, 0, 0); }
+.red     { color: rgba(255, 0, 0, 0.75); }
+.green   { color: rgba(0, 255, 0, 0.75); }
+.blue    { color: rgba(176, 176, 255, 0.75); }
+.yellow  { color: rgba(255, 255, 0, 0.75); }
+.cyan    { color: rgba(0, 255, 255, 0.75); }
+.magenta { color: rgba(255, 0, 255, 0.75); }
+.orange  { color: rgba(255, 153, 0, 0.75); }
+.pink    { color: rgba(255, 0, 153, 0.75); }
+.purple  { color: rgba(153, 0, 255, 0.75); }
+
+.debug-legend {
+    position: absolute;
+    top: 70px;
+    right: 80px;
+    padding: 5px;
+    border-radius: 4px;
+    pointer-events: none;
+}
+
+.debug-legend-item {
+    padding-right: 5px;
+}
+.debug-legend-item:before {
+    content: "\25A0";
+    padding: 0 5px;
+}
+
+
+/* Information Panels
+------------------------------------------------------- */
+.info-panels {
+    display: flex;
+    flex-flow: row-reverse wrap-reverse;
+    position: absolute;
+    z-index: 1;
+    right: 0;
+    bottom: 30px;
+    -ms-user-select: element;
+}
+
+.info-panels h1,
+.info-panels h2,
+.info-panels h3,
+.info-panels h4,
+.info-panels h5 {
+    display: inline-block;
+    margin-bottom: 0;
+}
+
+.info-panels h1,
+.info-panels h2,
+.info-panels h3 {
+    color: #ff8;
+}
+
+.panel-container {
+    flex: 0 0 auto;
+    margin: 2px 0 0 2px;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.75);
+    padding-bottom: 10px;
+    width: 250px;
+}
+
+.panel-container .panel-title {
+    border-radius: 4px 4px 0 0;
+}
+
+.panel-title {
     padding: 5px 10px;
-    height: 30px;
 }
 
-.infobox ul {
+.panel-title button.close {
+    float: right;
+    height: 20px;
+    background: none;
+    color: #ddd;
+}
+[dir='rtl'] .panel-title button.close {
+    float: left;
+}
+
+.panel-title button.close:hover {
+    color: #fff;
+}
+.panel-title button.close .icon {
+    height: 20px;
+    width: 16px;
+}
+
+.panel-content {
     padding: 5px 10px;
+    position: relative;
 }
 
-.infobox .button {
-    position: absolute;
+.panel-content li span {
+    display: inline-block;
+    white-space: nowrap;
+    margin: 0 8px;
+}
+
+.panel-content .button {
+    display: inline-block;
     background: #7092ff;
     border-radius: 2px;
     padding: 0 4px;
-    color: white;
-    top: 40px;
-    right: 10px;
+    margin-top: 10px;
+    margin-right: 10px;
+    color: #fff;
+}
+[dir='rtl'] .panel-content .button {
+    margin-right: auto;
+    margin-left: 10px;
 }
 
-/* About Section
-------------------------------------------------------- */
+.panel-content-history .links a {
+    margin-left: 8px;
+}
+[dir='rtl'] .panel-content-history .links a {
+    margin-left: auto;
+    margin-right: 8px;
+}
+
+.panel-content-history .view-history-on-osm {
+    display: block;
+    margin-top: 10px;
+}
 
+.panel-content-location .location-info {
+    margin-top: 10px;
+}
+
+
+/* About Section, Attribution, Footer
+------------------------------------------------------- */
 #about {
     width: 100%;
     position: absolute;
-    right:0;
-    bottom:0;
+    right: 0;
+    bottom: 0;
     border-radius: 0;
     pointer-events: none;
+    display: flex;
+    flex-direction: column;
+    -ms-user-select: element;
 }
 
 #attrib {
     width: 100%;
     height: 20px;
     margin-bottom: 5px;
-    float: left;
-    clear: both;
 }
 
 #attrib * { pointer-events: all; }
@@ -4063,7 +5978,7 @@ div.full-screen > button:hover {
 .base-layer-attribution,
 .overlay-layer-attribution {
     position: absolute;
-    color: #888;
+    color: #ccc;
     font-size: 10px;
 }
 
@@ -4079,36 +5994,144 @@ div.full-screen > button:hover {
     content: '; ';
 }
 
-.source-image {
-    height:20px;
-    vertical-align:top;
+.attribution a,
+.attribution a:visited {
+    color: #ccf;
+}
+
+.attribution a:hover {
+    color: #aaf;
+}
+
+.attribution .source-image {
+    height: 20px;
+    vertical-align: middle;
+    border-radius: 3px;
+}
+
+.attribution span {
+    margin: 0 3px;
 }
 
 #footer {
-    width: 100%;
-    float: left;
-    clear: both;
     pointer-events: all;
+    display: block;
+    height: 30px;
+}
+
+
+/* Footer - Flash messages
+------------------------------------------------------- */
+#flash-wrap {
+    display: flex;
+    flex: 0 0 100%;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    max-height: 30px;
+    position: absolute;
+    right: 0;
+    left: 0;
+}
+
+.flash-content {
+    display: flex;
+    flex: 1 0 auto;
+    flex-flow: row nowrap;
+    align-items: center;
+    padding: 2px;
+    height: 30px;
+}
+
+.flash-icon {
+    flex: 0 0 auto;
+    width: 20px;
+    height: 20px;
+    margin: 0 8px;
+}
+
+.flash-icon circle {
+    fill: #eee;
+}
+.flash-icon.disabled circle {
+    cursor: auto;
+    fill: rgba(255,255,255,0.7);
+}
+
+.flash-icon use {
+    color: #222;
+}
+.flash-icon.disabled use {
+    color: rgba(32,32,32,0.7);
+}
+
+.flash-icon.operation use {
+    fill: #222;
+    color: #79f;
+}
+.flash-icon.operation.disabled use {
+    fill: rgba(32,32,32,0.7);
+    color: rgba(40,40,40,0.7);
+}
+
+.flash-text {
+    flex: 1 1 auto;
+}
+
+#footer-wrap {
+    display: flex;
+    flex: 0 0 100%;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    max-height: 30px;
+    position: absolute;
+    right: 0;
+    left: 0;
+}
+
+.footer-show {
+    bottom: 0px;
+    transition: bottom 75ms linear;
+    -moz-transition: bottom 75ms linear;
+    -webkit-transition: bottom 75ms linear;
+}
+
+.footer-hide {
+    bottom: -35px;
+    transition: bottom 75ms linear;
+    -moz-transition: bottom 75ms linear;
+    -webkit-transition: bottom 75ms linear;
 }
 
+
+/* Footer - Scale bar, About, Source Switcher
+------------------------------------------------------- */
 #scale-block {
-    display: table-cell;
     vertical-align: bottom;
     width: 250px;
     max-height: 30px;
-    float: left;
-    clear: left;
+    flex: 0 0 250px;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
 #info-block {
     max-height: 30px;
-    clear: right;
+    flex: 1 1 auto;
 }
 
 #scale {
     height: 30px;
     width: 100%;
 }
+[dir='rtl'] #scale {
+    transform: scaleX(-1);
+}
+
+#scale:hover {
+    cursor: pointer;
+}
 
 #scale text {
     font: 12px sans-serif;
@@ -4116,6 +6139,9 @@ div.full-screen > button:hover {
     fill: #ccc;
     text-anchor: start;
 }
+[dir='rtl'] #scale text {
+    transform: scaleX(-1);
+}
 
 #scale path {
     fill: none;
@@ -4130,6 +6156,12 @@ div.full-screen > button:hover {
     clear: right;
     overflow: hidden;
 }
+[dir='rtl'] #about-list {
+    text-align: left;
+    clear: left;
+    margin-left: 10px;
+    margin-right: 0;
+}
 
 #about-list li {
     float: right;
@@ -4137,12 +6169,23 @@ div.full-screen > button:hover {
     padding: 5px 0 5px 5px;
     margin-left: 5px;
 }
+[dir='rtl'] #about-list li {
+    float: left;
+    border-left: none;
+    border-right: 1px solid rgba(255,255,255,.5);
+    margin-left: 0;
+    margin-right: 5px;
+    padding: 5px 5px 5px 0;
+}
 
 #about-list li:last-child {
     border-left: 0;
     margin-left: 0;
     padding-left: 0;
 }
+[dir='rtl'] #about-list li:last-child {
+    border-right: none;
+}
 
 .source-switch a {
     padding: 2px 4px 4px 4px;
@@ -4150,7 +6193,7 @@ div.full-screen > button:hover {
 }
 .source-switch a.live {
     background: #d32232;
-    color:#fff;
+    color: #fff;
 }
 
 .feature-warning a {
@@ -4165,26 +6208,82 @@ div.full-screen > button:hover {
 }
 
 .api-status {
-    float: right;
-    clear: both;
     text-align: right;
-    width: 100%;
     padding: 0px 10px;
+    color: #eee;
+    flex: 1 1 auto;
+}
+[dir='rtl'] .api-status {
+    text-align: left;
 }
 
 .api-status.offline,
 .api-status.readonly,
 .api-status.error {
-    background: red;
+    background: #a22;
+}
+
+.api-status-login {
+    color: #aaf;
+}
+.api-status-login:hover {
+    color: #ccf;
 }
 
-/* Modals
+/* Notification Badges
 ------------------------------------------------------- */
+/* For an icon (e.g. new version) */
+.badge {
+    display: inline-block;
+    background: #d32232;
+    width: 21px;
+    height: 20px;
+    border-radius: 11px;
+    margin-left: 6px;
+}
+[dir='rtl'] .badge {
+    margin-left: 0;
+    margin-right: 6px;
+}
+.badge a {
+    margin-right: 5px;
+}
+[dir='rtl'] .badge a {
+    margin-right: 0;
+    margin-left: 5px;
+}
+.badge .icon {
+    vertical-align: baseline;
+    width: 11px;
+    height: 11px;
+    fill: #fff;
+}
+
+/* For text (e.g. upcoming events) */
+.badge-text {
+    display: inline-block;
+    color: #fff;
+    text-align: center;
+    width: 16px;
+    height: 16px;
+    font-size: 10px;
+    font-weight: bold;
+    margin-left: 5px;
+    background: #f00;
+    border-radius: 9px;
+}
+[dir='rtl'] .badge-text {
+    margin-left: 0;
+    margin-right: 5px;
+}
+
 
+/* Modals / Prompts
+------------------------------------------------------- */
 .modal {
     top: 40px;
     display: inline-block;
-    position:absolute;
+    position: absolute;
     border-radius: 3px;
     overflow: hidden;
     left: 0;
@@ -4193,152 +6292,335 @@ div.full-screen > button:hover {
     z-index: 50;
 }
 
-.modal .loader {
-    margin-bottom: 10px;
+.modal .loader {
+    margin-bottom: 10px;
+}
+.modal .description {
+    text-align: center;
+}
+
+.shaded {
+    z-index: 49;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow: auto;
+}
+.shaded:before {
+    content:'';
+    background: rgba(0,0,0,0.5);
+    position: fixed;
+    left: 0px; right: 0px; top: 0px; bottom: 0px;
+}
+
+.modal-section {
+    padding: 20px;
+    border-bottom: 1px solid #ccc;
+}
+.modal-section.header h3 {
+    padding: 0;
+}
+.modal-section.buttons {
+    text-align: center;
+}
+
+.modal-section.buttons .action {
+    display: inline-block;
+    margin: 0 10px;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.save-section .buttons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    margin-bottom: 30px;
+}
+
+.save-section .buttons .action,
+.save-section .buttons .secondary-action {
+    width: 45%;
+    margin: 10px auto;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.loading-modal {
+    text-align: center;
+}
+
+.modal-actions button {
+    font-weight: normal;
+    color: #7092ff;
+    border-bottom: 1px solid #ccc;
+    border-radius: 0;
+    height: 160px;
+    text-align: center;
+    display: inline-block;
+}
+.modal-actions button:hover {
+    background-color: #ececec;
+}
+
+.logo-small {
+    height: 40px;
+    width: 40px;
+    margin: auto;
+}
+
+.logo {
+    height: 100px;
+    width: 100%;
+    max-width: 100px;
+    margin: auto;
+}
+
+.modal-actions > :first-child {
+    border-right: 1px solid #ccc;
+}
+
+.modal-section:last-child {
+    border-bottom: 0;
+}
+
+/* Restore Modal
+------------------------------------------------------- */
+.modal-actions .logo-restore {
+    color: #7092ff;
+}
+.modal-actions .logo-reset {
+    color: #e06c5e;
+}
+
+/* Success Screen / Community Index
+------------------------------------------------------- */
+.save-success.body {
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+
+.save-success .link-out {
+    margin: 0px 5px;
+    white-space: nowrap;
+}
+
+.save-summary,
+.save-communityLinks {
+    padding: 0px 20px 15px 20px;
+}
+
+.save-communityLinks {
+    border-top: 1px solid #ccc;
+}
+
+.save-success table,
+.save-success p {
+    margin-top: 15px;
+}
+.save-success h3 {
+    font-size: 14px;
+    margin-top: 15px;
+    line-height: 1.5;
+    padding-bottom: 0;
+}
+.save-success td {
+    vertical-align: top;
+}
+.save-success td.cell-icon {
+    width: 40px;
+}
+.save-success td.cell-detail {
+    padding: 0 10px;
+}
+.save-success td.community-detail {
+    padding-bottom: 15px;
+}
+
+.summary-view-on-osm,
+.community-name {
+    font-size: 14px;
+    font-weight: bold;
+}
+.community-languages {
+    margin-top: 5px;
+    font-style: italic;
+}
+.community-languages:only-child {
+    margin-top: 0;
+}
+
+.community-detail a.hide-toggle,
+.community-detail a:visited.hide-toggle {
+    font-size: 12px;
+    font-weight: normal;
+    padding-bottom: 0;
+}
+.community-detail .hide-toggle svg.icon.pre-text {
+    width: 12px;
+    height: 15px;
+}
+
+.community-events {
+    margin-top: 5px;
+}
+
+.community-event,
+.community-more {
+    background-color: #efefef;
+    padding: 8px;
+    border-radius: 4px;
+    margin-bottom: 5px;
+}
+
+.community-event-name {
+    font-size: 14px;
+    font-weight: bold;
+}
+.community-event-when {
+    font-weight: bold;
 }
 
-.modal .description {
+.community-missing {
+    padding: 10px;
     text-align: center;
 }
 
-.shaded {
-    z-index: 49;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow: auto;
-}
 
-.shaded:before {
-    content:'';
-    background:rgba(0,0,0,0.5);
-    position:fixed;
-    left:0px; right:0px; top:0px; bottom:0px;
+/* Splash Modal
+------------------------------------------------------- */
+.modal-actions .logo-walkthrough,
+.modal-actions .logo-features {
+    color: #7092ff;
 }
 
-.modal-section {
-    padding: 20px;
-    border-bottom: 1px solid #CCC;
-}
 
-.modal-section.header h3 {
-    padding: 0;
+/* Shortcuts Modal
+------------------------------------------------------- */
+.modal-shortcuts {
+    width: 90%;
+    max-width: 950px;
 }
 
-.modal-section.buttons {
-    text-align: center;
+.modal-shortcuts .modal-section:last-child {
+    padding-top: 10px;
+    min-height: 275px;
 }
 
-.modal-section.buttons .action {
-    display: inline-block;
-    margin: 0 10px;
+.modal-shortcuts .tabs-bar {
     text-align: center;
-    vertical-align: middle;
+    padding-bottom: 5px;
+    font-size: 16px;
+    font-weight: bold;
 }
 
-.save-section .buttons .action {
+.modal-shortcuts .tab {
     display: inline-block;
-    margin: 0 20px 0 0;
-    text-align: center;
-    vertical-align: middle;
+    padding: 5px 10px;
+    margin: 0 5px;
+    cursor: pointer;
+    color: #666;
 }
-
-.loading-modal {
-    text-align: center;
+.modal-shortcuts .tab.active {
+    color: #7092ff;
+}
+.modal-shortcuts .tab:hover {
+    color: #597be7;
+    background-color: #efefef;
 }
 
-.modal-actions button,
-.save-success a.button {
-    font-weight: normal;
-    color: #7092FF;
-    border-bottom: 1px solid #CCC;
-    border-radius: 0;
-    height: 160px;
-    text-align: center;
-    display: inline-block;
+.modal-shortcuts .shortcut-tab {
+    display: flex;
+    flex-flow: row wrap;
 }
 
-.modal-actions button:hover
-.save-success a.button:hover {
-    background-color: #ececec;
+.modal-shortcuts .shortcut-column {
+    flex: 1 1 50%;
+    width: 50%;
 }
 
-.modal-actions button:before,
-.save-success a.button.osm:before,
-.walkthrough a:before {
-    display: block;
-    content: '';
-    height: 100px;
+.modal-shortcuts .shortcut-tab-tools .shortcut-column {
+    flex: 1 1 100%;
     width: 100%;
-    max-width: 100px;
-    margin: auto;
-    margin-bottom: 10px;
-    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -200px -460px;
 }
 
-.modal-actions :first-child {
-    border-right: 1px solid #CCC;
+.modal-shortcuts td {
+    padding-bottom: 5px;
 }
 
-.modal-section:last-child {
-    border-bottom: 0;
+.modal-shortcuts .shortcut-section {
+    padding: 20px 0 10px 0;
 }
 
-/* Restore Modal
-------------------------------------------------------- */
-
-.modal-actions .restore:before {
-    background-position: -500px -460px;
+.modal-shortcuts .shortcut-keys {
+    padding-right: 10px;
+    color: #767676;
+    text-align: right;
 }
-
-.modal-actions .reset:before {
-    background-position: -600px -460px;
+[dir='rtl'] .modal-shortcuts .shortcut-keys {
+    padding-right: auto;
+    padding-left: 10px;
+    text-align: left;
 }
 
-/* Success Modal
-------------------------------------------------------- */
-
-.save-success p {
-    padding: 15px 15px 0 15px;
-}
-.save-success a.details {
-  padding-left: 15px;
-}
-.save-success .button {
-    padding-top: 15px;
+.modal-shortcuts .shortcut-keys kbd {
+    display: inline-block;
+    text-align: center;
+    padding: 3px 5px;
+    font-size: 11px;
+    line-height: 12px;
+    min-width: 12px;
+    color: #555;
+    vertical-align: baseline;
+    background-color: #fcfcfc;
+    border: solid 1px #ccc;
+    margin: 0 2px;
+    border-bottom-color: #bbb;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #bbb;
 }
 
-.save-success a.button.social {
-    height: auto;
+svg.mouseclick use.left {
+    fill: rgba(112, 146, 255, 1);
+    color: rgba(112, 146, 255, 0);
 }
-
-.save-success .icon.social {
-    height: 80px;
-    width: 80px;
-    color: #7092FF;
+svg.mouseclick use.right {
+    fill: rgba(112, 146, 255, 0);
+    color: rgba(112, 146, 255, 1);
 }
 
-.save-success .button.osm:before {
-    background-position: -200px -460px;
+.modal-shortcuts .shortcut-keys .gesture {
+    color: #333;
+    padding: 3px;
 }
 
-/* Splash Modal
+
+/* Settings Modals
 ------------------------------------------------------- */
+.settings-modal textarea {
+    height: 70px;
+}
+.settings-modal .buttons .button.col3 {
+    float: none;   /* undo float left */
+}
 
-.modal-actions .walkthrough:before,
-.walkthrough a:before {
-    background-position: -300px -460px;
+.settings-custom-background .instructions-template {
+    margin-bottom: 20px;
 }
 
-.modal-actions .start:before {
-    background-position: -400px -460px;
+.settings-custom-data .instructions-url {
+    margin-bottom: 10px;
+}
+.settings-custom-data .field-file,
+.settings-custom-data .instructions-template {
+    margin-bottom: 20px;
 }
 
-/* Commit Modal
-------------------------------------------------------- */
 
+/* Save Mode
+------------------------------------------------------- */
 .mode-save a.user-info {
     display: inline-block;
 }
@@ -4357,32 +6639,57 @@ div.full-screen > button:hover {
     float: left;
     height: 12px;
     min-width: 12px;
-    font-size:12px;
+    font-size: 12px;
     line-height: 12px;
-    border-radius:24px;
-    padding:5px;
-    background:#7092ff;
-    color:#fff;
+    border-radius: 24px;
+    padding: 5px;
+    background: #7092ff;
+    color: #fff;
+}
+
+.note-save .field-warning,
+.mode-save .field-warning {
+    background: #ffb;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.note-save .field-warning:empty,
+.mode-save .field-warning:empty {
+    display: none;
 }
 
+.mode-save .field-warning,
+.mode-save .changeset-info,
+.mode-save .request-review,
 .mode-save .commit-info {
     margin-bottom: 10px;
 }
 
+.mode-save .request-review label {
+    cursor: pointer;
+}
+
 .mode-save .changeset-list {
-    border:1px solid #ccc;
+    border: 1px solid #ccc;
     border-radius: 4px;
-    background:#fff;
+    background: #fff;
+    margin-bottom: 10px;
+}
+
+.mode-save .warning-section {
+    background: #ffb;
 }
 
 .mode-save .warning-section .changeset-list button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
 }
 
 .mode-save .changeset-list li {
     position: relative;
-    border-top:1px solid #ccc;
-    padding:5px 10px;
+    border-top: 1px solid #ccc;
+    padding: 5px 10px;
     cursor: pointer;
 }
 
@@ -4395,12 +6702,12 @@ div.full-screen > button:hover {
 }
 
 .changeset-list li span.count {
-    font-size:10px;
-    color:#555;
+    font-size: 10px;
+    color: #555;
 }
 
 .mode-save .commit-section .changeset-list button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
 }
 
 .changeset-list li span.count:before { content: '('; }
@@ -4409,9 +6716,9 @@ div.full-screen > button:hover {
 
 .changeset-list li:first-child { border-top: 0;}
 
+
 /* Conflict resolution
 ------------------------------------------------------- */
-
 .conflicts-help {
     padding: 20px;
     background-color: #ffffbb;
@@ -4459,51 +6766,52 @@ div.full-screen > button:hover {
     height: 30px;
 }
 
-/* Notices
-------------------------------------------------------- */
 
+/* Notices (Zoom in to Edit)
+------------------------------------------------------- */
 .notice {
     position: absolute;
-    top: 0;
-    bottom: 0;
+    top: 45px;
     left: 0;
     right: 0;
     text-align: center;
-    background: #fff;
 }
 
 .notice .zoom-to {
     margin: auto;
-    width: 80%;
-    height: 100px;
-    border-radius: 5px;
-    line-height: 40px;
-    color: #000;
-    opacity: 0.9;
+    width: 300px;
+    height: 70px;
+    font-size: 150%;
+    border-radius: 8px;
 }
 
 .notice .zoom-to:hover {
-    background: #d8e1ff;
+    background: rgba(0,0,0,0.6);
 }
 
 .notice .zoom-to .icon {
-    margin-top:10px;
-    margin-right:10px;
+    width: 30px;
+    height: 30px;
+    vertical-align: middle;
+    margin-right: 10px;
 }
+[dir='rtl'] .notice .zoom-to .icon {
+    margin-left: 10px;
+    margin-right: 0;
+}
+
 
 /* Tooltips
 ------------------------------------------------------- */
-
 .tooltip {
     position: absolute;
     display: none;
-    color:#333;
-    text-align: left;
+    color: #333;
     font-size: 12px;
 }
 
 .tooltip.in {
-    opacity: 0.8;
+    opacity: 0.9;
     z-index: 1030;
     height: auto;
     display: block;
@@ -4516,6 +6824,7 @@ div.full-screen > button:hover {
 
 .tooltip.right {
     margin-left: 20px;
+    text-align: left;
 }
 
 .tooltip.bottom {
@@ -4535,7 +6844,7 @@ div.full-screen > button:hover {
     min-width: 80px;
     padding: 10px;
     font-weight: normal;
-    background-color: white;
+    background-color: #fff;
 }
 
 .tail {
@@ -4558,14 +6867,14 @@ div.full-screen > button:hover {
     top: 50%;
     right: -5px;
     margin-top: -5px;
-    border-left-color: white;
+    border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }
 
 .tail div {
     border-radius: 3px;
     padding: 10px;
-    background: white;
+    background: #fff;
     position: absolute;
     top: 180px;
     left: 0;
@@ -4583,7 +6892,7 @@ div.full-screen > button:hover {
     top: 50%;
     left: -5px;
     margin-top: -5px;
-    border-right-color: white;
+    border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
 
@@ -4599,7 +6908,7 @@ div.full-screen > button:hover {
     bottom: -5px;
     left: 50%;
     margin-left: -5px;
-    border-top-color: white;
+    border-top-color: #fff;
     border-width: 5px 5px 0;
 }
 
@@ -4607,7 +6916,7 @@ div.full-screen > button:hover {
     top: 50%;
     left: -5px;
     margin-top: -5px;
-    border-right-color: white;
+    border-right-color: #fff;
     border-width: 5px 5px 5px 0;
 }
 
@@ -4615,7 +6924,7 @@ div.full-screen > button:hover {
     top: 50%;
     right: -5px;
     margin-top: -5px;
-    border-left-color: white;
+    border-left-color: #fff;
     border-width: 5px 0 5px 5px;
 }
 
@@ -4623,50 +6932,61 @@ div.full-screen > button:hover {
     top: -5px;
     left: 50%;
     margin-left: -5px;
-    border-bottom-color: white;
+    border-bottom-color: #fff;
     border-width: 0 5px 5px;
 }
 
+.tooltip-heading {
+    font-weight: bold;
+    background: #F6F6F6;
+    padding: 10px;
+    margin: -10px -10px 10px -10px;
+    border-radius: 3px 3px 0 0;
+    font-size: 14px;
+}
+
 .keyhint-wrap {
     background: #F6F6F6;
     padding: 10px;
-    margin: 10px -10px -10px;
+    margin: 10px -10px -10px -10px;
     border-radius: 0 0 3px 3px;
 }
 
 .tooltip-inner .keyhint {
     font-weight: bold;
+    margin-left: 5px;
 }
 
 /* Exceptions for tooltip layouts */
 
 /* make tooltips in panels dark */
-.map-overlay .tooltip.top .tooltip-arrow,
+.map-pane .tooltip.top .tooltip-arrow,
 .entity-editor-pane .tooltip.top .tooltip-arrow,
 .warning-section .tooltip.top .tooltip-arrow {
     border-top-color: #000;
 }
 
-.map-overlay .tooltip.bottom .tooltip-arrow,
+.map-pane .tooltip.bottom .tooltip-arrow,
 .entity-editor-pane .tooltip.bottom .tooltip-arrow,
 .warning-section .tooltip.bottom .tooltip-arrow {
     border-bottom-color: #000;
 }
 
-.map-overlay .tooltip.left .tooltip-arrow,
+.map-pane .tooltip.left .tooltip-arrow,
 .entity-editor-pane .tooltip.left .tooltip-arrow,
 .warning-section .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
 
-.map-overlay .tooltip.right .tooltip-arrow,
+.map-pane .tooltip.right .tooltip-arrow,
 .entity-editor-pane .tooltip.right .tooltip-arrow,
 .warning-section .tooltip.right .tooltip-arrow {
     border-right-color: #000;
 }
 
-.map-overlay .tooltip-inner,
-.map-overlay .keyhint-wrap,
+.map-pane .tooltip-inner,
+.map-pane .tooltip-heading,
+.map-pane .keyhint-wrap,
 .entity-editor-pane .tooltip-inner,
 .warning-section .tooltip-inner {
     background: #000;
@@ -4681,16 +7001,50 @@ div.full-screen > button:hover {
 .map-control .tooltip {
     min-width: 160px;
 }
+.map-control .shortcuts .tooltip {
+    max-width: 160px;
+}
+
 /* Move over tooltips that are near the edge of screen */
 .add-point .tooltip {
     left: 33.3333% !important;
 }
+[dir='rtl'] .add-point .tooltip {
+    left: inherit !important;
+}
 
-.curtain-tooltip.intro-points-add .tooltip-arrow,
 .add-point .tooltip .tooltip-arrow {
     left: 60px;
 }
+[dir='rtl'] .add-point .tooltip .tooltip-arrow {
+    left: auto;
+    right: 60px;
+}
+
+li:first-of-type .badge .tooltip,
+li.hide + li.version .badge .tooltip {
+    left: auto !important;
+    right: 5px !important;
+}
+[dir='rtl'] li:first-of-type .badge .tooltip,
+[dir='rtl'] li.hide + li.version .badge .tooltip {
+    left: 5px !important;
+    right: auto !important;
+}
+li:first-of-type .badge .tooltip .tooltip-arrow,
+li.hide + li.version .badge .tooltip .tooltip-arrow {
+    right: 15px !important;
+    left: auto !important;
+}
+[dir='rtl'] li:first-of-type .badge .tooltip .tooltip-arrow,
+[dir='rtl'] li.hide + li.version .badge .tooltip .tooltip-arrow {
+    left: 15px !important;
+    right: auto !important;
+}
+
 
+/* Contextual Radial Menu (deprecated)
+------------------------------------------------------- */
 .radial-menu-tooltip {
     opacity: 0.8;
     display: none;
@@ -4728,30 +7082,71 @@ div.full-screen > button:hover {
     color: rgba(40,40,40,.5);
 }
 
+
+/* Contextual Edit Menu
+------------------------------------------------------- */
+.edit-menu-tooltip {
+    display: none;
+    position: absolute;
+    width: 200px;
+}
+
+.edit-menu-background {
+    fill: #eee;
+}
+
+.edit-menu-item rect {
+    fill: #eee;
+    cursor: default;
+}
+
+.edit-menu-item rect:active,
+.edit-menu-item rect:hover {
+    fill: #ccc;
+}
+
+.edit-menu-item.disabled rect {
+    cursor: not-allowed;
+}
+.edit-menu-item.disabled rect:hover {
+    cursor: not-allowed;
+    fill: #eee;
+}
+
+.edit-menu-item use {
+    fill: #222;
+    color: #79f;
+    pointer-events: none;
+}
+.edit-menu-item.disabled use {
+    fill: rgba(32,32,32,.2);
+    color: rgba(40,40,40,.2);
+}
+
+
+/* Lasso
+------------------------------------------------------- */
 .lasso-path {
-    fill-opacity:0.3;
+    fill-opacity: 0.3;
     stroke: #fff;
     stroke-width: 1;
     stroke-opacity: 1;
     stroke-dasharray: 5, 5;
 }
 
+
 /* Media Queries
 ------------------------------------------------------- */
-
 @media only screen and (max-width: 840px) {
     /* override hide for save button */
     #bar .save .label { display: block;}
 }
-
 @media screen and (max-width: 1200px) {
     .user-list { display: none !important; }
 }
-
 @media screen and (max-width: 1000px) {
     #userLink { display: none !important; }
 }
-
 @media screen and (max-width: 900px) {
     #scale-block { display: none !important; }
 }
@@ -4759,12 +7154,11 @@ div.full-screen > button:hover {
 
 /* Scrollbars
  ----------------------------------------------------- */
-
 ::-webkit-scrollbar {
     height: 20px;
     overflow: visible;
     width: 10px;
-    background: white;
+    background: #fff;
     border-left: 1px solid #DDD;
 }
 
@@ -4786,9 +7180,9 @@ div.full-screen > button:hover {
     background-color: rgba(0,0,0,.05);
 }
 
+
 /* Intro walkthrough
  ----------------------------------------------------- */
-
 .curtain-darkness {
     pointer-events: all;
     fill-opacity: 0.7;
@@ -4797,6 +7191,8 @@ div.full-screen > button:hover {
 }
 
 .intro-nav-wrap {
+    display: flex;
+    flex-direction: row;
     position: absolute;
     left: 0;
     right: 0;
@@ -4805,71 +7201,136 @@ div.full-screen > button:hover {
     z-index: 1001;
 }
 
-.intro-nav-wrap button.step {
-    width: 20%;
+.intro-nav-wrap .intro-nav-wrap-logo {
+    flex: 0 0 auto;
+    height: 40px;
+    width: 40px;
+    color: #fff;
+    margin: 0px 20px;
+    vertical-align: middle;
+}
+
+.intro-nav-wrap .joined {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: row;
 }
 
-.intro-nav-wrap button.step.finished {
+.intro-nav-wrap button.chapter {
+    flex: 1 1 100%;
+    padding: 0px 20px;
+}
+
+.intro-nav-wrap button.chapter.next {
+    animation-duration: 1s;
+    animation-name: pulse;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+@keyframes pulse {
+    from  { background: #7092ff; }
+    to    { background: #c6d4ff; }
+}
+
+.intro-nav-wrap button.chapter.finished {
     background: #8cd05f;
 }
 
-.intro-nav-wrap button.step .icon {
+.intro-nav-wrap button.chapter .status {
     display: none;
 }
 
-.intro-nav-wrap button.step.finished .icon {
+.intro-nav-wrap button.chapter.finished .status {
     display: inline-block;
 }
 
-
-.curtain-tooltip .tooltip-inner {
+.curtain-tooltip.tooltip.in {
+    opacity: 1;
+}
+.curtain-tooltip.tooltip {
     text-align: left;
-    padding: 20px;
+}
+[dir='rtl'] .curtain-tooltip.tooltip {
+    text-align: right;
 }
 
 .curtain-tooltip .tooltip-inner {
     font-size: 15px;
+    position: relative;
+    padding: 20px;
 }
 
-.curtain-tooltip .tooltip-inner .bold {
+.curtain-tooltip .tooltip-inner .button-section,
+.curtain-tooltip .tooltip-inner .instruction {
     font-weight: bold;
     display: block;
-    border-top: 1px solid #CCC;
+    border-top: 1px solid #ccc;
     margin-top: 10px;
     margin-left: -20px;
     margin-right: -20px;
     padding: 10px 20px 0 20px;
 }
 
-.curtain-tooltip .tooltip-inner .bold:only-child {
+[dir='rtl'] .curtain-tooltip .tooltip-inner .button-section button.col8 {
+    float: right;
+}
+
+.curtain-tooltip .tooltip-inner .instruction:only-child {
     border: 0;
     padding: 0;
     margin: 0;
 }
 
-.curtain-tooltip.intro-points-describe {
-    top: 133px !important;
+.curtain-tooltip .tooltip-inner .icon.pre-text {
+    vertical-align: text-top;
+    margin-right: 0;
+    margin-left: 0;
+    display: inline-block;
 }
 
-/* Tooltip illustrations */
+.curtain-tooltip.intro-points-describe ,
+.curtain-tooltip.intro-lines-name_road {
+    top: 133px !important;
+}
 
-.intro-points-add .tooltip-inner::before,
-.intro-areas-add .tooltip-inner::before,
-.intro-lines-add .tooltip-inner::before {
-    margin-left: -20px;
-    display: block;
-    content: "";
+.tooltip-illustration {
     height: 80px;
     width: 200px;
-    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat 0 -320px;
+    margin-left: -20px;
+    margin-top: -10px;
+}
+[dir='rtl'] .tooltip-illustration {
+    margin-left: auto;
+    margin-right: -20px;
+}
+
+.curtain-tooltip.intro-mouse {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
 }
 
-.intro-areas-add .tooltip-inner::before {
-    background-position: 0 -400px;
+.curtain-tooltip.intro-mouse .counter {
+    position: absolute;
+    display: block;
+    top: 50px;
+    width: 100%;
+    text-align: center;
+    font-weight: bold;
+    font-size: 14px;
+    z-index: 1003;
 }
 
-.intro-lines-add .tooltip-inner::before {
-    background-position: 0 -480px;
+.curtain-tooltip.intro-mouse .tooltip-illustration use {
+    fill: rgba(112, 146, 255, 0);
+    color: rgba(112, 146, 255, 0);
+}
+.curtain-tooltip.intro-mouse.leftclick .tooltip-illustration use {
+    fill: rgba(112, 146, 255, 1);
+}
+.curtain-tooltip.intro-mouse.rightclick .tooltip-illustration use {
+    color: rgba(112, 146, 255, 1);
 }
 
 .huge-modal-button {
@@ -4881,6 +7342,7 @@ div.full-screen > button:hover {
 .huge-modal-button .illustration {
     height: 100px;
     width: 100px;
-    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px;
-    margin: auto;
+    color: #7092ff;
 }
+
+