Merge remote-tracking branch 'openstreetmap/pull/1437'

[rails.git] / vendor / assets / iD / iD.css.erb
diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb

index 3f733c3b4dd0cc0411f2bcd4777c1c74fb23191d..cce5fb89a267a65c14e11e9fdfad9cbdd0f6f077 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -161,37 +161,18 @@ input::-moz-focus-inner {
  .cf:after {
      clear: both;
  }
  .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;
-}
-
-img.tile-loaded {
-    opacity: 1;
-}
-img.tile-removing {
-    opacity: 0;
-}
+use { pointer-events: none; }
  
  /* base styles */
  
  /* base styles */
-path {
-    fill: none;
-}
+.layer-osm path:not(.oneway) { fill: none; }     /* IE needs :not(.oneway) */
  
  
-use {
-    pointer-events: none;
-}
+/* the above fill: none rule affects paths in <use> shadow dom only in Firefox */
+.layer-osm use.icon path { fill: #333; }                       /* FF svg Maki icons */
+.layer-osm .turn use path { fill: #000; }                      /* FF turn restriction icons */
+#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; }  /* FF turn-only, turn-only-u */
+#turn-no-shape2, #turn-no-u-shape2     { fill: #E06D5F; }  /* FF turn-no, turn-no-u */
+#turn-yes-shape2, #turn-yes-u-shape2   { fill: #8CD05F; }  /* FF turn-yes, turn-yes-u */
  
  g.point .shadow,
  g.vertex .shadow,
  
  g.point .shadow,
  g.vertex .shadow,
@@ -203,12 +184,6 @@ path.shadow {
      pointer-events: stroke;
  }
  
      pointer-events: stroke;
  }
  
-.shadow {
-    -webkit-transition: 200ms;
-       -moz-transition: 200ms;
-            transition: 200ms;
-}
-
  /* points */
  
  g.point .stroke {
  /* points */
  
  g.point .stroke {
@@ -224,6 +199,7 @@ g.point .shadow {
      stroke-opacity: 0;
  }
  
      stroke-opacity: 0;
  }
  
+g.point.related:not(.selected) .shadow,
  g.point.hover:not(.selected) .shadow {
      stroke-opacity: 0.5;
  }
  g.point.hover:not(.selected) .shadow {
      stroke-opacity: 0.5;
  }
@@ -259,18 +235,6 @@ g.midpoint .fill {
      opacity: .7;
  }
  
      opacity: .7;
  }
  
-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 {
      fill: #f6634f;
  g.vertex .shadow,
  g.midpoint .shadow {
      fill: #f6634f;
@@ -290,13 +254,15 @@ g.vertex.vertex-hover {
      display: block;
  }
  
      display: block;
  }
  
+g.vertex.related:not(.selected) .shadow,
  g.vertex.hover:not(.selected) .shadow,
  g.vertex.hover:not(.selected) .shadow,
+g.midpoint.related:not(.selected) .shadow,
  g.midpoint.hover:not(.selected) .shadow {
  g.midpoint.hover:not(.selected) .shadow {
-    fill-opacity: 0.3;
+    fill-opacity: 0.5;
  }
  
  g.vertex.selected .shadow {
  }
  
  g.vertex.selected .shadow {
-    fill-opacity: 0.5;
+    fill-opacity: 0.7;
  }
  
  .mode-draw-area g.midpoint,
  }
  
  .mode-draw-area g.midpoint,
@@ -309,13 +275,18 @@ g.vertex.selected .shadow {
  
  /* lines */
  
  
  /* lines */
  
+.preset-icon .icon.other-line {
+    color: #fff;
+    fill: #777;
+}
+
  path.line {
      stroke-linecap: round;
      stroke-linejoin: bevel;
  }
  
  path.stroke {
  path.line {
      stroke-linecap: round;
      stroke-linejoin: bevel;
  }
  
  path.stroke {
-    stroke: black;
+    stroke: #000;
      stroke-width: 4;
  }
  
      stroke-width: 4;
  }
  
@@ -325,8 +296,9 @@ path.shadow {
      stroke-opacity: 0;
  }
  
      stroke-opacity: 0;
  }
  
+path.shadow.related:not(.selected),
  path.shadow.hover:not(.selected) {
  path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.3;
+    stroke-opacity: 0.4;
  }
  
  path.shadow.selected {
  }
  
  path.shadow.selected {
@@ -334,12 +306,117 @@ path.shadow.selected {
  }
  
  path.line.stroke {
  }
  
  path.line.stroke {
-    stroke: white;
+    stroke: #fff;
      stroke-width: 2;
  }
  
      stroke-width: 2;
  }
  
+
+/* Labels / Markers */
+
+text {
+    font-size:10px;
+    pointer-events: none;
+    color: #222;
+    opacity: 1;
+}
+
+.oneway .textpath.tag-waterway {
+    fill: #002F35;
+}
+
+path.oneway {
+    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;
+    pointer-events: none;
+    -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-halo text {
+    opacity: 0.7;
+    stroke: #fff;
+    stroke-width: 5px;
+    stroke-miterlimit: 1;
+}
+
+text.proximate {
+    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;
+}
+
+
+/* Turns */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    pointer-events: none;
+    cursor: auto !important;
+}
+
+.lasso #map {
+    pointer-events: visibleStroke;
+}
+
+/* GPX Paths */
+
+.layer-gpx {
+    pointer-events: none;
+}
+
+path.gpx {
+    stroke: #FF26D4;
+    stroke-width: 2;
+    fill: none;
+}
+
+text.gpx {
+    fill: #FF26D4;
+}
+
  path.area.stroke {
  path.area.stroke {
-    stroke: white;
+    stroke: #fff;
      stroke-width: 1;
  }
  path.area.fill {
      stroke-width: 1;
  }
  path.area.fill {
@@ -398,17 +475,26 @@ path.fill.tag-leisure-park {
      background-color: rgba(140, 208, 95, 0.3);
  }
  
      background-color: rgba(140, 208, 95, 0.3);
  }
  
+path.stroke.tag-amenity-swimming_pool,
+path.stroke.tag-leisure-swimming_pool,
  path.stroke.tag-natural-water,
  path.stroke.tag-natural-water,
+path.stroke.tag-landuse-aquaculture,
  path.stroke.tag-landuse-basin,
  path.stroke.tag-landuse-reservoir {
      stroke: rgb(119, 211, 222);
  }
  path.stroke.tag-landuse-basin,
  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-reservoir,
  path.fill.tag-natural-water {
      stroke: rgba(119, 211, 222, 0.3);
      fill: rgba(119, 211, 222, 0.3);
  }
  path.fill.tag-landuse-basin,
  path.fill.tag-landuse-reservoir,
  path.fill.tag-natural-water {
      stroke: rgba(119, 211, 222, 0.3);
      fill: rgba(119, 211, 222, 0.3);
  }
+.preset-icon-fill-area.tag-amenity-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-reservoir,
  .preset-icon-fill-area.tag-natural-water {
  .preset-icon-fill-area.tag-landuse-basin,
  .preset-icon-fill-area.tag-landuse-reservoir,
  .preset-icon-fill-area.tag-natural-water {
@@ -436,7 +522,7 @@ path.fill.tag-amenity-university {
  .preset-icon-fill-area.tag-amenity-school,
  .preset-icon-fill-area.tag-amenity-college,
  .preset-icon-fill-area.tag-amenity-university {
  .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);
  }
  
      background-color: rgba(255, 255, 148, 0.15);
  }
  
@@ -449,8 +535,7 @@ path.fill.tag-landuse-residential {
  }
  .preset-icon-fill-area.tag-landuse-residential {
      border-color: rgb(196, 189, 25);
  }
  .preset-icon-fill-area.tag-landuse-residential {
      border-color: rgb(196, 189, 25);
-    background: none;
-    box-shadow: inset 0 0 0 5px rgba(196, 189, 25, 0.3);
+    background: rgba(196, 189, 25, 0.3);
  }
  
  path.stroke.tag-landuse-retail,
  }
  
  path.stroke.tag-landuse-retail,
@@ -465,30 +550,37 @@ path.fill.tag-landuse-commercial {
  .preset-icon-fill-area.tag-landuse-retail,
  .preset-icon-fill-area.tag-landuse-commercial {
      border-color: rgb(214, 136, 26);
  .preset-icon-fill-area.tag-landuse-retail,
  .preset-icon-fill-area.tag-landuse-commercial {
      border-color: rgb(214, 136, 26);
-    background: none;
-    box-shadow: inset 0 0 0 5px rgba(214, 136, 26, 0.3);
+    background-color: rgba(214, 136, 26, 0.3);
  }
  
  }
  
-path.stroke.tag-landuse-industrial {
+path.stroke.tag-landuse-industrial,
+path.stroke.tag-power-plant {
      stroke: rgb(228, 164, 245);
  }
      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);
  }
      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);
      border-color: rgb(228, 164, 245);
-    background: none;
-    box-shadow: inset 0 0 0 5px rgba(228, 164, 245, 0.3);
+    background-color: rgba(228, 164, 245, 0.3);
  }
  
  }
  
+path.stroke.tag-natural-bare_rock,
+path.stroke.tag-natural-scree,
  path.stroke.tag-landuse-quarry {
      stroke: rgb(166, 149, 123);
  }
  path.stroke.tag-landuse-quarry {
      stroke: rgb(166, 149, 123);
  }
+path.fill.tag-natural-bare_rock,
+path.fill.tag-natural-scree,
  path.fill.tag-landuse-quarry {
      stroke: rgba(166, 149, 123, 0.2);
      fill: rgba(166, 149, 123, 0.2);
  }
  path.fill.tag-landuse-quarry {
      stroke: rgba(166, 149, 123, 0.2);
      fill: rgba(166, 149, 123, 0.2);
  }
+.preset-icon-fill-area.tag-natural-bare_rock,
+.preset-icon-fill-area.tag-natural-scree,
  .preset-icon-fill-area.tag-landuse-quarry {
      border-color: rgb(166, 149, 123);
      background-color: 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);
@@ -509,21 +601,26 @@ path.fill.tag-landuse-landfill {
  .pattern-color-construction {
      fill: rgba(196, 189, 25, 0.2);
  }
  .pattern-color-construction {
      fill: rgba(196, 189, 25, 0.2);
  }
+path.stroke.tag-landuse.tag-status,
  path.stroke.tag-landuse-construction {
      stroke: rgb(196, 189, 25);
  }
  path.stroke.tag-landuse-construction {
      stroke: rgb(196, 189, 25);
  }
+.preset-icon-fill-area.tag-landuse.tag-status,
  .preset-icon-fill-area.tag-landuse-construction {
      border-color: rgb(196, 189, 25);
      background-color: rgba(196, 189, 25, 0.2);
  }
  
  .preset-icon-fill-area.tag-landuse-construction {
      border-color: rgb(196, 189, 25);
      background-color: rgba(196, 189, 25, 0.2);
  }
  
+path.stroke.tag-military,
  path.stroke.tag-landuse-military {
      stroke: rgb(214, 136, 26);
  }
  path.stroke.tag-landuse-military {
      stroke: rgb(214, 136, 26);
  }
+path.fill.tag-military,
  path.fill.tag-landuse-military {
      stroke: rgba(214, 136, 26, 0.2);
      fill: rgba(214, 136, 26, 0.2);
  }
  path.fill.tag-landuse-military {
      stroke: rgba(214, 136, 26, 0.2);
      fill: rgba(214, 136, 26, 0.2);
  }
+.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.2);
  .preset-icon-fill-area.tag-landuse-military {
      border-color: rgb(214, 136, 26);
      background-color: rgba(214, 136, 26, 0.2);
@@ -551,13 +648,16 @@ path.stroke.tag-landuse-meadow {
      background-color: rgba(182, 225, 153, 0.2);
  }
  
      background-color: rgba(182, 225, 153, 0.2);
  }
  
-.pattern-color-beach {
+.pattern-color-beach,
+.pattern-color-sand {
      fill: rgba(255, 255, 126, 0.2);
  }
      fill: rgba(255, 255, 126, 0.2);
  }
-path.stroke.tag-natural-beach {
+path.stroke.tag-natural-beach,
+path.stroke.tag-natural-sand {
      stroke: rgb(255, 255, 126);
  }
      stroke: rgb(255, 255, 126);
  }
-.preset-icon-fill-area.tag-natural-beach {
+.preset-icon-fill-area.tag-natural-beach,
+.preset-icon-fill-area.tag-natural-sand {
      border-color: rgb(255, 255, 126);
      background-color: rgba(255, 255, 126, 0.2);
  }
      border-color: rgb(255, 255, 126);
      background-color: rgba(255, 255, 126, 0.2);
  }
@@ -586,6 +686,18 @@ path.stroke.tag-landuse-farmland {
      background-color: rgba(140, 208, 95, 0.2);
  }
  
      background-color: rgba(140, 208, 95, 0.2);
  }
  
+path.stroke.tag-landuse-farmyard {
+    stroke: rgb(245, 220, 186);
+}
+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-farmyard {
+    border-color: rgb(245, 220, 186);
+    background: rgba(245, 220, 186, 0.3);
+}
+
  .pattern-color-cemetery,
  .pattern-color-orchard {
      fill: rgba(140, 208, 95, 0.2);
  .pattern-color-cemetery,
  .pattern-color-orchard {
      fill: rgba(140, 208, 95, 0.2);
@@ -611,12 +723,21 @@ path.fill.tag-amenity-parking {
      background-color: rgba(170, 170, 170, 0.3);
  }
  
      background-color: rgba(170, 170, 170, 0.3);
  }
  
-path.fill.tag-place,
-path.fill.tag-boundary {
-    fill: none;
+/* highways */
+
+/* highway areas */
+path.stroke.area.tag-highway {
+    stroke:#fff;
+    stroke-dasharray: none;
+    stroke-width: 2;
  }
  
  }
  
-/* highways */
+/* wide highways */
+
+.preset-icon .icon.tag-highway.other-line {
+    color: #fff;
+    fill: #777;
+}
  
  path.shadow.tag-highway {
      stroke-width:16;
  
  path.shadow.tag-highway {
      stroke-width:16;
@@ -640,199 +761,516 @@ path.stroke.tag-highway {
      stroke-width:4;
  }
  
      stroke-width:4;
  }
  
+.preset-icon .icon.highway-motorway,
+.preset-icon .icon.highway-motorway-link {
+    color: #CF2081;
+    fill: #70372f;
+}
  path.stroke.tag-highway-motorway,
  path.stroke.tag-highway-motorway_link,
  path.stroke.tag-highway-motorway,
  path.stroke.tag-highway-motorway_link,
-path.stroke.tag-construction-motorway {
-    stroke:#58a9ed;
+path.stroke.tag-motorway {
+    stroke:#CF2081;
  }
  }
-
  path.casing.tag-highway-motorway,
  path.casing.tag-highway-motorway_link,
  path.casing.tag-highway-motorway,
  path.casing.tag-highway-motorway_link,
-path.casing.tag-construction-motorway {
-    stroke:#2c5476;
+path.casing.tag-motorway {
+    stroke:#70372f;
  }
  
  }
  
+.preset-icon .icon.highway-trunk,
+.preset-icon .icon.highway-trunk-link {
+    color: #DD2F22;
+    fill: #70372f;
+}
  path.stroke.tag-highway-trunk,
  path.stroke.tag-highway-trunk_link,
  path.stroke.tag-highway-trunk,
  path.stroke.tag-highway-trunk_link,
-path.stroke.tag-construction-trunk {
-    stroke:#8cd05f;
+path.stroke.tag-trunk {
+    stroke:#DD2F22;
  }
  path.casing.tag-highway-trunk,
  path.casing.tag-highway-trunk_link,
  }
  path.casing.tag-highway-trunk,
  path.casing.tag-highway-trunk_link,
-path.casing.tag-construction-trunk {
-    stroke:#46682f;
+path.casing.tag-trunk {
+    stroke:#70372f;
  }
  
  }
  
+.preset-icon .icon.highway-primary,
+.preset-icon .icon.highway-primary-link {
+    color: #F99806;
+    fill: #70372f;
+}
  path.stroke.tag-highway-primary,
  path.stroke.tag-highway-primary_link,
  path.stroke.tag-highway-primary,
  path.stroke.tag-highway-primary_link,
-path.stroke.tag-construction-primary {
-    stroke:#e06d5f;
+path.stroke.tag-primary {
+    stroke:#F99806;
  }
  path.casing.tag-highway-primary,
  path.casing.tag-highway-primary_link,
  }
  path.casing.tag-highway-primary,
  path.casing.tag-highway-primary_link,
-path.casing.tag-construction-primary {
+path.casing.tag-primary {
      stroke:#70372f;
  }
  
      stroke:#70372f;
  }
  
+.preset-icon .icon.highway-secondary,
+.preset-icon .icon.highway-secondary-link {
+    color: #F3F312;
+    fill: #70372f;
+}
  path.stroke.tag-highway-secondary,
  path.stroke.tag-highway-secondary_link,
  path.stroke.tag-highway-secondary,
  path.stroke.tag-highway-secondary_link,
-path.stroke.tag-construction-secondary {
-    stroke:#eab056;
+path.stroke.tag-secondary {
+    stroke:#F3F312;
  }
  path.casing.tag-highway-secondary,
  path.casing.tag-highway-secondary_link,
  }
  path.casing.tag-highway-secondary,
  path.casing.tag-highway-secondary_link,
-path.casing.tag-construction-secondary {
-    stroke:#75582b;
+path.casing.tag-secondary {
+    stroke:#70372f;
  }
  
  }
  
+.preset-icon .icon.highway-tertiary,
+.preset-icon .icon.highway-tertiary-link {
+    color: #FFF9B3;
+    fill: #70372f;
+}
  path.stroke.tag-highway-tertiary,
  path.stroke.tag-highway-tertiary_link,
  path.stroke.tag-highway-tertiary,
  path.stroke.tag-highway-tertiary_link,
-path.stroke.tag-construction-tertiary {
-    stroke:#ffff7e;
+path.stroke.tag-tertiary {
+    stroke:#FFF9B3;
  }
  path.casing.tag-highway-tertiary,
  path.casing.tag-highway-tertiary_link,
  }
  path.casing.tag-highway-tertiary,
  path.casing.tag-highway-tertiary_link,
-path.casing.tag-construction-tertiary {
-    stroke:#7f7f3f;
+path.casing.tag-tertiary {
+    stroke:#70372f;
  }
  
  }
  
-path.stroke.tag-highway-unclassified,
-path.stroke.tag-construction-unclassified {
-    stroke:#eaeaea;
+.legacy-carto .preset-icon .icon.highway-motorway,
+.legacy-carto .preset-icon .icon.highway-motorway-link {
+    color: #58a9ed;
+    fill: #2c5476;
  }
  }
-path.casing.tag-highway-unclassified,
-path.casing.tag-construction-unclassified {
-    stroke:#444;
+.legacy-carto path.stroke.tag-highway-motorway,
+.legacy-carto path.stroke.tag-highway-motorway_link,
+.legacy-carto path.stroke.tag-motorway {
+    stroke:#58a9ed;
+}
+.legacy-carto path.casing.tag-highway-motorway,
+.legacy-carto path.casing.tag-highway-motorway_link,
+.legacy-carto path.casing.tag-motorway {
+    stroke:#2c5476;
+}
+
+.legacy-carto .preset-icon .icon.highway-trunk,
+.legacy-carto .preset-icon .icon.highway-trunk-link {
+    color: #8cd05f;
+    fill: #46682f;
+}
+.legacy-carto path.stroke.tag-highway-trunk,
+.legacy-carto path.stroke.tag-highway-trunk_link,
+.legacy-carto path.stroke.tag-trunk {
+    stroke:#8cd05f;
+}
+.legacy-carto path.casing.tag-highway-trunk,
+.legacy-carto path.casing.tag-highway-trunk_link,
+.legacy-carto path.casing.tag-trunk {
+    stroke:#46682f;
+}
+
+.legacy-carto .preset-icon .icon.highway-primary,
+.legacy-carto .preset-icon .icon.highway-primary-link {
+    color: #e06d5f;
+    fill: #70372f;
+}
+.legacy-carto path.stroke.tag-highway-primary,
+.legacy-carto path.stroke.tag-highway-primary_link,
+.legacy-carto path.stroke.tag-primary {
+    stroke:#e06d5f;
+}
+.legacy-carto path.casing.tag-highway-primary,
+.legacy-carto path.casing.tag-highway-primary_link,
+.legacy-carto path.casing.tag-primary {
+    stroke:#70372f;
+}
+
+.legacy-carto .preset-icon .icon.highway-secondary,
+.legacy-carto .preset-icon .icon.highway-secondary-link {
+    color: #eab056;
+    fill: #75582b;
+}
+.legacy-carto path.stroke.tag-highway-secondary,
+.legacy-carto path.stroke.tag-highway-secondary_link,
+.legacy-carto path.stroke.tag-secondary {
+    stroke:#eab056;
+}
+.legacy-carto path.casing.tag-highway-secondary,
+.legacy-carto path.casing.tag-highway-secondary_link,
+.legacy-carto path.casing.tag-secondary {
+    stroke:#75582b;
+}
+
+.legacy-carto .preset-icon .icon.highway-tertiary,
+.legacy-carto .preset-icon .icon.highway-tertiary-link {
+    color: #ffff7e;
+    fill: #7f7f3f;
+}
+.legacy-carto path.stroke.tag-highway-tertiary,
+.legacy-carto path.stroke.tag-highway-tertiary_link,
+.legacy-carto path.stroke.tag-tertiary {
+    stroke:#ffff7e;
+}
+.legacy-carto path.casing.tag-highway-tertiary,
+.legacy-carto path.casing.tag-highway-tertiary_link,
+.legacy-carto path.casing.tag-tertiary {
+    stroke:#7f7f3f;
  }
  
  }
  
+.preset-icon .icon.highway-residential {
+    color: #fff;
+    fill: #444;
+}
  path.stroke.tag-highway-residential,
  path.stroke.tag-highway-residential,
-path.stroke.tag-construction-residential {
+path.stroke.tag-residential {
      stroke:#fff;
  }
  path.casing.tag-highway-residential,
      stroke:#fff;
  }
  path.casing.tag-highway-residential,
-path.casing.tag-construction-residential {
+path.casing.tag-residential {
      stroke:#444;
  }
  
      stroke:#444;
  }
  
-path.stroke.tag-highway-living_street {
-    stroke:#ccc;
+.preset-icon .icon.highway-unclassified {
+    color: #dcd9b9;
+    fill: #444;
+}
+path.stroke.tag-highway-unclassified,
+path.stroke.tag-unclassified {
+    stroke:#dcd9b9;
+}
+path.casing.tag-highway-unclassified,
+path.casing.tag-unclassified {
+    stroke:#444;
+}
+
+
+/* narrow highways */
+path.stroke.tag-highway-living_street,
+path.stroke.tag-highway-service,
+path.stroke.tag-highway-track,
+path.stroke.tag-highway-path,
+path.stroke.tag-highway-footway,
+path.stroke.tag-highway-cycleway,
+path.stroke.tag-highway-bridleway,
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-highway-steps,
+path.stroke.tag-highway-road,
+path.stroke.tag-living_street,
+path.stroke.tag-service,
+path.stroke.tag-track,
+path.stroke.tag-path,
+path.stroke.tag-footway,
+path.stroke.tag-cycleway,
+path.stroke.tag-bridleway,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian,
+path.stroke.tag-steps,
+path.stroke.tag-road {
      stroke-width:4;
  }
      stroke-width:4;
  }
-path.casing.tag-highway-living_street {
-    stroke:#fff;
+path.casing.tag-highway-living_street,
+path.casing.tag-highway-service,
+path.casing.tag-highway-track,
+path.casing.tag-highway-path,
+path.casing.tag-highway-footway,
+path.casing.tag-highway-cycleway,
+path.casing.tag-highway-bridleway,
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-highway-steps,
+path.casing.tag-highway-road,
+path.casing.tag-living_street,
+path.casing.tag-service,
+path.casing.tag-track,
+path.casing.tag-path,
+path.casing.tag-footway,
+path.casing.tag-cycleway,
+path.casing.tag-bridleway,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian,
+path.casing.tag-steps,
+path.casing.tag-road {
      stroke-width:6;
  }
  
      stroke-width:6;
  }
  
-path.stroke.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-dasharray: 2, 8;
+.low-zoom path.stroke.tag-highway-living_street,
+.low-zoom path.stroke.tag-highway-service,
+.low-zoom path.stroke.tag-highway-track,
+.low-zoom path.stroke.tag-highway-path,
+.low-zoom path.stroke.tag-highway-footway,
+.low-zoom path.stroke.tag-highway-cycleway,
+.low-zoom path.stroke.tag-highway-bridleway,
+.low-zoom path.stroke.tag-highway-corridor,
+.low-zoom path.stroke.tag-highway-pedestrian,
+.low-zoom path.stroke.tag-highway-steps,
+.low-zoom path.stroke.tag-highway-road,
+.low-zoom path.stroke.tag-living_street,
+.low-zoom path.stroke.tag-service,
+.low-zoom path.stroke.tag-track,
+.low-zoom path.stroke.tag-path,
+.low-zoom path.stroke.tag-footway,
+.low-zoom path.stroke.tag-cycleway,
+.low-zoom path.stroke.tag-bridleway,
+.low-zoom path.stroke.tag-corridor,
+.low-zoom path.stroke.tag-pedestrian,
+.low-zoom path.stroke.tag-steps,
+.low-zoom path.stroke.tag-road {
+    stroke-width:2;
+}
+.low-zoom path.casing.tag-highway-living_street,
+.low-zoom path.casing.tag-highway-service,
+.low-zoom path.casing.tag-highway-track,
+.low-zoom path.casing.tag-highway-path,
+.low-zoom path.casing.tag-highway-footway,
+.low-zoom path.casing.tag-highway-cycleway,
+.low-zoom path.casing.tag-highway-bridleway,
+.low-zoom path.casing.tag-highway-corridor,
+.low-zoom path.casing.tag-highway-pedestrian,
+.low-zoom path.casing.tag-highway-steps,
+.low-zoom path.casing.tag-highway-road,
+.low-zoom path.casing.tag-living_street,
+.low-zoom path.casing.tag-service,
+.low-zoom path.casing.tag-track,
+.low-zoom path.casing.tag-path,
+.low-zoom path.casing.tag-footway,
+.low-zoom path.casing.tag-cycleway,
+.low-zoom path.casing.tag-bridleway,
+.low-zoom path.casing.tag-corridor,
+.low-zoom path.casing.tag-pedestrian,
+.low-zoom path.casing.tag-steps,
+.low-zoom path.casing.tag-road {
      stroke-width:4;
  }
      stroke-width:4;
  }
-path.casing.tag-highway-pedestrian {
-    stroke:#8cd05f;
-    stroke-width:6;
+
+.preset-icon .icon.highway-living-street {
+    color: #bbb;
+    fill: #ddd;
  }
  }
-path.stroke.area.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-dasharray: none;
-    stroke-width: 2;
+path.stroke.tag-highway-living_street,
+path.stroke.tag-living_street {
+    stroke: #ccc;
+}
+path.casing.tag-highway-living_street,
+path.casing.tag-living_street {
+    stroke: #fff;
  }
  
  }
  
-path.stroke.tag-highway-service {
+.preset-icon .icon.highway-footway.tag-highway-corridor,
+.preset-icon .icon.highway-footway.tag-highway-pedestrian {
+    color: #8cd05f;
+    fill: #fff;
+}
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian {
      stroke:#fff;
      stroke:#fff;
-    stroke-width:4;
+    stroke-dasharray: 2, 8;
  }
  }
-path.casing.tag-highway-service {
-    stroke:#666;
-    stroke-width:6;
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian,
+path.casing.tag-highway-corridor.tag-unpaved,
+path.casing.tag-highway-pedestrian.tag-unpaved,
+path.casing.tag-corridor.tag-unpaved,
+path.casing.tag-pedestrian.tag-unpaved {
+    stroke: #8cd05f;
+    stroke-linecap: round;
+    stroke-dasharray: none;
  }
  }
-.low-zoom path.stroke.tag-highway-service {
-    stroke-width:2;
+
+.preset-icon .icon.highway-road {
+    color: #9e9e9e;
+    fill: #666;
  }
  }
-.low-zoom path.casing.tag-highway-service {
-    stroke-width:4;
+path.stroke.tag-highway-road,
+path.stroke.tag-road {
+    stroke:#9e9e9e;
  }
  }
-
-path.stroke.tag-highway-track {
-    stroke: #fff;
-    stroke-width: 4;
+path.casing.tag-highway-road,
+path.casing.tag-road {
+    stroke:#666;
  }
  }
-path.casing.tag-highway-track {
-    stroke: #996600;
-    stroke-width: 6;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
+
+.preset-icon .icon.highway-service {
+    color: #fff;
+    fill: #666;
  }
  }
-.low-zoom path.stroke.tag-highway-track {
-    stroke-width:2;
+path.stroke.tag-highway-service,
+path.stroke.tag-service {
+    stroke:#fff;
  }
  }
-.low-zoom path.casing.tag-highway-track {
-    stroke-width:4;
+path.casing.tag-highway-service,
+path.casing.tag-service {
+    stroke:#666;
  }
  
  }
  
-path.stroke.tag-highway-path {
-    stroke: #000;
-    stroke-width: 1 !important;
-    stroke-linecap: butt;
-    stroke-dasharray: 8, 4;
+.preset-icon .icon.highway-track {
+    color: #eaeaea;
+    fill: #c5b59f;
  }
  }
-path.casing.tag-highway-path {
-    stroke-width: 1 !important;
-    stroke: #fff;
+path.stroke.tag-highway-track,
+path.stroke.tag-track {
+    stroke: #c5b59f;
+}
+path.casing.tag-highway-track,
+path.casing.tag-track {
+    stroke: #746f6f;
  }
  
  }
  
+path.stroke.tag-highway-path,
  path.stroke.tag-highway-footway,
  path.stroke.tag-highway-cycleway,
  path.stroke.tag-highway-bridleway {
  path.stroke.tag-highway-footway,
  path.stroke.tag-highway-cycleway,
  path.stroke.tag-highway-bridleway {
-    stroke-width: 4;
      stroke-linecap: butt;
      stroke-dasharray: 6, 6;
  }
      stroke-linecap: butt;
      stroke-dasharray: 6, 6;
  }
+
+path.casing.tag-highway-path,
+path.casing.tag-highway-path.tag-unpaved {
+    stroke: #c5b59f;
+    stroke-linecap: round;
+    stroke-dasharray: none;
+}
  path.casing.tag-highway-footway,
  path.casing.tag-highway-cycleway,
  path.casing.tag-highway-footway,
  path.casing.tag-highway-cycleway,
-path.casing.tag-highway-bridleway {
-    stroke-width: 6;
+path.casing.tag-highway-bridleway,
+path.casing.tag-highway-footway.tag-unpaved,
+path.casing.tag-highway-cycleway.tag-unpaved,
+path.casing.tag-highway-bridleway.tag-unpaved {
      stroke: #fff;
      stroke: #fff;
+    stroke-linecap: round;
+    stroke-dasharray: none;
  }
  
  }
  
-.low-zoom path.stroke.tag-highway-footway,
-.low-zoom path.stroke.tag-highway-cycleway,
-.low-zoom path.stroke.tag-highway-bridleway {
-    stroke-width: 2;
+.preset-icon .icon.category-path,
+.preset-icon .icon.highway-path {
+    color: #746f6f;
+    fill: #c5b59f;
  }
  }
-.low-zoom path.casing.tag-highway-footway,
-.low-zoom path.casing.tag-highway-cycleway,
-.low-zoom path.casing.tag-highway-bridleway {
-    stroke-width: 4;
+path.stroke.tag-highway-path {
+    stroke: #746f6f;
  }
  
  }
  
+.preset-icon .icon.tag-route-foot,
+.preset-icon .icon.tag-route-hiking,
+.preset-icon .icon.highway-footway {
+    color: #ae8681;
+    fill: #fff;
+}
  path.stroke.tag-highway-footway {
      stroke: #ae8681;
  }
  path.stroke.tag-highway-footway {
      stroke: #ae8681;
  }
+
+.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 {
+    color: #58a9ed;
+    fill: #fff;
+}
  path.stroke.tag-highway-cycleway {
      stroke: #58a9ed;
  }
  path.stroke.tag-highway-cycleway {
      stroke: #58a9ed;
  }
+
+.preset-icon .icon.tag-route-horse,
+.preset-icon .icon.highway-bridleway {
+    color: #e06d5f;
+    fill: #fff;
+}
  path.stroke.tag-highway-bridleway {
      stroke: #e06d5f;
  }
  
  path.stroke.tag-highway-bridleway {
      stroke: #e06d5f;
  }
  
+.preset-icon .icon.highway-steps {
+    color: #81d25c;
+    fill: #fff;
+}
  path.stroke.tag-highway-steps {
      stroke: #81d25c;
  path.stroke.tag-highway-steps {
      stroke: #81d25c;
-    stroke-width: 4;
      stroke-linecap: butt;
      stroke-dasharray: 3, 3;
  }
      stroke-linecap: butt;
      stroke-dasharray: 3, 3;
  }
-path.casing.tag-highway-steps {
-    stroke-width: 6;
+path.casing.tag-highway-steps,
+path.casing.tag-highway-steps.tag-unpaved {
      stroke: #fff;
      stroke: #fff;
+    stroke-linecap: round;
+    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 */
  
  /* aeroways */
  
-path.stroke.tag-aeroway-taxiway {
-    stroke: #805C80;
+/* areas */
+path.stroke.area.tag-aeroway {
+    stroke:#fff;
+    stroke-dasharray: none;
+    stroke-width: 2;
+}
+
+/* lines */
+path.stroke.tag-aeroway-taxiway,
+path.stroke.tag-taxiway {
+    stroke-width: 4;
+}
+path.casing.tag-aeroway-taxiway,
+path.casing.tag-taxiway {
+    stroke-width: 6;
+}
+
+.low-zoom path.stroke.tag-aeroway-taxiway,
+.low-zoom path.stroke.tag-taxiway {
+    stroke-width: 2;
+}
+.low-zoom path.casing.tag-aeroway-taxiway,
+.low-zoom path.casing.tag-taxiway {
      stroke-width: 4;
  }
      stroke-width: 4;
  }
+
+.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;
+}
+
+.preset-icon .icon.tag-aeroway-runway,
+.preset-icon .icon.tag-runway {
+    color: #444;
+    fill: #000;
+}
  path.shadow.tag-aeroway-runway {
      stroke-width: 20;
  }
  path.shadow.tag-aeroway-runway {
      stroke-width: 20;
  }
@@ -851,29 +1289,33 @@ path.fill.tag-aeroway-runway {
      stroke: rgba(0, 0, 0, 0.6);
      fill: rgba(0, 0, 0, 0.6);
  }
      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 */
  
  
  /* railways */
  
+.preset-icon .icon.tag-railway.other-line {
+    color: #fff;
+    fill: #777;
+}
+.preset-icon .icon.tag-railway {
+    color: #555;
+    fill: #eee;
+}
  path.stroke.tag-railway {
      stroke: #eee;
      stroke-width: 2;
      stroke-linecap: butt;
      stroke-dasharray: 12,12;
  }
  path.stroke.tag-railway {
      stroke: #eee;
      stroke-width: 2;
      stroke-linecap: butt;
      stroke-dasharray: 12,12;
  }
-
  path.casing.tag-railway {
      stroke: #555;
      stroke-width: 4;
  }
  
  path.casing.tag-railway {
      stroke: #555;
      stroke-width: 4;
  }
  
+.preset-icon .icon.tag-railway-disused,
+.preset-icon .icon.tag-railway-abandoned {
+    color: #999;
+    fill: #eee;
+}
  path.stroke.tag-railway-abandoned {
      stroke: #eee;
  }
  path.stroke.tag-railway-abandoned {
      stroke: #eee;
  }
@@ -881,8 +1323,12 @@ path.casing.tag-railway-abandoned {
      stroke: #999;
  }
  
      stroke: #999;
  }
  
+.preset-icon .icon.tag-railway-subway {
+    color: #222;
+    fill: #bbb;
+}
  path.stroke.tag-railway-subway {
  path.stroke.tag-railway-subway {
-    stroke: #666;
+    stroke: #bbb;
  }
  path.casing.tag-railway-subway {
      stroke: #222;
  }
  path.casing.tag-railway-subway {
      stroke: #222;
@@ -905,9 +1351,19 @@ path.casing.tag-railway-platform {
  .area.casing.tag-railway {
      stroke: none;
  }
  .area.casing.tag-railway {
      stroke: none;
  }
-
  /* waterways */
  
  /* waterways */
  
+.preset-icon .icon.tag-waterway.other-line {
+    color: #77d3de;
+    fill: #77d3de;
+}
+.preset-icon .icon.category-water,
+.preset-icon .icon.tag-route-ferry,
+.preset-icon .icon.tag-waterway {
+    color: #77d3de;
+    fill: #fff;
+}
+
  path.fill.tag-waterway {
      stroke: rgba(119, 211, 222, 0.3);
      fill: rgba(119, 211, 222, 0.3);
  path.fill.tag-waterway {
      stroke: rgba(119, 211, 222, 0.3);
      fill: rgba(119, 211, 222, 0.3);
@@ -929,6 +1385,9 @@ path.casing.tag-waterway-river {
      stroke-width: 6;
  }
  
      stroke-width: 6;
  }
  
+.preset-icon .icon.tag-waterway-ditch {
+    color: #6591ff;
+}
  path.stroke.tag-waterway-ditch {
      stroke: #6591ff;
      stroke-width: 1;
  path.stroke.tag-waterway-ditch {
      stroke: #6591ff;
      stroke-width: 1;
@@ -938,7 +1397,30 @@ path.casing.tag-waterway-ditch {
      stroke-width: 3;
  }
  
      stroke-width: 3;
  }
  
+path.area.stroke.tag-waterway-dock,
+path.area.stroke.tag-waterway-boatyard,
+path.area.stroke.tag-waterway-fuel {
+    stroke: white;
+    stroke-width: 1;
+}
+path.area.casing.tag-waterway-dock,
+path.area.casing.tag-waterway-boatyard,
+path.area.casing.tag-waterway-fuel {
+    stroke: none;
+}
+path.area.fill.tag-waterway-dock,
+path.area.fill.tag-waterway-boatyard,
+path.area.fill.tag-waterway-fuel {
+    stroke: rgba(255, 255, 255, 0.3);
+    fill: rgba(255, 255, 255, 0.3);
+}
+
  /* power */
  /* power */
+.preset-icon .icon.tag-man_made-pipeline,
+.preset-icon .icon.tag-power {
+    color: #939393;
+    fill: #939393;
+}
  
  path.stroke.tag-power {
      stroke: #939393;
  
  path.stroke.tag-power {
      stroke: #939393;
@@ -948,8 +1430,8 @@ path.casing.tag-power {
      stroke: none;
  }
  
      stroke: none;
  }
  
-/* boundary */
  
  
+/* boundaries */
  path.stroke.tag-boundary {
      stroke: #fff;
      stroke-width: 2;
  path.stroke.tag-boundary {
      stroke: #fff;
      stroke-width: 2;
@@ -966,8 +1448,8 @@ path.casing.tag-boundary-national_park {
      stroke: #b0e298;
  }
  
      stroke: #b0e298;
  }
  
-/* barriers */
  
  
+/* barriers */
  path.stroke.tag-barrier {
      stroke: #ddd;
      stroke-width: 3px;
  path.stroke.tag-barrier {
      stroke: #ddd;
      stroke-width: 3px;
@@ -980,22 +1462,23 @@ path.stroke.tag-barrier {
      stroke-dasharray: 8, 2, 2, 2;
  }
  
      stroke-dasharray: 8, 2, 2, 2;
  }
  
-/* bridges */
  
  
+/* bridges */
  path.casing.tag-bridge {
      stroke-width: 16;
      stroke-opacity: 0.6;
      stroke: #000;
      stroke-linecap: butt;
  path.casing.tag-bridge {
      stroke-width: 16;
      stroke-opacity: 0.6;
      stroke: #000;
      stroke-linecap: butt;
+    stroke-dasharray: none;
  }
  
  path.shadow.tag-bridge {
      stroke-width: 22;
  }
  }
  
  path.shadow.tag-bridge {
      stroke-width: 22;
  }
-
  path.casing.line.tag-railway.tag-bridge,
  path.casing.tag-highway-living_street.tag-bridge,
  path.casing.tag-highway-path.tag-bridge,
  path.casing.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.line.tag-highway-pedestrian.tag-bridge,
  path.casing.tag-highway-service.tag-bridge,
  path.casing.tag-highway-track.tag-bridge,
@@ -1005,10 +1488,10 @@ path.casing.tag-highway-cycleway.tag-bridge,
  path.casing.tag-highway-bridleway.tag-bridge {
      stroke-width: 10;
  }
  path.casing.tag-highway-bridleway.tag-bridge {
      stroke-width: 10;
  }
-
  path.shadow.line.tag-railway.tag-bridge,
  path.shadow.tag-highway-living_street.tag-bridge,
  path.shadow.tag-highway-path.tag-bridge,
  path.shadow.line.tag-railway.tag-bridge,
  path.shadow.tag-highway-living_street.tag-bridge,
  path.shadow.tag-highway-path.tag-bridge,
+path.shadow.tag-highway-corridor.tag-bridge,
  path.shadow.line.tag-highway-pedestrian.tag-bridge,
  path.shadow.tag-highway-service.tag-bridge,
  path.shadow.tag-highway-track.tag-bridge,
  path.shadow.line.tag-highway-pedestrian.tag-bridge,
  path.shadow.tag-highway-service.tag-bridge,
  path.shadow.tag-highway-track.tag-bridge,
@@ -1018,15 +1501,9 @@ path.shadow.tag-highway-cycleway.tag-bridge,
  path.shadow.tag-highway-bridleway.tag-bridge {
      stroke-width: 17;
  }
  path.shadow.tag-highway-bridleway.tag-bridge {
      stroke-width: 17;
  }
-
-
  .low-zoom path.casing.tag-bridge {
      stroke-width: 10;
  .low-zoom path.casing.tag-bridge {
      stroke-width: 10;
-    stroke-opacity: 0.6;
-    stroke: #000;
-    stroke-linecap: butt;
  }
  }
-
  .low-zoom path.shadow.tag-bridge {
      stroke-width: 14;
  }
  .low-zoom path.shadow.tag-bridge {
      stroke-width: 14;
  }
@@ -1034,6 +1511,7 @@ path.shadow.tag-highway-bridleway.tag-bridge {
  .low-zoom path.casing.line.tag-railway.tag-bridge,
  .low-zoom path.casing.tag-highway-living_street.tag-bridge,
  .low-zoom path.casing.tag-highway-path.tag-bridge,
  .low-zoom path.casing.line.tag-railway.tag-bridge,
  .low-zoom path.casing.tag-highway-living_street.tag-bridge,
  .low-zoom path.casing.tag-highway-path.tag-bridge,
+.low-zoom path.casing.tag-highway-corridor.tag-bridge,
  .low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
  .low-zoom path.casing.tag-highway-service.tag-bridge,
  .low-zoom path.casing.tag-highway-track.tag-bridge,
  .low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
  .low-zoom path.casing.tag-highway-service.tag-bridge,
  .low-zoom path.casing.tag-highway-track.tag-bridge,
@@ -1047,6 +1525,7 @@ path.shadow.tag-highway-bridleway.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.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.line.tag-highway-pedestrian.tag-bridge,
  .low-zoom path.shadow.tag-highway-service.tag-bridge,
  .low-zoom path.shadow.tag-highway-track.tag-bridge,
@@ -1057,18 +1536,19 @@ path.shadow.tag-highway-bridleway.tag-bridge {
      stroke-width: 13;
  }
  
      stroke-width: 13;
  }
  
-/* tunnels */
  
  
+/* tunnels */
  path.stroke.tag-tunnel {
      stroke-opacity: 0.3;
  }
  path.stroke.tag-tunnel {
      stroke-opacity: 0.3;
  }
-
  path.casing.tag-tunnel {
      stroke-opacity: 0.5;
  path.casing.tag-tunnel {
      stroke-opacity: 0.5;
+    stroke-linecap: butt;
+    stroke-dasharray: none;
  }
  
  }
  
-/* embankments / cuttings */
  
  
+/* embankments / cuttings */
  path.casing.tag-embankment,
  path.casing.tag-cutting {
      stroke-opacity: 0.5;
  path.casing.tag-embankment,
  path.casing.tag-cutting {
      stroke-opacity: 0.5;
@@ -1078,134 +1558,68 @@ path.casing.tag-cutting {
      stroke-linecap: butt;
  }
  
      stroke-linecap: butt;
  }
  
-path.shadow.tag-embankment,
-path.shadow.tag-cutting {
-    stroke-width: 28;
-}
-
-.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;
-}
-
-
-/* construction */
-
-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 7, 7;
-}
-
-.low-zoom path.stroke.tag-highway-construction,
-.low-zoom path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 5;
-}
-
-text {
-    font-size:10px;
-    pointer-events: none;
-    color: #222;
-    opacity: 1;
-}
-
-.oneway .textpath.tag-waterway {
-    fill: #002F35;
-}
-
-marker#oneway-marker path {
-    fill:#000;
-    opacity: .5;
-}
-
-path.oneway {
-    stroke-width: 6px;
-}
-
-/* Buildings */
-
-path.stroke.tag-building,
-path.stroke.tag-amenity-shelter {
-    stroke: rgb(224, 110, 95);
-}
-path.fill.tag-building,
-path.fill.tag-amenity-shelter {
-    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 {
-    border-color: rgb(224, 110, 95);
-    background-color: rgba(224, 110, 95, 0.3);
-}
-
-
-/*
- * Labels
- */
-
-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;
-}
-
-.linelabel-halo .textpath,
-.linelabel .textpath {
-  dominant-baseline: middle;
-}
-
-/* Opera doesn't support dominant-baseline. See #715 */
-.opera .linelabel-halo .textpath,
-.opera .linelabel .textpath {
-  baseline-shift: -33%;
-  dominant-baseline: auto;
-}
-
-.layer-halo text {
-    opacity: 0.7;
-    stroke: #fff;
-    stroke-width: 5px;
-    stroke-miterlimit: 1;
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
  }
  
  }
  
-text.proximate {
-    opacity: 0;
+.low-zoom path.casing.tag-embankment,
+.low-zoom path.casing.tag-cutting {
+    stroke-width: 10;
  }
  
  }
  
-text.point {
-  font-size: 10px;
+.low-zoom path.shadow.tag-embankment,
+.low-zoom path.shadow.tag-cutting {
+    stroke-width: 14;
  }
  
  }
  
-/* Turns */
  
  
-g.turn rect,
-g.turn circle {
-    fill: none;
-    pointer-events: all;
+/* Surface - unpaved */
+path.casing.tag-unpaved {
+    stroke: #ccc;
+    stroke-linecap: butt;
+    stroke-dasharray: 4, 3;
+}
+.low-zoom path.casing.tag-unpaved {
+    stroke-dasharray: 3, 2;
+}
+path.casing.tag-bridge.tag-unpaved {
+    stroke: #000;
+    stroke-dasharray: 4, 3;
+}
+.low-zoom path.casing.tag-bridge.tag-unpaved {
+    stroke: #000;
+    stroke-dasharray: 3, 2;
  }
  
  }
  
-.form-field-restrictions .vertex {
-    pointer-events: none;
-    cursor: auto !important;
+
+/* Status (e.g. construction, proposed, abandoned) */
+path.stroke.tag-status,
+path.casing.tag-status {
+    stroke-linecap: butt;
+    stroke-dasharray: 7, 3;
+}
+.low-zoom path.stroke.tag-status,
+.low-zoom path.casing.tag-status {
+    stroke-dasharray: 5, 2;
  }
  
  }
  
+
+/* Buildings */
+path.stroke.tag-building,
+path.stroke.tag-amenity-shelter {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-building,
+path.fill.tag-amenity-shelter {
+    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 {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.3);
+}
  /* Cursors */
  
  .map-in-map,
  /* Cursors */
  
  .map-in-map,
@@ -1312,115 +1726,144 @@ g.turn circle {
      cursor: pointer; /* Opera */
      cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
  }
      cursor: pointer; /* Opera */
      cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
  }
+/* Mapillary Image Layer */
  
  
-.lasso #map {
-    pointer-events: visibleStroke;
-}
-
-/* GPX Paths */
-div.layer-gpx {
-    pointer-events: none;
-}
-
-path.gpx {
-    stroke: #FF26D4;
-    stroke-width: 2;
-    fill: none;
-}
-
-text.gpx {
-    fill: #FF26D4;
-}
-
-/* Mapillary Layer */
-
-.layer-mapillary {
+.layer-mapillary-images {
      pointer-events: none;
  }
  
      pointer-events: none;
  }
  
-.layer-mapillary g {
+.layer-mapillary-images .viewfield-group {
      pointer-events: visible;
      cursor: pointer; /* Opera */
      cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
  }
  
      pointer-events: visible;
      cursor: pointer; /* Opera */
      cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
  }
  
-.layer-mapillary g * {
-    stroke-width: 2;
-    stroke: #ffc600;
+.layer-mapillary-images .viewfield-group * {
+    stroke-width: 1;
+    stroke: #444;
      fill: #ffc600;
      fill: #ffc600;
+    z-index: 50;
  }
  
  }
  
-.layer-mapillary g:hover * {
-    stroke-width: 2;
-    stroke: #ff9900;
+.layer-mapillary-images .viewfield-group:hover * {
+    stroke-width: 1;
+    stroke: #333;
      fill: #ff9900;
      fill: #ff9900;
+    z-index: 60;
  }
  
  }
  
-.layer-mapillary g.selected * {
-    stroke-width: 4;
-    stroke: #ff5800;
+.layer-mapillary-images .viewfield-group.selected  * {
+    stroke-width: 2;
+    stroke: #222;
      fill: #ff5800;
      fill: #ff5800;
+    z-index: 60;
  }
  
  }
  
-/* Modes */
-
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
-    display: none;
+.layer-mapillary-images .viewfield-group:hover path.viewfield,
+.layer-mapillary-images .viewfield-group.selected path.viewfield,
+.layer-mapillary-images .viewfield-group path.viewfield {
+    stroke-width: 0;
+    fill-opacity: 0.6;
  }
  
  }
  
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
+/* Mapillary Sign Layer */
+
+.layer-mapillary-signs {
      pointer-events: none;
  }
  
      pointer-events: none;
  }
  
-/* 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 {
-    pointer-events: none;
+.layer-mapillary-signs .icon-sign .icon-sign-body {
+    min-width: 20px;
+    height: 28px;
+    width: 28px;
+    border: 2px solid transparent;
+    pointer-events: visible;
+    cursor: pointer; /* Opera */
+    cursor: url(<%= asset_path("iD/img/cursor-select-mapillary.png") %>) 6 1, pointer; /* FF */
+    z-index: 70;
+    overflow: visible;
  }
  
  }
  
+.layer-mapillary-signs .icon-sign:hover .icon-sign-body {
+    border: 2px solid rgba(255,198,0,0.8);
+    z-index: 80;
+ }
  
  
+.layer-mapillary-signs .icon-sign.selected .icon-sign-body {
+    border: 2px solid rgba(255,0,0,0.8);
+    z-index: 80;
+ }
+
+.layer-mapillary-signs .icon-sign .t {
+    font-size: 28px;
+    z-index: 70;
+}
+
+.layer-mapillary-signs .icon-sign:hover .t,
+.layer-mapillary-signs .icon-sign.selected .t {
+    z-index: 80;
+}
  /* Fill Styles */
  /* Fill Styles */
+
  .low-zoom.fill-wireframe path.stroke,
  .fill-wireframe path.stroke {
  .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 path.shadow,
  .fill-wireframe path.shadow {
  }
  
  .low-zoom.fill-wireframe path.shadow,
  .fill-wireframe path.shadow {
-    stroke-width: 8;
+    stroke-width: 8 !important;
  }
  
  }
  
+.fill-wireframe path.shadow.related:not(.selected),
  .fill-wireframe path.shadow.hover:not(.selected) {
  .fill-wireframe path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.2;
+    stroke-opacity: 0.4 !important;
  }
  .fill-wireframe path.shadow.selected {
  }
  .fill-wireframe path.shadow.selected {
-    stroke-opacity: 0.4;
+    stroke-opacity: 0.6 !important;
  }
  
  .fill-wireframe .point,
  }
  
  .fill-wireframe .point,
-.fill-wireframe .icon,
+.fill-wireframe .areaicon,
+.fill-wireframe .areaicon-halo,
  .fill-wireframe path.casing,
  .fill-wireframe path.fill,
  .fill-wireframe path.oneway {
  .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: visibleStroke;
  }
      fill-opacity: 0;
      stroke-width: 60px;
      pointer-events: visibleStroke;
  }
+
+/* Modes */
+
+.mode-draw-line .vertex.active,
+.mode-draw-area .vertex.active,
+.mode-drag-node .vertex.active {
+    display: none;
+}
+
+.mode-draw-line .way.active,
+.mode-draw-area .way.active,
+.mode-drag-node .active {
+    pointer-events: none;
+}
+
+/* Ensure drawing doesn't interact with area fills. */
+.mode-add-point path.area.fill,
+.mode-draw-line path.area.fill,
+.mode-draw-area path.area.fill,
+.mode-add-line path.area.fill,
+.mode-add-area path.area.fill,
+.mode-drag-node path.area.fill {
+    pointer-events: none;
+}
  /* Basics
  ------------------------------------------------------- */
  
  /* Basics
  ------------------------------------------------------- */
  
@@ -1434,7 +1877,10 @@ html, body {
  }
  
  body {
  }
  
  body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
+    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;
      margin:0;
      padding:0;
      min-width: 768px;
@@ -1452,7 +1898,6 @@ body {
  .id-container {
      height: 100%;
      width: 100%;
  .id-container {
      height: 100%;
      width: 100%;
-    position: fixed;
      min-width: 768px;
  }
  
      min-width: 768px;
  }
  
@@ -1462,6 +1907,20 @@ body {
      height: 100%;
  }
  
      height: 100%;
  }
  
+#content.active {
+    -webkit-filter: none !important;
+    filter: none !important;
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
+#content.inactive {
+    -webkit-filter: grayscale(80%) brightness(80%);
+    filter: grayscale(80%) brightness(80%);
+    -webkit-duration: 200ms;
+    transition-duration: 200ms;
+}
+
  #defs {
      /* Can't be display: none or the clippaths are ignored. */
      position: absolute;
  #defs {
      /* Can't be display: none or the clippaths are ignored. */
      position: absolute;
@@ -1481,14 +1940,12 @@ body {
  
  .spinner {
      opacity: .5;
  
  .spinner {
      opacity: .5;
+    float: right;
  }
  
  .spinner img {
  }
  
  .spinner img {
-    position: absolute;
      height: 40px;
      width: 40px;
      height: 40px;
      width: 40px;
-    right: 10px;
-    top: 10px;
      border-radius: 4px;
      margin-right: 10px;
      background: black;
      border-radius: 4px;
      margin-right: 10px;
      background: black;
@@ -1574,7 +2031,10 @@ a:hover {
  
  textarea  {
      resize: vertical;
  
  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,
  }
  
  textarea,
@@ -1585,6 +2045,7 @@ input[type=url],
  input[type=tel],
  input[type=email] {
      background-color: white;
  input[type=tel],
  input[type=email] {
      background-color: white;
+    color: #333;
      border:1px solid #ccc;
      padding:5px 10px;
      height:30px;
      border:1px solid #ccc;
      padding:5px 10px;
      height:30px;
@@ -1632,6 +2093,10 @@ table.tags, table.tags td, table.tags th {
      padding: 4px;
  }
  
      padding: 4px;
  }
  
+::-ms-clear {
+   display: none;
+}
+
  /* Grid
  ------------------------------------------------------- */
  
  /* Grid
  ------------------------------------------------------- */
  
@@ -1717,7 +2182,10 @@ ul li { list-style: none;}
  
  .fl { float: left;}
  .fr { float: right;}
  
  .fl { float: left;}
  .fr { float: right;}
+.al { left: 0; }
+.ar { right: 0; }
  
  
+input.hide,
  div.hide,
  form.hide,
  button.hide,
  div.hide,
  form.hide,
  button.hide,
@@ -1785,7 +2253,7 @@ button:hover {
  button[disabled],
  button.disabled {
      background-color: rgba(255,255,255,.25);
  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;
  }
  
      cursor: auto;
  }
  
@@ -1868,10 +2336,6 @@ button.secondary-action:hover {
      background: #cccccc;
  }
  
      background: #cccccc;
  }
  
-button.save.has-count {
-    padding: 9px;
-}
-
  button.save .count {
      display: none;
  }
  button.save .count {
      display: none;
  }
@@ -1880,14 +2344,16 @@ button.save.has-count .count {
      display: block;
      position: absolute;
      top: 5px;
      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;
      color: #333;
      padding: 10px;
      height: 30px;
      line-height: 12px;
      border-radius: 4px;
      margin: auto;
-    margin-left: 8.3333%;
+    margin-left: 9.3333%;
  }
  
  button.save.has-count .count::before {
  }
  
  button.save.has-count .count::before {
@@ -1901,23 +2367,44 @@ button.save.has-count .count::before {
      bottom: 0;
      border-top:    6px solid transparent;
      border-bottom: 6px solid transparent;
      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;
  }
  
  /* Icons */
  
  .icon {
  }
  
  /* Icons */
  
  .icon {
-  display:inline-block;
-  vertical-align:top;
-  width:20px;
-  height:20px;
-  background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 0;
-  text-indent:-9999px;
-  overflow:hidden;
-  }
+    vertical-align: top;
+    width: 20px;
+    height: 20px;
+}
+
+.icon.inline {
+    vertical-align: text-top;
+    width: 14px;
+    height: 14px;
+    margin: 0px 3px;
+}
+
+.icon.pre-text {
+    margin-right: 5px;
+}
+
+.icon.light {
+    color: #fff;
+}
+
+.icon.created {
+    color: #00ca07;
+}
+
+.icon.modified {
+    color: #666;
+}
  
  
-.icon-pre-text {
-    margin-right: 3px;
+.icon.deleted {
+    color: #ea0000;
  }
  
  .user-icon {
  }
  
  .user-icon {
@@ -1928,104 +2415,6 @@ button.save.has-count .count::before {
      border-radius: 3px;
  }
  
      border-radius: 3px;
  }
  
-/* Definitions for every icon */
-.icon.alert     { background-position:   0 0;}
-.icon.point,
-.icon.add-point  { background-position: -20px 0;}
-.icon.line,
-.icon.add-line   { background-position: -40px 0;}
-.icon.area,
-.icon.add-area   { background-position: -60px 0;}
-.icon.undo       { background-position: -80px 0;}
-.icon.redo       { background-position: -100px 0;}
-.icon.apply      { background-position: -120px 0;}
-.icon.save       { background-position: -140px 0;}
-.icon.close      { background-position: -160px 0;}
-.icon.delete     { background-position: -180px 0;}
-.icon.remove     { background-position: -200px 0;}
-.icon.inspect    { background-position: -220px 0;}
-.icon.plus       { background-position: -240px 0;}
-.icon.search     { background-position: -280px 0;}
-.icon.geocode    { background-position: -280px 0;}
-.icon.layers     { background-position: -300px 0;}
-.icon.avatar     { background-position: -320px 0;}
-.icon.nearby     { background-position: -340px 0;}
-.icon.geolocate  { background-position: -360px 0;}
-.icon.warning    { background-position: -380px 0;}
-.icon.bug        { background-position: -400px 0;}
-.icon.back       { background-position: -420px 0;}
-.icon.forward    { background-position: -440px 0;}
-.icon.help       { background-position: -460px 0;}
-.icon.relation    { background-position: -520px 0;}
-.icon.relation.route         { background-position: -540px 0;}
-.icon.relation.multipolygon  { background-position: -560px 0;}
-.icon.vertex     { background-position: -580px 0;}
-.icon.data       { background-position: -600px 0;}
-
-.icon.inspect.light    { background-position: -220px -20px;}
-.icon.plus.light       { background-position: -240px -20px;}
-.icon.zoom-in          { background-position: -240px -20px;}
-.icon.zoom-out         { background-position: -260px -20px;}
-.icon.geocode.light    { background-position: -280px -20px;}
-.icon.layers.light     { background-position: -300px -20px;}
-.icon.avatar.light     { background-position: -320px -20px;}
-.icon.nearby.light     { background-position: -340px -20px;}
-.icon.geolocate.light  { background-position: -360px -20px;}
-.icon.bug.light        { background-position: -400px -20px;}
-.icon.help.light       { background-position: -460px -20px;}
-.icon.data.light       { background-position: -600px -20px;}
-
-.icon.back.blue        { background-position: -420px -20px;}
-.icon.forward.blue     { background-position: -440px -20px;}
-
-button[disabled] .icon.alert      { background-position:   0 -40px;}
-button[disabled] .icon.add-point  { background-position: -20px -40px;}
-button[disabled] .icon.add-line   { background-position: -40px -40px;}
-button[disabled] .icon.add-area   { background-position: -60px -40px;}
-button.disabled  .icon.undo       { background-position: -80px -40px;}
-button.disabled  .icon.redo       { background-position: -100px -40px;}
-button[disabled] .apply.icon      { background-position: -120px -40px;}
-button[disabled] .close.icon      { background-position: -160px -40px;}
-button[disabled] .delete.icon     { background-position: -180px -40px;}
-button[disabled] .icon.remove     { background-position: -200px -40px;}
-button[disabled] .icon.inspect    { background-position: -220px -40px;}
-button[disabled] .icon.zoom-in    { background-position: -240px -40px;}
-button[disabled] .icon.zoom-out   { background-position: -260px -40px;}
-button[disabled] .icon.geocode    { background-position: -280px -40px;}
-button[disabled] .icon.layers     { background-position: -300px -40px;}
-button[disabled] .icon.avatar     { background-position: -320px -40px;}
-button[disabled] .icon.nearby     { background-position: -340px -40px;}
-button[disabled] .icon.data       { background-position: -600px -40px;}
-
-.icon.point.deleted  { background-position: -480px -80px;}
-.icon.line.deleted   { background-position: -500px -80px;}
-.icon.area.deleted   { background-position: -520px -80px;}
-
-.icon.point.created  { background-position: -480px -100px;}
-.icon.line.created   { background-position: -500px -100px;}
-.icon.area.created   { background-position: -520px -100px;}
-
-.icon.point.modified  { background-position: -22px 0; }
-
-.icon.modified { opacity: .5; }
-
-/* Out link is special */
-
-.icon.out-link   { height: 14px; width: 14px; background-position: -500px 0;}
-a:hover .icon.out-link   { background-position: -500px -14px;}
-
-.icon.plus-dark    { background-position: -240px -40px;}
-
-/* Universal preset icons */
-
-.icon.source     { background-position:   0 -200px;}
-.icon.address    { background-position: -20px -200px;}
-.icon.telephone  { background-position: -40px -200px;}
-.icon.website    { background-position: -60px -200px;}
-.icon.elevation  { background-position: -80px -200px;}
-.icon.wikipedia  { background-position: -100px -200px;}
-.icon.note       { background-position: -120px -200px;}
-.icon.wheelchair { background-position: -140px -200px;}
  
  /* ToolBar / Persistent UI Elements
  ------------------------------------------------------- */
  
  /* ToolBar / Persistent UI Elements
  ------------------------------------------------------- */
@@ -2056,7 +2445,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      white-space: nowrap;
      text-overflow: ellipsis;
      overflow: hidden;
      white-space: nowrap;
      text-overflow: ellipsis;
      overflow: hidden;
-    padding: 20px;
+    padding: 20px 20px 20px 40px;
  }
  
  .header button,
  }
  
  .header button,
@@ -2072,12 +2461,25 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      height: 100%;
  }
  
      height: 100%;
  }
  
-.preset-list-pane .header button {
+.entity-editor-pane .header button.preset-close,
+.preset-list-pane .header button.preset-choose {
      position: absolute;
      right: 0;
      top: 0;
  }
  
      position: absolute;
      right: 0;
      top: 0;
  }
  
+.entity-editor-pane .header button.preset-choose {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.preset-choose {
+    font-size: 16px;
+    line-height: 1.25;
+    font-weight: bold;
+}
+
  .modal > button {
      position: absolute;
      right: 0;
  .modal > button {
      position: absolute;
      right: 0;
@@ -2141,47 +2543,8 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      bottom: 0;
  }
  
      bottom: 0;
  }
  
-.mapillary-image {
-    position: absolute;
-    right: 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;
-    right: 0;
-    padding: 5px 10px;
-}
-
-.mapillary-image img {
-    width: 100%;
-    height: auto;
-    display: block;
-}
  
  
-.mapillary-image.hidden {
-    visibility: hidden;
-}
-
-.mapillary-image.temp button {
-    display: none;
-}
  
  
-.mapillary-image button {
-    border-radius: 0;
-    padding: 5px;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
  
  .feature-list-pane .inspector-body {
      top: 120px;
  
  .feature-list-pane .inspector-body {
      top: 120px;
@@ -2241,9 +2604,24 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      border-radius: 0;
  }
  
      border-radius: 0;
  }
  
+.feature-list-item {
+    background-color: white;
+    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;
  .feature-list-item .label {
      text-align: left;
-    padding: 5px 10px;
+    padding: 10px 10px;
      white-space: nowrap;
      text-overflow: ellipsis;
      overflow: hidden;
      white-space: nowrap;
      text-overflow: ellipsis;
      overflow: hidden;
@@ -2254,8 +2632,13 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      opacity: .5;
  }
  
      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 {
  }
  
  .feature-list-item .entity-type {
@@ -2283,34 +2666,93 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      border-bottom: 1px solid #ccc;
  }
  
      border-bottom: 1px solid #ccc;
  }
  
-.preset-list-button-wrap {
-    position: relative;
-    margin-bottom: 10px;
+.preset-list-button-wrap {
+    position: relative;
+    margin-bottom: 10px;
+    height: 60px;
+}
+
+.preset-list-button {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    border: 1px solid #ccc;
+}
+
+.preset-list.filtered .preset-list-item:first-child .preset-list-button {
+    background: #ececec;
+}
+
+.preset-icon-fill-area {
+    cursor: inherit;
+    height: 40px;
+    width: 40px;
+    margin: auto;
+    position: absolute;
+    left: 10px;
+    top: 10px;
+}
+
+.preset-icon-frame {
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    height: 42px;
+    width: 42px;
+    margin: auto;
+}
+
+.preset-icon-frame .icon {
+    width: 46px;
+    height: 46px;
+}
+
+.preset-icon-60 {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    margin: auto;
+}
+
+.preset-icon-60 .icon {
+    width: 60px;
      height: 60px;
  }
  
      height: 60px;
  }
  
-.preset-list-button {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    border: 1px solid #ccc;
+.preset-icon-44 {
+    position: absolute;
+    top: 9px;
+    left: 8px;
+    margin: auto;
  }
  
  }
  
-.preset-list.filtered .preset-list-item:first-child .preset-list-button {
-    background: #ececec;
+.preset-icon-44 .icon {
+    width: 44px;
+    height: 44px;
  }
  
  }
  
-.preset-icon {
+.preset-icon-28 {
      position: absolute;
      position: absolute;
-    top: 17px;
-    left: 17px;
+    top: 16px;
+    left: 16px;
      margin: auto;
  }
  
      margin: auto;
  }
  
-.preset-icon-line,
-.preset-icon-relation {
-    top: 0;
-    left: 0;
+.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;
  }
  
  .preset-list-button .label {
  }
  
  .preset-list-button .label {
@@ -2345,6 +2787,10 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      background: #fafafa;
  }
  
      background: #fafafa;
  }
  
+.preset-list-item button.tag-reference-button:hover {
+    background: #f1f1f1;
+}
+
  .preset-list-item button.tag-reference-button .icon {
      opacity: .5;
  }
  .preset-list-item button.tag-reference-button .icon {
      opacity: .5;
  }
@@ -2390,32 +2836,16 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      margin-top: -10px;
  }
  
      margin-top: -10px;
  }
  
-/* Preset icon colors */
-
-.preset-icon-fill-area {
-    cursor: inherit;
-    height: 39px;
-    width: 39px;
-    margin: auto;
-    position: absolute;
-    left: 10px;
-    top: 10px;
-}
-
-.preset-icon-fill-area:after {
-    content: '';
-    left: -4px;
-    top: -4px;
-    height: 45px;
-    width: 45px;
-    position: absolute;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -80px;
-}
  
  /* preset form basics */
  
  .inspector-preset {
      overflow: hidden;
  
  /* preset form basics */
  
  .inspector-preset {
      overflow: hidden;
+    padding-bottom: 10px;
+}
+
+.inspector-preset a.hide-toggle {
+    margin: 0 20px 10px 20px;
  }
  
  .inspector-preset .preset-form {
  }
  
  .inspector-preset .preset-form {
@@ -2424,25 +2854,10 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      border-radius: 8px;
  }
  
      border-radius: 8px;
  }
  
-.entity-editor-pane .preset-list-item::after {
-    content: "";
-    position: absolute;
-    height: 0;
-    width: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    border: solid rgba(0, 0, 0, 0);
-    border-width: 10px;
-    border-bottom-color: #ececec;
-}
-
  .entity-editor-pane .preset-list-item .preset-list-button-wrap {
      margin-bottom: 0;
  }
  
  .entity-editor-pane .preset-list-item .preset-list-button-wrap {
      margin-bottom: 0;
  }
  
-
  .form-field {
      margin-bottom: 10px;
      width: 100%;
  .form-field {
      margin-bottom: 10px;
      width: 100%;
@@ -2486,11 +2901,14 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
  }
  
  .form-label button {
  }
  
  .form-label button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
      width: 10%;
      height: 100%;
      border-radius: 0;
      width: 10%;
      height: 100%;
      border-radius: 0;
-    background: #fafafa;
+    background: #f6f6f6;
+}
+.form-label button:hover {
+    background: #f1f1f1;
  }
  
  .form-label .modified-icon,
  }
  
  .form-label .modified-icon,
@@ -2506,10 +2924,11 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
  .form-field > input,
  .form-field > textarea,
  .form-field .preset-input-wrap {
  .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;
      min-height: 30px;
      border-top: 0;
      border-radius: 0 0 4px 4px;
+    overflow: hidden;
  }
  
  .form-field textarea {
  }
  
  .form-field textarea {
@@ -2517,23 +2936,30 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
  }
  
  .inspector-border {
  }
  
  .inspector-border {
-    border-bottom: 1px solid #CCC
+    border-bottom: 1px solid #ccc
  }
  
  /* Preset form (hover mode) */
  
  .inspector-hover .checkselect label:last-of-type,
  .inspector-hover .preset-input-wrap .label,
  }
  
  /* Preset form (hover mode) */
  
  .inspector-hover .checkselect label:last-of-type,
  .inspector-hover .preset-input-wrap .label,
+.inspector-hover .form-field-multicombo,
  .inspector-hover input,
  .inspector-hover label {
      background: #ececec;
  }
  
  .inspector-hover a,
  .inspector-hover input,
  .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 .checkselect label:last-of-type {
      color: #666;
  }
  
+.inspector-hover .form-field-multicombo .chips {
+    background: #eee;
+    border: 1px solid #ccc;
+}
+
  /* hide and remove from layout */
  .inspector-hidden,
  .inspector-hover label input[type="checkbox"],
  /* hide and remove from layout */
  .inspector-hidden,
  .inspector-hover label input[type="checkbox"],
@@ -2542,6 +2968,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
  .inspector-hover .toggle-list label span,
  .inspector-hover .inspector-inner .add-tag,
  .inspector-hover .inspector-inner .add-relation,
  .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;
  .inspector-hover .toggle-list label.remove .icon {
      height: 0;
      width: 0;
@@ -2557,6 +2984,7 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
  .inspector-hover .combobox-caret,
  .inspector-hover .entity-editor-pane .header button,
  .inspector-hover .spin-control,
  .inspector-hover .combobox-caret,
  .inspector-hover .entity-editor-pane .header button,
  .inspector-hover .spin-control,
+.inspector-hover .form-field-multicombo .chips .remove,
  .inspector-hover .hide-toggle:before,
  .inspector-hover .more-fields,
  .inspector-hover .form-label-button-wrap,
  .inspector-hover .hide-toggle:before,
  .inspector-hover .more-fields,
  .inspector-hover .form-label-button-wrap,
@@ -2629,8 +3057,10 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      font-weight: bold;
  }
  
      font-weight: bold;
  }
  
-.more-fields label { padding: 5px 10px 5px 0; }
-.more-fields input { width: 50%;}
+.more-fields input {
+    margin-left: 10px;
+    width: 50%;
+}
  
  /* preset form access */
  
  
  /* preset form access */
  
@@ -2657,6 +3087,78 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
      border-bottom-right-radius: 4px;
  }
  
      border-bottom-right-radius: 4px;
  }
  
+/* preset form multicombo */
+
+.form-field-multicombo {
+    border: 1px solid #cfcfcf;
+    border-top: 0px;
+    padding: 5px 0 5px 10px;
+    background: #fff;
+    display: block;
+    border-radius: 0 0 4px 4px;
+    overflow: hidden;
+}
+
+.form-field-multicombo:focus {
+    border-bottom: 0px;
+}
+
+.form-field-multicombo.active {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.form-field-multicombo li {
+    background-color: #eff2f7;
+    border: 1px solid #ccd5e3;
+    border-radius: 4px;
+    line-height: 25px;
+    display: inline-block;
+    padding: 2px 5px;
+    margin: 3px;
+    height: 30px;
+}
+
+.form-field-multicombo a {
+    font-family: Arial, Helvetica, sans-serif !important;
+    font-size: 16px !important;
+    line-height: 24px;
+    float: right;
+    margin: 1px 0 0 5px;
+    padding: 0;
+    cursor: pointer;
+    color: #a6b4ce;
+}
+
+.form-field-multicombo input {
+    border: 1px solid #ddd;
+    width: 100px;
+    margin: 3px;
+}
+
+.form-field-multicombo .combobox-caret {
+    margin: 3px 3px 3px -30px;
+}
+
+.form-field-multicombo input:focus {
+    border-radius: 4px !important;
+}
+
+/* preset form cycleway */
+
+.form-field-cycleway .preset-input-wrap li {
+    border-bottom: 1px solid #CCC;
+}
+.form-field-cycleway .preset-input-wrap li:last-child {
+    border-bottom: 0;
+}
+
+.preset-input-cycleway-wrap input {
+    border-radius: 0;
+    border-width: 0;
+    border-left-width: 1px;
+}
+
  /* preset form numbers */
  
  input[type=number] {
  /* preset form numbers */
  
  input[type=number] {
@@ -3148,6 +3650,27 @@ img.wiki-image {
      background: rgba(0,0,0,.8);
  }
  
      background: rgba(0,0,0,.8);
  }
  
+/* Fullscreen button */
+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);
+}
+
  /* Map Controls */
  
  .map-controls {
  /* Map Controls */
  
  .map-controls {
@@ -3181,7 +3704,6 @@ img.wiki-image {
  
  /* Background / Map Data Settings */
  
  
  /* Background / Map Data Settings */
  
-
  .map-data-control button {
      border-radius: 0;
  }
  .map-data-control button {
      border-radius: 0;
  }
@@ -3195,12 +3717,8 @@ img.wiki-image {
      position: relative;
  }
  
      position: relative;
  }
  
-.nudge-container {
-    border: 1px solid #CCC;
-}
-
-.background-control .adjustments button:last-child {
-    border: 0;
+.imagery-faq {
+    margin-bottom: 10px;
  }
  
  .map-data-control .hide-toggle,
  }
  
  .map-data-control .hide-toggle,
@@ -3208,7 +3726,7 @@ img.wiki-image {
      padding-bottom: 10px;
  }
  
      padding-bottom: 10px;
  }
  
-.layer-list {
+.layer-list, .controls-list {
      margin-bottom: 10px;
      border: 1px solid #CCC;
      border-radius: 4px;
      margin-bottom: 10px;
      border: 1px solid #CCC;
      border-radius: 4px;
@@ -3221,6 +3739,10 @@ img.wiki-image {
      color: #7092FF;
  }
  
      color: #7092FF;
  }
  
+.layer-list:empty {
+    display: none;
+}
+
  .layer-list > li:first-child {
      border-radius: 3px 3px 0 0;
  }
  .layer-list > li:first-child {
      border-radius: 3px 3px 0 0;
  }
@@ -3241,10 +3763,23 @@ img.wiki-image {
      background-color: #ececec;
  }
  
      background-color: #ececec;
  }
  
-.layer-list li.active {
+.layer-list li.active,
+.layer-list li.switch {
      background: #E8EBFF;
  }
  
      background: #E8EBFF;
  }
  
+.layer-list li.best > div.best {
+    display: inline-block;
+    padding: 5px;
+    float: right;
+}
+
+/* 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 {
+    max-width: 160px;
+}
+
  .layer-list label {
      display: block;
      padding: 5px 10px;
  .layer-list label {
      display: block;
      padding: 5px 10px;
@@ -3258,6 +3793,22 @@ img.wiki-image {
      text-overflow: ellipsis;
  }
  
      text-overflow: ellipsis;
  }
  
+.minimap-toggle {
+    display: block;
+    padding: 5px 10px;
+    cursor: pointer;
+    color: #7092FF;
+    border-radius: 3px;
+}
+
+.minimap-toggle.active {
+    background: #E8EBFF;
+}
+
+.minimap-toggle:hover {
+    background-color: #ececec;
+}
+
  .hide-toggle {
      display: block;
      padding-left:12px;
  .hide-toggle {
      display: block;
      padding-left:12px;
@@ -3284,15 +3835,41 @@ img.wiki-image {
      border-left:  4px solid transparent;
  }
  
      border-left:  4px solid transparent;
  }
  
-.background-control .nudge-container button {
-    float: left;
-    display: block;
-    width:20%;
-    border-right: 1px solid #CCC;
-    position: relative;
+/* Adjust Alignment controls */
+
+.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;
      content: '';
      display: block;
      position: absolute;
@@ -3302,13 +3879,72 @@ img.wiki-image {
      width: 0;
  }
  
      width: 0;
  }
  
-.background-control .nudge.left::after {
+.nudge-container input {
+    width: 100%;
+    height: 20px;
+    text-align: center;
+    border: 0;
+}
+
+.nudge-container input.error {
+    border: 1px solid #FF7878;
+    border-radius: 2px;
+    background: #ffb;
+}
+
+.nudge-container input:focus {
+    background-color: transparent;
+}
+
+.nudge-container button {
+    float: left;
+    display: block;
+    width: 20%;
+    position: relative;
+    background-color: transparent;
+}
+
+.nudge-container button.right {
+    top: -50px;
+    right: -85%;
+}
+
+.nudge-container button.left {
+    top: -50px;
+    right: 45%;
+}
+
+.nudge-container button.top {
+    left: 20%;
+    top: -104px;
+}
+
+.nudge-container button.bottom {
+    left: -20%;
+}
+
+.nudge-container button.nudge-reset {
+    right: -10px;
+}
+
+.nudge-surface {
+   position: absolute;
+   z-index: 5000;
+   left: 0;
+   top: 0;
+   width: 100%;
+   height: 100%;
+   background-color: transparent;
+   cursor: move;
+}
+
+.background-control .nudge.right::after {
      border-top:  5px solid transparent;
      border-bottom:  5px solid transparent;
      border-left:  5px solid #222;
  }
  
      border-top:  5px solid transparent;
      border-bottom:  5px solid transparent;
      border-left:  5px solid #222;
  }
  
-.background-control .nudge.right::after {
+.background-control .nudge.left::after {
      border-top:  5px solid transparent;
      border-bottom:  5px solid transparent;
      border-right:  5px solid #222;
      border-top:  5px solid transparent;
      border-bottom:  5px solid transparent;
      border-right:  5px solid #222;
@@ -3439,7 +4075,7 @@ img.wiki-image {
      float:right;
      margin-left: 20px;
      margin-bottom: 20px;
      float:right;
      margin-left: 20px;
      margin-bottom: 20px;
-    padding-left: 5px
+    padding-left: 5px;
  }
  
  .help-wrap .toc li a,
  }
  
  .help-wrap .toc li a,
@@ -3482,26 +4118,84 @@ img.wiki-image {
      position: relative;
  }
  
      position: relative;
  }
  
-.help-wrap .nav a {
-    float: left;
-    width: 50%;
-    text-align: center;
+.help-wrap .nav a {
+    float: left;
+    width: 50%;
+    text-align: center;
+}
+
+.help-wrap .nav a:first-child {
+    border-radius: 4px 0 0 4px;
+}
+
+.help-wrap .nav a:last-child:not(:only-child) {
+    border-radius: 0 4px 4px 0;
+    border-left: 0;
+}
+
+.help-wrap .nav a:only-child {
+    width: 100%;
+    border-radius: 4px;
+}
+
+
+/* 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;
+
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    opacity: 0;
+
+    -webkit-transition: opacity 200ms linear;
+    transition: opacity 200ms linear;
+    -moz-transition: opacity 200ms linear;
+}
+
+.tile-label-debug {
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    position: absolute;
+    text-align: center;
+    width: 128px;
+    border-radius: 3px;
+    z-index: 2;
+
+    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;
  }
  
  }
  
-.help-wrap .nav a:first-child {
-    border-radius: 4px 0 0 4px;
+img.tile-debug {
+    border: 1px solid red;
  }
  
  }
  
-.help-wrap .nav a:last-child:not(:only-child) {
-    border-radius: 0 4px 4px 0;
-    border-left: 0;
+img.tile-loaded {
+    opacity: 1;
  }
  
  }
  
-.help-wrap .nav a:only-child {
-    width: 100%;
-    border-radius: 4px;
+img.tile-removing {
+    opacity: 0;
  }
  
  }
  
+
  /* Map
  ------------------------------------------------------- */
  
  /* Map
  ------------------------------------------------------- */
  
@@ -3518,13 +4212,14 @@ img.wiki-image {
      -webkit-transform-origin:0 0;
      -moz-transform-origin:0 0;
      -o-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;
  }
  
      -moz-user-select: none;
      -webkit-user-select: none;
      -ms-user-select: none;
      user-select: none;
  }
  
-#supersurface, .layer-layer {
+#supersurface, .layer {
      position: absolute;
      top: 0;
      left: 0;
      position: absolute;
      top: 0;
      left: 0;
@@ -3534,7 +4229,6 @@ img.wiki-image {
  
  /* Map-In-Map
  ------------------------------------------------------- */
  
  /* Map-In-Map
  ------------------------------------------------------- */
-
  .map-in-map {
      position: absolute;
      overflow: hidden;
  .map-in-map {
      position: absolute;
      overflow: hidden;
@@ -3553,19 +4247,31 @@ img.wiki-image {
      -webkit-transform-origin:0 0;
      -moz-transform-origin:0 0;
      -o-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;
  }
  
      -moz-user-select: none;
      -webkit-user-select: none;
      -ms-user-select: none;
      user-select: none;
  }
  
-.map-in-map-svg {
-    position: relative;
+.map-in-map-viewport,
+.map-in-map-data {
+    top: 0;
+    left: 0;
      overflow: hidden;
      height: 100%;
      width: 100%;
  }
  
      overflow: hidden;
      height: 100%;
      width: 100%;
  }
  
+.map-in-map-viewport {
+    position: absolute;
+}
+
+.map-in-map-data {
+    position: relative;
+    z-index: 10;
+}
+
  .map-in-map-bbox {
      fill: none;
      stroke: rgba(255, 255, 0, 0.75);
  .map-in-map-bbox {
      fill: none;
      stroke: rgba(255, 255, 0, 0.75);
@@ -3577,6 +4283,45 @@ img.wiki-image {
      stroke-width: 5;
  }
  
      stroke-width: 5;
  }
  
+
+/* Debug
+------------------------------------------------------- */
+.debug {
+    stroke: currentColor;
+    fill: none;
+    stroke-width: 2;
+}
+.map-in-map-data .debug {
+    stroke-width: 1;
+}
+
+.red     { color: rgba(255, 0, 0, 0.75); }
+.green   { color: rgba(0, 255, 0, 0.75); }
+.blue    { color: rgba(0, 0, 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;
+}
+
  /* Info Box
  ------------------------------------------------------- */
  .infobox {
  /* Info Box
  ------------------------------------------------------- */
  .infobox {
@@ -3589,7 +4334,7 @@ img.wiki-image {
      border-bottom: 1px solid black;
  }
  
      border-bottom: 1px solid black;
  }
  
-.infobox .selection-heading {
+.infobox .infobox-heading {
      display: block;
      border-radius: 4px 0 0 0;
      padding: 5px 10px;
      display: block;
      border-radius: 4px 0 0 0;
      padding: 5px 10px;
@@ -3619,6 +4364,7 @@ img.wiki-image {
      right:0;
      bottom:0;
      border-radius: 0;
      right:0;
      bottom:0;
      border-radius: 0;
+    pointer-events: none;
  }
  
  #attrib {
  }
  
  #attrib {
@@ -3627,7 +4373,6 @@ img.wiki-image {
      margin-bottom: 5px;
      float: left;
      clear: both;
      margin-bottom: 5px;
      float: left;
      clear: both;
-    pointer-events: none;
  }
  
  #attrib * { pointer-events: all; }
  }
  
  #attrib * { pointer-events: all; }
@@ -3660,19 +4405,24 @@ img.wiki-image {
      width: 100%;
      float: left;
      clear: both;
      width: 100%;
      float: left;
      clear: both;
+    pointer-events: all;
  }
  
  #scale-block {
      display: table-cell;
      vertical-align: bottom;
      width: 250px;
  }
  
  #scale-block {
      display: table-cell;
      vertical-align: bottom;
      width: 250px;
-    height: 30px;
+    max-height: 30px;
      float: left;
      clear: left;
      float: left;
      clear: left;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
  }
  
  #info-block {
  }
  
  #info-block {
-    float: right;
+    max-height: 30px;
      clear: right;
  }
  
      clear: right;
  }
  
@@ -3681,6 +4431,10 @@ img.wiki-image {
      width: 100%;
  }
  
      width: 100%;
  }
  
+#scale:hover {
+    cursor: pointer;
+}
+
  #scale text {
      font: 12px sans-serif;
      stroke: none;
  #scale text {
      font: 12px sans-serif;
      stroke: none;
@@ -3699,6 +4453,7 @@ img.wiki-image {
      text-align: right;
      margin-right: 10px;
      clear: right;
      text-align: right;
      margin-right: 10px;
      clear: right;
+    overflow: hidden;
  }
  
  #about-list li {
  }
  
  #about-list li {
@@ -3740,12 +4495,20 @@ img.wiki-image {
      text-align: right;
      width: 100%;
      padding: 0px 10px;
      text-align: right;
      width: 100%;
      padding: 0px 10px;
+    color: #eee;
  }
  
  .api-status.offline,
  .api-status.readonly,
  .api-status.error {
  }
  
  .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
  }
  
  /* Modals
@@ -3808,6 +4571,14 @@ img.wiki-image {
      vertical-align: middle;
  }
  
      vertical-align: middle;
  }
  
+.save-section .buttons .action,
+.save-section .buttons .secondary-action {
+    display: inline-block;
+    margin: 0 20px 0 0;
+    text-align: center;
+    vertical-align: middle;
+}
+
  .loading-modal {
      text-align: center;
  }
  .loading-modal {
      text-align: center;
  }
@@ -3829,7 +4600,7 @@ img.wiki-image {
  }
  
  .modal-actions button:before,
  }
  
  .modal-actions button:before,
-.save-success a.button:before,
+.save-success a.button.osm:before,
  .walkthrough a:before {
      display: block;
      content: '';
  .walkthrough a:before {
      display: block;
      content: '';
@@ -3838,7 +4609,7 @@ img.wiki-image {
      max-width: 100px;
      margin: auto;
      margin-bottom: 10px;
      max-width: 100px;
      margin: auto;
      margin-bottom: 10px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -220px;
+    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -200px -460px;
  }
  
  .modal-actions :first-child {
  }
  
  .modal-actions :first-child {
@@ -3853,46 +4624,38 @@ img.wiki-image {
  ------------------------------------------------------- */
  
  .modal-actions .restore:before {
  ------------------------------------------------------- */
  
  .modal-actions .restore:before {
-    background-position: -600px -220px;
+    background-position: -500px -460px;
  }
  
  .modal-actions .reset:before {
  }
  
  .modal-actions .reset:before {
-    background-position: -700px -220px;
+    background-position: -600px -460px;
  }
  
  /* Success Modal
  ------------------------------------------------------- */
  
  .save-success p {
  }
  
  /* Success Modal
  ------------------------------------------------------- */
  
  .save-success p {
-    padding: 15px;
+    padding: 15px 15px 0 15px;
+}
+.save-success a.details {
+  padding-left: 15px;
  }
  }
-
  .save-success .button {
      padding-top: 15px;
  }
  
  .save-success .button {
      padding-top: 15px;
  }
  
-.save-success .button.social {
-    height: 80px;
+.save-success a.button.social {
+    height: auto;
  }
  
  }
  
-.save-success .button.social:before {
-    height: 50px;
+.save-success .icon.social {
+    height: 80px;
+    width: 80px;
+    color: #7092FF;
  }
  
  .save-success .button.osm:before {
  }
  
  .save-success .button.osm:before {
-    background-position: 0px -220px;
-}
-
-.save-success .button.twitter:before {
-    background-position: -100px -245px;
-}
-
-.save-success .button.facebook:before {
-    background-position: -200px -245px;
-}
-
-.save-success .button.google:before {
-    background-position: -300px -245px;
+    background-position: -200px -460px;
  }
  
  /* Splash Modal
  }
  
  /* Splash Modal
@@ -3900,11 +4663,11 @@ img.wiki-image {
  
  .modal-actions .walkthrough:before,
  .walkthrough a:before {
  
  .modal-actions .walkthrough:before,
  .walkthrough a:before {
-    background-position: -400px -220px;
+    background-position: -300px -460px;
  }
  
  .modal-actions .start:before {
  }
  
  .modal-actions .start:before {
-    background-position: -500px -220px;
+    background-position: -400px -460px;
  }
  
  /* Commit Modal
  }
  
  /* Commit Modal
@@ -4062,10 +4825,6 @@ img.wiki-image {
      margin-right:10px;
  }
  
      margin-right:10px;
  }
  
-.icon.zoom-in-invert {
-    background-position: -240px -40px;
-}
-
  /* Tooltips
  ------------------------------------------------------- */
  
  /* Tooltips
  ------------------------------------------------------- */
  
@@ -4274,29 +5033,37 @@ img.wiki-image {
  }
  
  .radial-menu-background {
  }
  
  .radial-menu-background {
+    fill: none;
      stroke: black;
      stroke-opacity: 0.5;
  }
  
      stroke: black;
      stroke-opacity: 0.5;
  }
  
-.radial-menu-item {
-    fill: white;
-}
-
-.radial-menu-item:hover {
-    fill: #ececec;
+.radial-menu-item circle {
+    fill: #eee;
  }
  
  }
  
-.radial-menu-item:active {
-    fill: #ececec;
+.radial-menu-item circle:active,
+.radial-menu-item circle:hover {
+    fill: #fff;
  }
  
  }
  
-.radial-menu-item.disabled {
+.radial-menu-item.disabled circle {
      cursor: auto;
      fill: rgba(255,255,255,.5);
  }
  
      cursor: auto;
      fill: rgba(255,255,255,.5);
  }
  
-.lasso-box {
-    fill-opacity:0.1;
+.radial-menu-item use {
+    fill: #222;
+    color: #79f;
+}
+
+.radial-menu-item.disabled use {
+    fill: rgba(32,32,32,.5);
+    color: rgba(40,40,40,.5);
+}
+
+.lasso-path {
+    fill-opacity:0.3;
      stroke: #fff;
      stroke-width: 1;
      stroke-opacity: 1;
      stroke: #fff;
      stroke-width: 1;
      stroke-opacity: 1;
@@ -4307,7 +5074,6 @@ img.wiki-image {
  ------------------------------------------------------- */
  
  @media only screen and (max-width: 840px) {
  ------------------------------------------------------- */
  
  @media only screen and (max-width: 840px) {
-    #bar .icon.icon-pre-text { margin-right: 0;}
      /* override hide for save button */
      #bar .save .label { display: block;}
  }
      /* override hide for save button */
      #bar .save .label { display: block;}
  }
@@ -4381,11 +5147,12 @@ img.wiki-image {
      background: #8cd05f;
  }
  
      background: #8cd05f;
  }
  
-.intro-nav-wrap button.step .icon {
+.intro-nav-wrap button.step .status {
+    margin-left: 3px;
      display: none;
  }
  
      display: none;
  }
  
-.intro-nav-wrap button.step.finished .icon {
+.intro-nav-wrap button.step.finished .status {
      display: inline-block;
  }
  
      display: inline-block;
  }
  
@@ -4429,7 +5196,7 @@ img.wiki-image {
      content: "";
      height: 80px;
      width: 200px;
      content: "";
      height: 80px;
      width: 200px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -320px;
+    background:transparent url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat 0 -320px;
  }
  
  .intro-areas-add .tooltip-inner::before {
  }
  
  .intro-areas-add .tooltip-inner::before {
@@ -4449,189 +5216,380 @@ img.wiki-image {
  .huge-modal-button .illustration {
      height: 100px;
      width: 100px;
  .huge-modal-button .illustration {
      height: 100px;
      width: 100px;
-    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -400px -220px;
+    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px;
      margin: auto;
  }
      margin: auto;
  }
-/* This file is generated by make. Do NOT edit manually. */
-
-.preset-icon{background-image:url(<%= asset_path("iD/img/maki-sprite.png") %>);background-repeat:no-repeat;width:24px;height:24px;}
-.preset-icon-line{background-image:url(<%= asset_path("iD/img/line-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;}
-.preset-icon-relation{background-image:url(<%= asset_path("iD/img/relation-presets.png") %>);background-repeat:no-repeat;width:60px;height:60px;}
-.feature-circle-stroked{background-position:-0px -0px;}
-.feature-circle{background-position:-54px -0px;}
-.feature-square-stroked{background-position:-108px -0px;}
-.feature-square{background-position:-162px -0px;}
-.feature-triangle-stroked{background-position:-216px -0px;}
-.feature-triangle{background-position:-0px -24px;}
-.feature-star-stroked{background-position:-54px -24px;}
-.feature-star{background-position:-108px -24px;}
-.feature-cross{background-position:-162px -24px;}
-.feature-marker-stroked{background-position:-216px -24px;}
-.feature-marker{background-position:-0px -48px;}
-.feature-religious-jewish{background-position:-54px -48px;}
-.feature-religious-christian{background-position:-108px -48px;}
-.feature-religious-muslim{background-position:-162px -48px;}
-.feature-cemetery{background-position:-216px -48px;}
-.feature-rocket{background-position:-0px -72px;}
-.feature-airport{background-position:-54px -72px;}
-.feature-heliport{background-position:-108px -72px;}
-.feature-rail{background-position:-162px -72px;}
-.feature-rail-metro{background-position:-216px -72px;}
-.feature-rail-light{background-position:-0px -96px;}
-.feature-bus{background-position:-54px -96px;}
-.feature-fuel{background-position:-108px -96px;}
-.feature-parking{background-position:-162px -96px;}
-.feature-parking-garage{background-position:-216px -96px;}
-.feature-airfield{background-position:-0px -120px;}
-.feature-roadblock{background-position:-54px -120px;}
-.feature-ferry{background-position:-108px -120px;}
-.feature-harbor{background-position:-162px -120px;}
-.feature-bicycle{background-position:-216px -120px;}
-.feature-park{background-position:-0px -144px;}
-.feature-park2{background-position:-54px -144px;}
-.feature-museum{background-position:-108px -144px;}
-.feature-lodging{background-position:-162px -144px;}
-.feature-monument{background-position:-216px -144px;}
-.feature-zoo{background-position:-0px -168px;}
-.feature-garden{background-position:-54px -168px;}
-.feature-campsite{background-position:-108px -168px;}
-.feature-theatre{background-position:-162px -168px;}
-.feature-art-gallery{background-position:-216px -168px;}
-.feature-pitch{background-position:-0px -192px;}
-.feature-soccer{background-position:-54px -192px;}
-.feature-america-football{background-position:-108px -192px;}
-.feature-tennis{background-position:-162px -192px;}
-.feature-basketball{background-position:-216px -192px;}
-.feature-baseball{background-position:-0px -216px;}
-.feature-golf{background-position:-54px -216px;}
-.feature-swimming{background-position:-108px -216px;}
-.feature-cricket{background-position:-162px -216px;}
-.feature-skiing{background-position:-216px -216px;}
-.feature-school{background-position:-0px -240px;}
-.feature-college{background-position:-54px -240px;}
-.feature-library{background-position:-108px -240px;}
-.feature-post{background-position:-162px -240px;}
-.feature-fire-station{background-position:-216px -240px;}
-.feature-town-hall{background-position:-0px -264px;}
-.feature-police{background-position:-54px -264px;}
-.feature-prison{background-position:-108px -264px;}
-.feature-embassy{background-position:-162px -264px;}
-.feature-beer{background-position:-216px -264px;}
-.feature-restaurant{background-position:-0px -288px;}
-.feature-cafe{background-position:-54px -288px;}
-.feature-shop{background-position:-108px -288px;}
-.feature-fast-food{background-position:-162px -288px;}
-.feature-bar{background-position:-216px -288px;}
-.feature-bank{background-position:-0px -312px;}
-.feature-grocery{background-position:-54px -312px;}
-.feature-cinema{background-position:-108px -312px;}
-.feature-pharmacy{background-position:-162px -312px;}
-.feature-hospital{background-position:-216px -312px;}
-.feature-danger{background-position:-0px -336px;}
-.feature-industrial{background-position:-54px -336px;}
-.feature-warehouse{background-position:-108px -336px;}
-.feature-commercial{background-position:-162px -336px;}
-.feature-building{background-position:-216px -336px;}
-.feature-place-of-worship{background-position:-0px -360px;}
-.feature-alcohol-shop{background-position:-54px -360px;}
-.feature-logging{background-position:-108px -360px;}
-.feature-oil-well{background-position:-162px -360px;}
-.feature-slaughterhouse{background-position:-216px -360px;}
-.feature-dam{background-position:-0px -384px;}
-.feature-water{background-position:-54px -384px;}
-.feature-wetland{background-position:-108px -384px;}
-.feature-disability{background-position:-162px -384px;}
-.feature-telephone{background-position:-216px -384px;}
-.feature-emergency-telephone{background-position:-0px -408px;}
-.feature-toilets{background-position:-54px -408px;}
-.feature-waste-basket{background-position:-108px -408px;}
-.feature-music{background-position:-162px -408px;}
-.feature-land-use{background-position:-216px -408px;}
-.feature-city{background-position:-0px -432px;}
-.feature-town{background-position:-54px -432px;}
-.feature-village{background-position:-108px -432px;}
-.feature-farm{background-position:-162px -432px;}
-.feature-bakery{background-position:-216px -432px;}
-.feature-dog-park{background-position:-0px -456px;}
-.feature-lighthouse{background-position:-54px -456px;}
-.feature-clothing-store{background-position:-108px -456px;}
-.feature-polling-place{background-position:-162px -456px;}
-.feature-playground{background-position:-216px -456px;}
-.feature-entrance{background-position:-0px -480px;}
-.feature-heart{background-position:-54px -480px;}
-.feature-london-underground{background-position:-108px -480px;}
-.feature-minefield{background-position:-162px -480px;}
-.feature-rail-underground{background-position:-216px -480px;}
-.feature-rail-above{background-position:-0px -504px;}
-.feature-camera{background-position:-54px -504px;}
-.feature-laundry{background-position:-108px -504px;}
-.feature-car{background-position:-162px -504px;}
-.feature-suitcase{background-position:-216px -504px;}
-.feature-hairdresser{background-position:-0px -528px;}
-.feature-chemist{background-position:-54px -528px;}
-.feature-mobilephone{background-position:-108px -528px;}
-.feature-scooter{background-position:-162px -528px;}
-.feature-gift{background-position:-216px -528px;}
-.feature-ice-cream{background-position:-0px -552px;}
-.preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
-.preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
-.preset-icon-line.feature-highway-primary{background-position:-140px -25px;}
-.preset-icon-line.feature-highway-secondary{background-position:-200px -25px;}
-.preset-icon-line.feature-highway-tertiary{background-position:-260px -25px;}
-.preset-icon-line.feature-highway-motorway-link{background-position:-320px -25px;}
-.preset-icon-line.feature-highway-trunk-link{background-position:-380px -25px;}
-.preset-icon-line.feature-highway-primary-link{background-position:-440px -25px;}
-.preset-icon-line.feature-highway-secondary-link{background-position:-500px -25px;}
-.preset-icon-line.feature-highway-tertiary-link{background-position:-560px -25px;}
-.preset-icon-line.feature-highway-residential{background-position:-620px -25px;}
-.preset-icon-line.feature-highway-unclassified{background-position:-680px -25px;}
-.preset-icon-line.feature-highway-service{background-position:-740px -25px;}
-.preset-icon-line.feature-highway-road{background-position:-800px -25px;}
-.preset-icon-line.feature-highway-track{background-position:-860px -25px;}
-.preset-icon-line.feature-highway-living-street{background-position:-920px -25px;}
-.preset-icon-line.feature-highway-path{background-position:-980px -25px;}
-.preset-icon-line.feature-highway-cycleway{background-position:-1040px -25px;}
-.preset-icon-line.feature-highway-footway{background-position:-1100px -25px;}
-.preset-icon-line.feature-highway-bridleway{background-position:-1160px -25px;}
-.preset-icon-line.feature-highway-steps{background-position:-1220px -25px;}
-.preset-icon-line.feature-railway-rail{background-position:-1280px -25px;}
-.preset-icon-line.feature-railway-disused{background-position:-1340px -25px;}
-.preset-icon-line.feature-railway-abandoned{background-position:-1400px -25px;}
-.preset-icon-line.feature-railway-subway{background-position:-1460px -25px;}
-.preset-icon-line.feature-railway-light-rail{background-position:-1520px -25px;}
-.preset-icon-line.feature-railway-monorail{background-position:-1580px -25px;}
-.preset-icon-line.feature-waterway-river{background-position:-1640px -25px;}
-.preset-icon-line.feature-waterway-stream{background-position:-1700px -25px;}
-.preset-icon-line.feature-waterway-canal{background-position:-1760px -25px;}
-.preset-icon-line.feature-waterway-ditch{background-position:-1820px -25px;}
-.preset-icon-line.feature-power-line{background-position:-1880px -25px;}
-.preset-icon-line.feature-other-line{background-position:-1940px -25px;}
-.preset-icon-line.feature-category-roads{background-position:-2000px -25px;}
-.preset-icon-line.feature-category-rail{background-position:-2060px -25px;}
-.preset-icon-line.feature-category-path{background-position:-2120px -25px;}
-.preset-icon-line.feature-category-water{background-position:-2180px -25px;}
-.preset-icon-line.feature-ferry{background-position:-2240px -25px;}
-.preset-icon-line.feature-pipeline{background-position:-2300px -25px;}
-.preset-icon-relation.feature-relation{background-position:-20px -25px;}
-.preset-icon-relation.feature-restriction{background-position:-80px -25px;}
-.preset-icon-relation.feature-multipolygon{background-position:-141px -25px;}
-.preset-icon-relation.feature-boundary{background-position:-200px -25px;}
-.preset-icon-relation.feature-route{background-position:-260px -25px;}
-.preset-icon-relation.feature-route-road{background-position:-320px -25px;}
-.preset-icon-relation.feature-route-bicycle{background-position:-380px -25px;}
-.preset-icon-relation.feature-route-foot{background-position:-440px -25px;}
-.preset-icon-relation.feature-route-bus{background-position:-500px -25px;}
-.preset-icon-relation.feature-route-train{background-position:-560px -25px;}
-.preset-icon-relation.feature-route-detour{background-position:-620px -25px;}
-.preset-icon-relation.feature-route-tram{background-position:-680px -25px;}
-.preset-icon-relation.feature-route-ferry{background-position:-740px -25px;}
-.preset-icon-relation.feature-route-power{background-position:-800px -25px;}
-.preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;}
-.preset-icon-relation.feature-route-master{background-position:-920px -25px;}
-.preset-icon-relation.feature-restriction-no-straight-on{background-position:-980px -25px;}
-.preset-icon-relation.feature-restriction-no-u-turn{background-position:-1040px -25px;}
-.preset-icon-relation.feature-restriction-no-left-turn{background-position:-1100px -25px;}
-.preset-icon-relation.feature-restriction-no-right-turn{background-position:-1160px -25px;}
-.preset-icon-relation.feature-restriction-only-straight-on{background-position:-1220px -25px;}
-.preset-icon-relation.feature-restriction-only-left-turn{background-position:-1280px -25px;}
-.preset-icon-relation.feature-restriction-only-right-turn{background-position:-1340px -25px;}
+
+.mapillary-wrap {
+    position: absolute;
+    bottom: 30px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
+}
+
+.mapillary-wrap.hidden {
+    visibility: hidden;
+}
+
+.mapillary-wrap button.thumb-hide {
+    border-radius: 0;
+    padding: 5px;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 500;
+}
+
+.mly-wrapper {
+    visibility: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.mly-wrapper.active {
+    visibility: visible;
+}
+
+/* Right-to-left localization settings */
+
+[dir='rtl'] #sidebar {
+  float: right;
+}
+
+[dir='rtl'] #sidebar .search-header .icon {
+  left: auto;
+  right: 10px;
+}
+
+/* header */
+[dir='rtl'] .header h3 {
+  text-align: right;
+  padding: 20px 40px 20px 20px;
+}
+
+[dir='rtl'] .entity-editor-pane .header button.preset-choose {
+  left: auto;
+  right: 0;
+}
+
+[dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .preset-icon-fill-area {
+  left: auto;
+  right: 10px;
+}
+
+[dir='rtl'] .map-data-control .layer-list button, [dir='rtl'] .background-control .layer-list button {
+  float: left;
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .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;
+}
+
+/* search */
+[dir='rtl'] .feature-list-item .label {
+  text-align: right;
+}
+
+[dir='rtl'] .feature-list-item .entity-name {
+  padding-left: 0;
+  padding-right: 10px;
+}
+
+/* preset form */
+[dir='rtl'] .form-label {
+  padding: 5px 10px 5px 0;
+}
+
+[dir='rtl'] .form-label button {
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .more-fields label {
+  padding: 5px 0 5px 10px;
+}
+
+[dir='rtl'] .form-label-button-wrap {
+  text-align: left;
+}
+
+[dir='rtl'] button.minor {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .form-field .localized-main {
+  padding-left: 10%;
+  padding-right: 10px;
+}
+
+[dir='rtl'] .combobox-caret {
+  margin-left: 0;
+  margin-right: -30px;
+}
+
+[dir='rtl'] .form-field .button-input-action {
+  margin-left: 0;
+  margin-right: -10%;
+}
+
+[dir='rtl'] .icon.pre-text {
+  margin-left: 5px;
+  margin-right: 0;
+}
+
+[dir='rtl'] .notice .zoom-to .icon {
+  margin-left: 10px;
+  margin-right: 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;
+}
+
+[dir='rtl'] .preset-icon-frame {
+  left: auto;
+  right: 7px;
+}
+
+[dir='rtl'] .preset-list-item button.tag-reference-button {
+  left: 0;
+  right: auto;
+  border-radius: 3px 0 0 3px;
+}
+
+[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;
+}
+
+[dir='rtl'] .form-field .maxspeed-unit {
+  border-radius: 0 0 0 4px;
+}
+
+[dir='rtl'] input[type="checkbox"], [dir='rtl'] input[type="radio"] {
+  float: right;
+  margin-left: 5px;
+  margin-right: 0;
+}
+
+[dir='rtl'] .preset-input-wrap .col6 {
+  float: right;
+}
+
+/* tags form */
+[dir='rtl'] .tag-row .key-wrap,
+[dir='rtl'] .tag-row .input-wrap-position {
+  float: right;
+}
+
+[dir='rtl'] .tag-row input {
+  border-left: none;
+  border-right: 1px solid #CCC;
+}
+
+[dir='rtl'] .tag-row:first-child input.key {
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
+}
+
+[dir='rtl'] .tag-row button {
+  left: 10%;
+  border-left-width: 1px;
+}
+
+[dir='rtl'] .tag-row .tag-reference-button {
+  left: auto;
+  right: auto;
+  margin-right: 35px;
+  border-left-width: 1px;
+  border-right-width: 0;
+}
+
+[dir='rtl'] .tag-row:first-child .tag-reference-button {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 0;
+}
+
+[dir='rtl'] .tag-row:last-child .tag-reference-button {
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 0;
+}
+
+/* map control buttons */
+[dir='rtl'] .map-controls {
+  left: 0;
+  right: auto;
+}
+
+[dir='rtl'] .background-control button,
+[dir='rtl'] .zoombuttons button.zoom-in {
+  border-radius: 0 4px 0 0;
+}
+
+[dir='rtl'] .help-control button,
+[dir='rtl'] .geolocate-control button {
+  border-radius: 0 0 4px 0;
+}
+
+[dir='rtl'] .list-item-gpx-browse svg {
+  transform: rotateY(180deg);
+}
+
+/* map control button overlays */
+[dir='rtl'] .map-overlay {
+  padding: 20px 20px 20px 50px;
+  left: 0;
+  right: auto !important;
+}
+
+[dir='rtl'] .opacity-options {
+  left: 50px;
+  right: auto;
+}
+
+[dir='rtl'] .hide-toggle {
+  padding-left: 0;
+  padding-right: 12px;
+}
+
+[dir='rtl'] .hide-toggle:before {
+  left: auto;
+  right: 0;
+  border-left: none;
+  border-right: 8px solid #7092ff;
+}
+
+[dir='rtl'] .hide-toggle.expanded:before {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+}
+
+/* navbar */
+[dir='rtl'] #bar .spacer,
+[dir='rtl'] #bar .button-wrap,
+[dir='rtl'] #bar .button-wrap button {
+  float: right;
+}
+
+[dir='rtl'] .add-point .tooltip {
+  left: inherit !important;
+}
+
+[dir='rtl'] .button-wrap:last-of-type {
+  padding-left: 0;
+  padding-right: 10px;
+}
+
+[dir='rtl'] button.save.has-count .count {
+  margin-left: auto;
+  margin-right: 8%;
+}
+
+[dir='rtl'] button.save.has-count .count::before {
+  border-left: 6px solid rgba(255,255,255,.5);
+  border-right: none;
+  left: auto;
+  right: -6px;
+}
+
+[dir='rtl'] .joined button {
+  border-left: 1px solid rgba(0,0,0,.5);
+  border-right: none;
+}
+
+[dir='rtl'] .joined button:first-child {
+  border-radius: 0 4px 4px 0;
+}
+
+[dir='rtl'] .joined button:last-child {
+  border-radius: 4px 0 0 4px;
+}
+
+[dir='rtl'] .spinner {
+  float: left;
+}
+
+[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";
+}
+
+/* footer */
+[dir='rtl'] #scale-block {
+  float: right;
+  clear: right;
+}
+
+[dir='rtl'] #info-block {
+  clear: left;
+}
+
+[dir='rtl'] #about-list {
+  text-align: left;
+  clear: left;
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+[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;
+}
+
+[dir='rtl'] #about-list li:last-child {
+  border-right: none;
+}
+
+[dir='rtl'] #scale text {
+  text-anchor: end;
+}
+
+/* increment / decrement control - code by Naoufel Razouane */
+
+[dir='rtl'] .spin-control{
+  margin-left: 0;
+  margin-right: -20%;
+}
+[dir='rtl'] .spin-control button{
+  border-left: 0;
+  border-right: 1px solid #CCC;
+}
+[dir='rtl'] .spin-control button.decrement{
+  border-bottom-right-radius: 0;
+}
+[dir='rtl'] .spin-control button.increment{
+  border-bottom-left-radius: 3px;
+}