X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1779347849622ade2abf4926a2db867d69f72033..d83954a8d10cbfc50a2d4f47e8ceb8f33801feb8:/vendor/assets/iD/iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 12773334b..0a926963e 100644
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -180,15 +180,21 @@ img.tile {
 img.tile-loaded {
     opacity: 1;
 }
+img.tile-removing {
+    opacity: 0;
+}
+
+use { pointer-events: none; }
 
 /* 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,
@@ -200,11 +206,6 @@ path.shadow {
     pointer-events: stroke;
 }
 
-.shadow {
-    -webkit-transition: 200ms;
-       -moz-transition: 200ms;
-            transition: 200ms;
-}
 
 /* points */
 
@@ -221,7 +222,7 @@ g.point .shadow {
     stroke-opacity: 0;
 }
 
-.behavior-hover g.point.hover:not(.selected) .shadow {
+g.point.hover:not(.selected) .shadow {
     stroke-opacity: 0.5;
 }
 
@@ -236,7 +237,7 @@ g.point.active, g.point.active * {
 /* vertices and midpoints */
 
 g.vertex .fill {
-    fill: none;
+    fill: #000;
 }
 
 g.vertex .stroke {
@@ -249,15 +250,24 @@ g.vertex.shared .stroke {
     fill: #aaa;
 }
 
-g.vertex.tagged .fill {
-    fill: #000;
+g.midpoint .fill {
+    fill: #eee;
+    stroke: #444;
+    stroke-opacity: .6;
+    opacity: .7;
 }
 
-g.midpoint .fill {
-    fill: #ddd;
-    stroke: black;
-    stroke-opacity: .5;
-    opacity: .5;
+g.midpoint.tag-highway-corridor .fill,
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {
+    fill: #fff;
+    stroke: #333;
+    stroke-opacity: .8;
+    opacity: .8;
 }
 
 g.vertex .shadow,
@@ -270,42 +280,46 @@ g.vertex.vertex-hover {
     display: none;
 }
 
-.mode-draw-area .behavior-hover g.vertex.vertex-hover,
-.mode-draw-line .behavior-hover g.vertex.vertex-hover,
-.mode-add-area  .behavior-hover g.vertex.vertex-hover,
-.mode-add-line  .behavior-hover g.vertex.vertex-hover,
-.mode-add-point .behavior-hover g.vertex.vertex-hover,
-.mode-drag-node .behavior-hover g.vertex.vertex-hover {
+.mode-draw-area g.vertex.vertex-hover,
+.mode-draw-line g.vertex.vertex-hover,
+.mode-add-area  g.vertex.vertex-hover,
+.mode-add-line  g.vertex.vertex-hover,
+.mode-add-point g.vertex.vertex-hover,
+.mode-drag-node g.vertex.vertex-hover {
     display: block;
 }
 
-.behavior-hover g.vertex.hover:not(.selected) .shadow,
-.behavior-hover g.midpoint.hover:not(.selected) .shadow {
-    fill-opacity: 0.3;
+g.vertex.hover:not(.selected) .shadow,
+g.midpoint.hover:not(.selected) .shadow {
+    fill-opacity: 0.5;
 }
 
 g.vertex.selected .shadow {
-    fill-opacity: 0.5;
+    fill-opacity: 0.7;
 }
 
 .mode-draw-area g.midpoint,
 .mode-draw-line g.midpoint,
 .mode-add-area g.midpoint,
 .mode-add-line g.midpoint,
-.mode-add-point g.midpoint,
-.mode-drag-node g.midpoint {
+.mode-add-point g.midpoint {
   display: none;
 }
 
 /* lines */
 
+.preset-icon .icon.other-line {
+    color: #fff;
+    fill: #777;
+}
+
 path.line {
     stroke-linecap: round;
     stroke-linejoin: bevel;
 }
 
 path.stroke {
-    stroke: black;
+    stroke: #000;
     stroke-width: 4;
 }
 
@@ -315,268 +329,310 @@ path.shadow {
     stroke-opacity: 0;
 }
 
-.behavior-hover path.shadow.hover:not(.selected) {
-    stroke-opacity: 0.3;
+path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4;
 }
 
 path.shadow.selected {
     stroke-opacity: 0.7;
 }
 
-path.area.stroke,
-path.line.member-type-multipolygon.stroke {
-    stroke-width:2;
-}
-path.area.stroke.selected,
-path.line.member-type-multipolygon.stroke.selected {
-    stroke-width:4 !important;
+path.line.stroke {
+    stroke: #fff;
+    stroke-width: 2;
 }
 
 path.area.stroke {
-    stroke:#fff;
+    stroke: #fff;
+    stroke-width: 1;
 }
 path.area.fill {
-    fill:#fff;
-    fill-opacity:0.3;
+    stroke-width: 0;
+    stroke: rgba(255, 255, 255, 0.3);
+    fill: rgba(255, 255, 255, 0.3);
     fill-rule: evenodd;
 }
-
-path.line.stroke {
-    stroke: white;
-    stroke-width: 2;
+.preset-icon-fill-area {
+    border: 1px solid rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
 path.stroke.tag-natural {
-    stroke: #b6e199;
-    stroke-width:1;
+    stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {
-    fill: #b6e199;
-}
-
-path.stroke.tag-natural-water {
-    stroke: #77d3de;
-}
-path.fill.tag-natural-water {
-    fill: #77d3de;
-}
-
-path.stroke.tag-amenity-school {
-    stroke: #ffff94;
-    stroke-width: 1;
+    stroke: rgba(182, 225, 153, 0.3);
+    fill: rgba(182, 225, 153, 0.3);
 }
-path.fill.tag-amenity-school {
-    fill: #ffff94;
-    fill-opacity: 0.2;
+.preset-icon-fill-area.tag-natural {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.3);
 }
 
-path.stroke.tag-amenity-university {
-    stroke: #ffff94;
-}
-path.fill.tag-amenity-university {
-    fill: #ffff94;
-    fill-opacity: 0.1;
-}
-
-path.stroke.tag-building {
-    stroke: #e06e5f;
-    stroke-width: 1;
-}
-path.fill.tag-building {
-    fill: #e06e5f;
-}
-
-/* Landuse */
-
-
 path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-natural-grass,
+path.stroke.tag-leisure-nature_reserve,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
-    stroke: #8cd05f;
-    stroke-width: 1;
+    stroke: rgb(140, 208, 95);
+}
+path.fill.tag-landuse,
+path.fill.tag-natural-wood,
+path.fill.tag-natural-tree,
+path.fill.tag-natural-grassland,
+path.fill.tag-natural-grass,
+path.fill.tag-leisure-nature_reserve,
+path.fill.tag-leisure-pitch,
+path.fill.tag-leisure-park {
+    stroke: rgba(140, 208, 95, 0.3);
+    fill: rgba(140, 208, 95, 0.3);
+}
+.preset-icon-fill-area.tag-landuse,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-natural-tree,
+.preset-icon-fill-area.tag-natural-grassland,
+.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-leisure-nature_reserve,
+.preset-icon-fill-area.tag-leisure-pitch,
+.preset-icon-fill-area.tag-leisure-park {
+    border-color: rgb(140, 208, 95);
+    background-color: rgba(140, 208, 95, 0.3);
+}
+
+path.stroke.tag-amenity-swimming_pool,
+path.stroke.tag-leisure-swimming_pool,
+path.stroke.tag-natural-water,
+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-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-basin,
+.preset-icon-fill-area.tag-landuse-reservoir,
+.preset-icon-fill-area.tag-natural-water {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
+}
+
+path.stroke.tag-amenity-childcare,
+path.stroke.tag-amenity-kindergarten,
+path.stroke.tag-amenity-school,
+path.stroke.tag-amenity-college,
+path.stroke.tag-amenity-university {
+    stroke: rgb(255, 255, 148);
+}
+path.fill.tag-amenity-childcare,
+path.fill.tag-amenity-kindergarten,
+path.fill.tag-amenity-school,
+path.fill.tag-amenity-college,
+path.fill.tag-amenity-university {
+    stroke: rgba(255, 255, 148, 0.15);
+    fill: rgba(255, 255, 148, 0.15);
+}
+.preset-icon-fill-area.tag-amenity-childcare,
+.preset-icon-fill-area.tag-amenity-kindergarten,
+.preset-icon-fill-area.tag-amenity-school,
+.preset-icon-fill-area.tag-amenity-college,
+.preset-icon-fill-area.tag-amenity-university {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.15);
 }
 
 path.stroke.tag-landuse-residential {
-    stroke: #e06e5f;
+    stroke: rgb(196, 189, 25);
+}
+path.fill.tag-landuse-residential {
+    stroke: rgba(196, 189, 25, 0.3);
+    fill: rgba(196, 189, 25, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-residential {
+    border-color: rgb(196, 189, 25);
+    background: rgba(196, 189, 25, 0.3);
 }
 
 path.stroke.tag-landuse-retail,
 path.stroke.tag-landuse-commercial {
-    stroke: #eab056;
+    stroke: rgb(214, 136, 26);
+}
+path.fill.tag-landuse-retail,
+path.fill.tag-landuse-commercial {
+    stroke: rgba(214, 136, 26, 0.3);
+    fill: rgba(214, 136, 26, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-retail,
+.preset-icon-fill-area.tag-landuse-commercial {
+    border-color: rgb(214, 136, 26);
+    background-color: rgba(214, 136, 26, 0.3);
 }
 
 path.stroke.tag-landuse-industrial {
-    stroke: #e4a4f5;
+    stroke: rgb(228, 164, 245);
 }
-
-path.stroke.tag-landuse-basin,
-path.stroke.tag-landuse-reservoir {
-    stroke: #77d3de;
+path.fill.tag-landuse-industrial {
+    stroke: rgba(228, 164, 245, 0.3);
+    fill: rgba(228, 164, 245, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-industrial {
+    border-color: rgb(228, 164, 245);
+    background-color: rgba(228, 164, 245, 0.3);
 }
 
 path.stroke.tag-landuse-quarry {
-    stroke: #a6957b;
+    stroke: rgb(166, 149, 123);
 }
-
-path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse-construction {
-    stroke: #e06e5f;
+path.fill.tag-landuse-quarry {
+    stroke: rgba(166, 149, 123, 0.2);
+    fill: rgba(166, 149, 123, 0.2);
 }
-
-path.stroke.tag-landuse-meadow,
-path.stroke.tag-natural-wetland {
-    stroke: #b6e199;
+.preset-icon-fill-area.tag-landuse-quarry {
+    border-color: rgb(166, 149, 123);
+    background-color: rgba(166, 149, 123, 0.2);
 }
 
-path.stroke.tag-natural-beach {
-    stroke: #ffff7e;
+path.stroke.tag-landuse-landfill {
+    stroke: rgb(255, 153, 51);
 }
-
-path.stroke.tag-natural-scrub {
-    stroke: #dbf08b;
+path.fill.tag-landuse-landfill {
+    stroke: rgba(255, 153, 51, 0.2);
+    fill: rgba(255, 153, 51, 0.2);
 }
-
-path.fill.tag-landuse,
-path.fill.tag-natural-wood,
-path.fill.tag-natural-tree,
-path.fill.tag-natural-grassland,
-path.fill.tag-natural-grass,
-path.fill.tag-leisure-pitch,
-path.fill.tag-leisure-park {
-    fill: #8cd05f;
-    fill-opacity: 0.2;
+.preset-icon-fill-area.tag-landuse-landfill {
+    border-color: rgb(255, 153, 51);
+    background-color: rgba(255, 153, 51, 0.2);
 }
 
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-residential,
-path.fill.tag-landuse-commercial,
-path.fill.tag-landuse-industrial {
-    fill-opacity: 0.1;
-}
-
-path.fill.tag-natural-wetland,
-path.fill.tag-natural-beach,
-path.fill.tag-natural-scrub,
-path.fill.tag-landuse-cemetery,
-path.fill.tag-landuse-meadow,
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland,
-path.fill.tag-landuse-construction,
-path.fill.tag-landuse-orchard {
-    /* background color is applied a further opacity later */
-    fill-opacity: 0.8;
-}
-
-.pattern-color-beach,
-.pattern-color-scrub,
-.pattern-color-meadow,
-.pattern-color-wetland,
-.pattern-color-cemetery,
-.pattern-color-farm,
-.pattern-color-farmland,
-.pattern-color-construction,
-.pattern-color-orchard {
-    fill-opacity: 0.2;
+.pattern-color-construction {
+    fill: rgba(196, 189, 25, 0.2);
 }
-
-path.fill.tag-landuse-basin,
-path.fill.tag-landuse-reservoir {
-    fill: #77d3de;
+path.stroke.tag-landuse.tag-status {
+    stroke: rgb(196, 189, 25);
 }
-
-path.fill.tag-landuse-quarry {
-    fill: #a6957b;
+.preset-icon-fill-area.tag-landuse.tag-status {
+    border-color: rgb(196, 189, 25);
+    background-color: rgba(196, 189, 25, 0.2);
 }
 
-path.fill.tag-landuse-residential {
-    fill: #e06e5f;
+path.stroke.tag-landuse-military {
+    stroke: rgb(214, 136, 26);
 }
-
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+path.fill.tag-landuse-military {
+    stroke: rgba(214, 136, 26, 0.2);
+    fill: rgba(214, 136, 26, 0.2);
 }
-
-.pattern-color-farm,
-.pattern-color-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+.preset-icon-fill-area.tag-landuse-military {
+    border-color: rgb(214, 136, 26);
+    background-color: rgba(214, 136, 26, 0.2);
 }
 
-path.fill.tag-landuse-meadow {
-    fill: url(#pattern-meadow) #b6e199;
+.pattern-color-wetland {
+    fill: rgba(182, 225, 153, 0.2);
 }
-.pattern-color-meadow {
-    fill: #b6e199;
+path.stroke.tag-natural-wetland {
+    stroke: rgb(182, 225, 153);
+}
+.preset-icon-fill-area.tag-natural-wetland {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
 }
 
-path.fill.tag-natural-wetland {
-    fill: url(#pattern-wetland) #b6e199;
+.pattern-color-meadow {
+    fill: rgba(182, 225, 153, 0.2);
 }
-.pattern-color-wetland {
-    fill: #B6E199;
+path.stroke.tag-landuse-meadow {
+    stroke: rgb(182, 225, 153);
 }
-
-path.fill.tag-natural-beach {
-    fill: url(#pattern-beach) #ffff7e;
+.preset-icon-fill-area.tag-landuse-meadow {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
 }
+
 .pattern-color-beach {
-    fill: #ffff7e;
+    fill: rgba(255, 255, 126, 0.2);
 }
-
-path.fill.tag-natural-scrub {
-    fill: url(#pattern-scrub) #dbf08b;
+path.stroke.tag-natural-beach {
+    stroke: rgb(255, 255, 126);
 }
-.pattern-color-scrub {
-    fill: #dbf08b;
+.preset-icon-fill-area.tag-natural-beach {
+    border-color: rgb(255, 255, 126);
+    background-color: rgba(255, 255, 126, 0.2);
 }
 
-path.fill.tag-landuse-cemetery {
-    fill: url(#pattern-cemetery) #8cd05f;
-}
-.pattern-color-cemetery {
-    fill: #8cd05f
+.pattern-color-scrub {
+    fill: rgba(219, 240, 139, 0.2);
 }
-
-path.fill.tag-landuse-orchard {
-    fill: url(#pattern-orchard) #8cd05f;
+path.stroke.tag-natural-scrub {
+    stroke: rgb(219, 240, 139);
 }
-.pattern-color-orchard {
-    fill: #8cd05f
+.preset-icon-fill-area.tag-natural-scrub {
+    border-color: rgb(219, 240, 139);
+    background-color: rgba(219, 240, 139, 0.2);
 }
 
-path.fill.tag-landuse-construction {
-    fill: url(#pattern-construction) #e06e5f;
+.pattern-color-farm,
+.pattern-color-farmland {
+    fill: rgba(140, 208, 95, 0.2);
 }
-.pattern-color-construction {
-    fill: #e06e5f;
+path.stroke.tag-landuse-farm,
+path.stroke.tag-landuse-farmland {
+    stroke: rgb(140, 208, 95);
 }
-
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
-    fill: #eab056;
+.preset-icon-fill-area.tag-landuse-farm,
+.preset-icon-fill-area.tag-landuse-farmland {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-industrial {
-    fill: #e4a4f5;
+.pattern-color-cemetery,
+.pattern-color-orchard {
+    fill: rgba(140, 208, 95, 0.2);
+}
+path.stroke.tag-landuse-cemetery,
+path.stroke.tag-landuse-orchard {
+    stroke: rgb(140, 208, 95);
+}
+.preset-icon-fill-area.tag-landuse-cemetery,
+.preset-icon-fill-area.tag-landuse-orchard {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
 path.stroke.tag-amenity-parking {
-    stroke: #aaa;
-    stroke-width: 1;
+    stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {
-    fill: #aaa;
+    stroke: rgba(170, 170, 170, 0.3);
+    fill: rgba(170, 170, 170, 0.3);
+}
+.preset-icon-fill-area.tag-amenity-parking {
+    border-color: rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
-path.fill.tag-place,
-path.fill.tag-boundary {
-    fill: none;
+
+/* 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;
@@ -590,208 +646,466 @@ path.stroke.tag-highway {
     stroke-width:8;
 }
 
-svg[data-zoom="16"] path.shadow.tag-highway {
+.low-zoom path.shadow.tag-highway {
     stroke-width:12;
 }
-svg[data-zoom="16"] path.casing.tag-highway {
+.low-zoom path.casing.tag-highway {
     stroke-width:6;
 }
-svg[data-zoom="16"] path.stroke.tag-highway {
+.low-zoom path.stroke.tag-highway {
     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-construction-motorway {
-    stroke:#58a9ed;
+path.stroke.tag-motorway {
+    stroke:#CF2081;
 }
-
 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-construction-trunk {
-    stroke:#8cd05f;
+path.stroke.tag-trunk {
+    stroke:#DD2F22;
 }
 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-construction-primary {
-    stroke:#e06d5f;
+path.stroke.tag-primary {
+    stroke:#F99806;
 }
 path.casing.tag-highway-primary,
 path.casing.tag-highway-primary_link,
-path.casing.tag-construction-primary {
+path.casing.tag-primary {
     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-construction-secondary {
-    stroke:#eab056;
+path.stroke.tag-secondary {
+    stroke:#F3F312;
 }
 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-construction-tertiary {
-    stroke:#ffff7e;
+path.stroke.tag-tertiary {
+    stroke:#FFF9B3;
 }
 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;
 }
 
-path.stroke.tag-highway-residential,
-path.stroke.tag-construction-residential {
-    stroke:#fff;
+.legacy-carto .preset-icon .icon.highway-trunk,
+.legacy-carto .preset-icon .icon.highway-trunk-link {
+    color: #8cd05f;
+    fill: #46682f;
 }
-path.casing.tag-highway-residential,
-path.casing.tag-construction-residential {
-    stroke:#444;
+.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;
 }
 
-path.stroke.tag-highway-living_street {
-    stroke:#ccc;
-    stroke-width:4;
+.legacy-carto .preset-icon .icon.highway-primary,
+.legacy-carto .preset-icon .icon.highway-primary-link {
+    color: #e06d5f;
+    fill: #70372f;
 }
-path.casing.tag-highway-living_street {
-    stroke:#fff;
-    stroke-width:6;
+.legacy-carto path.stroke.tag-highway-primary,
+.legacy-carto path.stroke.tag-highway-primary_link,
+.legacy-carto path.stroke.tag-primary {
+    stroke:#e06d5f;
 }
-
-path.stroke.line.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-dasharray: 2, 8;
-    stroke-width:4 !important;
-    shapeRendering: auto;
+.legacy-carto path.casing.tag-highway-primary,
+.legacy-carto path.casing.tag-highway-primary_link,
+.legacy-carto path.casing.tag-primary {
+    stroke:#70372f;
 }
-path.casing.line.tag-highway-pedestrian {
-    stroke:#8cd05f;
-    stroke-width:6 !important;
+
+.legacy-carto .preset-icon .icon.highway-secondary,
+.legacy-carto .preset-icon .icon.highway-secondary-link {
+    color: #eab056;
+    fill: #75582b;
 }
-path.stroke.area.tag-highway-pedestrian {
-    stroke:#fff;
-    stroke-width: 2;
+.legacy-carto path.stroke.tag-highway-secondary,
+.legacy-carto path.stroke.tag-highway-secondary_link,
+.legacy-carto path.stroke.tag-secondary {
+    stroke:#eab056;
 }
-path.fill.area.tag-highway-pedestrian {
-    fill:#ccc;
+.legacy-carto path.casing.tag-highway-secondary,
+.legacy-carto path.casing.tag-highway-secondary_link,
+.legacy-carto path.casing.tag-secondary {
+    stroke:#75582b;
 }
 
-path.stroke.tag-highway-service {
-    stroke:#fff;
-    stroke-width:4;
-}
-path.casing.tag-highway-service {
-    stroke:#666;
-    stroke-width:6;
+.legacy-carto .preset-icon .icon.highway-tertiary,
+.legacy-carto .preset-icon .icon.highway-tertiary-link {
+    color: #ffff7e;
+    fill: #7f7f3f;
 }
-svg[data-zoom="16"] path.stroke.tag-highway-service {
-    stroke-width:2;
+.legacy-carto path.stroke.tag-highway-tertiary,
+.legacy-carto path.stroke.tag-highway-tertiary_link,
+.legacy-carto path.stroke.tag-tertiary {
+    stroke:#ffff7e;
 }
-svg[data-zoom="16"] path.casing.tag-highway-service {
-    stroke-width:4;
+.legacy-carto path.casing.tag-highway-tertiary,
+.legacy-carto path.casing.tag-highway-tertiary_link,
+.legacy-carto path.casing.tag-tertiary {
+    stroke:#7f7f3f;
 }
 
-path.stroke.tag-highway-track {
-    stroke: #fff;
-    stroke-width: 4;
-}
-path.casing.tag-highway-track {
-    stroke: #996600;
-    stroke-width: 6;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
+.preset-icon .icon.highway-residential {
+    color: #fff;
+    fill: #444;
 }
-svg[data-zoom="16"] path.stroke.tag-highway-track {
-    stroke-width:2;
+path.stroke.tag-highway-residential,
+path.stroke.tag-residential {
+    stroke:#fff;
 }
-svg[data-zoom="16"] path.casing.tag-highway-track {
-    stroke-width:4;
+path.casing.tag-highway-residential,
+path.casing.tag-residential {
+    stroke:#444;
 }
 
-path.stroke.tag-highway-path {
-    stroke: #000;
-    stroke-width: 1 !important;
-    stroke-linecap: butt;
-    stroke-dasharray: 8, 4;
+.preset-icon .icon.highway-unclassified {
+    color: #dcd9b9;
+    fill: #444;
 }
-path.casing.tag-highway-path {
-    stroke-width: 1 !important;
-    stroke: #fff;
+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 {
-    stroke-width: 4;
-    stroke-linecap: butt;
-    stroke-dasharray: 6, 6;
+path.stroke.tag-highway-bridleway,
+path.stroke.tag-highway-corridor,
+path.stroke.tag-highway-pedestrian,
+path.stroke.tag-highway-steps,
+path.stroke.tag-highway-road,
+path.stroke.tag-living_street,
+path.stroke.tag-service,
+path.stroke.tag-track,
+path.stroke.tag-path,
+path.stroke.tag-footway,
+path.stroke.tag-cycleway,
+path.stroke.tag-bridleway,
+path.stroke.tag-corridor,
+path.stroke.tag-pedestrian,
+path.stroke.tag-steps,
+path.stroke.tag-road {
+    stroke-width:4;
 }
+path.casing.tag-highway-living_street,
+path.casing.tag-highway-service,
+path.casing.tag-highway-track,
+path.casing.tag-highway-path,
 path.casing.tag-highway-footway,
 path.casing.tag-highway-cycleway,
-path.casing.tag-highway-bridleway {
-    stroke-width: 6;
-    stroke: #fff;
+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;
 }
 
-svg[data-zoom="16"] path.stroke.tag-highway-footway,
-svg[data-zoom="16"] path.stroke.tag-highway-cycleway,
-svg[data-zoom="16"] path.stroke.tag-highway-bridleway {
-    stroke-width: 2;
+.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;
 }
-svg[data-zoom="16"] path.casing.tag-highway-footway,
-svg[data-zoom="16"] path.casing.tag-highway-cycleway,
-svg[data-zoom="16"] path.casing.tag-highway-bridleway {
-    stroke-width: 4;
+.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;
 }
 
-path.stroke.tag-highway-footway {
-    stroke: #ae8681;
+.preset-icon .icon.highway-living-street {
+    color: #ccc;
+    fill: #fff;
 }
-path.stroke.tag-highway-cycleway {
-    stroke: #58a9ed;
+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;
+}
+
+.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-dasharray: 2, 8;
+}
+path.casing.tag-highway-corridor,
+path.casing.tag-highway-pedestrian,
+path.casing.tag-corridor,
+path.casing.tag-pedestrian,
+path.casing.tag-highway-corridor.tag-unpaved,
+path.casing.tag-highway-pedestrian.tag-unpaved,
+path.casing.tag-corridor.tag-unpaved,
+path.casing.tag-pedestrian.tag-unpaved {
+    stroke: #8cd05f;
+    stroke-linecap: round;
+    stroke-dasharray: none;
+}
+
+.preset-icon .icon.highway-road {
+    color: #9e9e9e;
+    fill: #666;
+}
+path.stroke.tag-highway-road,
+path.stroke.tag-road {
+    stroke:#9e9e9e;
+}
+path.casing.tag-highway-road,
+path.casing.tag-road {
+    stroke:#666;
+}
+
+.preset-icon .icon.highway-service {
+    color: #fff;
+    fill: #666;
+}
+path.stroke.tag-highway-service,
+path.stroke.tag-service {
+    stroke:#fff;
+}
+path.casing.tag-highway-service,
+path.casing.tag-service {
+    stroke:#666;
+}
+
+.preset-icon .icon.highway-track {
+    color: #eaeaea;
+    fill: #c5b59f;
+}
+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 {
+    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-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-linecap: round;
+    stroke-dasharray: none;
+}
+
+.preset-icon .icon.category-path,
+.preset-icon .icon.highway-path {
+    color: #746f6f;
+    fill: #c5b59f;
+}
+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;
+}
+
+.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;
+}
+
+.preset-icon .icon.highway-bridleway {
+    color: #e06d5f;
+    fill: #fff;
 }
 path.stroke.tag-highway-bridleway {
     stroke: #e06d5f;
 }
 
+.preset-icon .icon.highway-steps {
+    color: #81d25c;
+    fill: #fff;
+}
 path.stroke.tag-highway-steps {
     stroke: #81d25c;
-    stroke-width: 4;
     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-linecap: round;
+    stroke-dasharray: none;
 }
 
-/* aeroways */
 
+/* aeroways */
 path.stroke.tag-aeroway-taxiway {
     stroke: #805C80;
     stroke-width: 4;
@@ -811,121 +1125,95 @@ path.casing.tag-aeroway-runway {
     stroke-linecap: square;
 }
 path.fill.tag-aeroway-runway {
-    fill: #000;
-    fill-opacity: 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 {
-    fill: #805C80;
-    fill-opacity: 0.2;
-}
-
-
-/* bridges */
-
-path.casing.tag-bridge-yes {
-    stroke-width: 14;
-    stroke-opacity: 0.5;
-    stroke: #000;
-}
-
-path.casing.tag-highway-living_street.tag-bridge-yes,
-path.casing.tag-highway-path.tag-bridge-yes {
-    stroke-width: 6;
-}
-
-path.casing.line.tag-highway-pedestrian,
-path.casing.tag-highway-service.tag-bridge-yes,
-path.casing.tag-highway-track.tag-bridge-yes,
-path.casing.tag-highway-steps.tag-bridge-yes,
-path.casing.tag-highway-footway.tag-bridge-yes,
-path.casing.tag-highway-cycleway.tag-bridge-yes,
-path.casing.tag-highway-bridleway.tag-bridge-yes {
-    stroke-width: 8;
-}
-
-path.shadow.tag-highway-residential.tag-bridge {
-    stroke-width:22;
-}
-
-path.shadow.tag-highway-living_street.tag-bridge-yes,
-path.shadow.tag-highway-path.tag-bridge-yes,
-path.shadow.line.tag-highway-pedestrian,
-path.shadow.tag-highway-service.tag-bridge-yes,
-path.shadow.tag-highway-track.tag-bridge-yes,
-path.shadow.tag-highway-steps.tag-bridge-yes,
-path.shadow.tag-highway-footway.tag-bridge-yes,
-path.shadow.tag-highway-cycleway.tag-bridge-yes,
-path.shadow.tag-highway-bridleway.tag-bridge-yes {
-    stroke-width: 16;
+    stroke: rgba(128, 92, 128, 0.2);
+    fill: rgba(128, 92, 128, 0.2);
 }
 
-/* tunnels */
-
-path.stroke.tag-highway.tag-tunnel-yes {
-    stroke-opacity: 0.3;
-}
 
-path.casing.tag-highway.tag-tunnel-yes {
-    stroke-opacity: 0.5;
-}
-
-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 7, 7;
+/* railways */
+.preset-icon .icon.tag-railway.other-line {
+    color: #fff;
+    fill: #777;
 }
-
-/* construction */
-
-svg[data-zoom="16"] path.stroke.tag-highway-construction,
-svg[data-zoom="16"] path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 5;
+.preset-icon .icon.tag-railway {
+    color: #555;
+    fill: #eee;
 }
-
-/* railways */
-
-.line.stroke.tag-railway {
+path.stroke.tag-railway {
     stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-.line.casing.tag-railway {
+path.casing.tag-railway {
     stroke: #555;
     stroke-width: 4;
 }
 
-.line.stroke.tag-railway-abandoned {
+.preset-icon .icon.tag-railway-disused,
+.preset-icon .icon.tag-railway-abandoned {
+    color: #999;
+    fill: #eee;
+}
+path.stroke.tag-railway-abandoned {
     stroke: #eee;
 }
-.line.casing.tag-railway-abandoned {
+path.casing.tag-railway-abandoned {
     stroke: #999;
 }
 
-.line.stroke.tag-railway-subway {
-    stroke: #666;
+.preset-icon .icon.tag-railway-subway {
+    color: #222;
+    fill: #bbb;
 }
-.line.casing.tag-railway-subway {
+path.stroke.tag-railway-subway {
+    stroke: #bbb;
+}
+path.casing.tag-railway-subway {
     stroke: #222;
 }
 
-.line.stroke.tag-railway-platform {
+path.stroke.tag-railway-platform {
     stroke: #999;
     stroke-width: 4;
     stroke-dasharray: none;
 }
-.line.casing.tag-railway-platform {
+path.casing.tag-railway-platform {
+    stroke: none;
+}
+
+.area.stroke.tag-railway {
+    stroke: white;
+    stroke-width: 1;
+    stroke-dasharray: none;
+}
+.area.casing.tag-railway {
     stroke: none;
 }
 
+
 /* 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 {
-    fill: #77d3de;
+    stroke: rgba(119, 211, 222, 0.3);
+    fill: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-waterway {
@@ -944,13 +1232,9 @@ path.casing.tag-waterway-river {
     stroke-width: 6;
 }
 
-svg[data-zoom="16"] path.stroke.tag-waterway-river {
-    stroke-width: 4;
-}
-svg[data-zoom="16"] path.casing.tag-waterway-river {
-    stroke-width: 6;
+.preset-icon .icon.tag-waterway-ditch {
+    color: #6591ff;
 }
-
 path.stroke.tag-waterway-ditch {
     stroke: #6591ff;
     stroke-width: 1;
@@ -960,7 +1244,31 @@ path.casing.tag-waterway-ditch {
     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 */
+.preset-icon .icon.tag-man_made-pipeline,
+.preset-icon .icon.tag-power {
+    color: #939393;
+    fill: #939393;
+}
 
 path.stroke.tag-power {
     stroke: #939393;
@@ -970,8 +1278,8 @@ path.casing.tag-power {
     stroke: none;
 }
 
-/* boundary */
 
+/* boundaries */
 path.stroke.tag-boundary {
     stroke: #fff;
     stroke-width: 2;
@@ -989,6 +1297,181 @@ path.casing.tag-boundary-national_park {
 }
 
 
+/* barriers */
+path.stroke.tag-barrier {
+    stroke: #ddd;
+    stroke-width: 3px;
+    stroke-linecap: round;
+    stroke-dasharray: 15, 5, 1, 5;
+}
+.low-zoom path.stroke.tag-barrier {
+    stroke-width: 2px;
+    stroke-linecap: butt;
+    stroke-dasharray: 8, 2, 2, 2;
+}
+
+
+/* bridges */
+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.casing.line.tag-railway.tag-bridge,
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge,
+path.casing.tag-highway-corridor.tag-bridge,
+path.casing.line.tag-highway-pedestrian.tag-bridge,
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 10;
+}
+path.shadow.line.tag-railway.tag-bridge,
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
+path.shadow.tag-highway-corridor.tag-bridge,
+path.shadow.line.tag-highway-pedestrian.tag-bridge,
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 17;
+}
+.low-zoom path.casing.tag-bridge {
+    stroke-width: 10;
+}
+.low-zoom path.shadow.tag-bridge {
+    stroke-width: 14;
+}
+
+.low-zoom path.casing.line.tag-railway.tag-bridge,
+.low-zoom path.casing.tag-highway-living_street.tag-bridge,
+.low-zoom path.casing.tag-highway-path.tag-bridge,
+.low-zoom path.casing.tag-highway-corridor.tag-bridge,
+.low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.casing.tag-highway-service.tag-bridge,
+.low-zoom path.casing.tag-highway-track.tag-bridge,
+.low-zoom path.casing.tag-highway-steps.tag-bridge,
+.low-zoom path.casing.tag-highway-footway.tag-bridge,
+.low-zoom path.casing.tag-highway-cycleway.tag-bridge,
+.low-zoom path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 6;
+}
+
+.low-zoom path.shadow.line.tag-railway.tag-bridge,
+.low-zoom path.shadow.tag-highway-living_street.tag-bridge,
+.low-zoom path.shadow.tag-highway-path.tag-bridge,
+.low-zoom path.shadow.tag-highway-corridor.tag-bridge,
+.low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
+.low-zoom path.shadow.tag-highway-service.tag-bridge,
+.low-zoom path.shadow.tag-highway-track.tag-bridge,
+.low-zoom path.shadow.tag-highway-steps.tag-bridge,
+.low-zoom path.shadow.tag-highway-footway.tag-bridge,
+.low-zoom path.shadow.tag-highway-cycleway.tag-bridge,
+.low-zoom path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 13;
+}
+
+
+/* tunnels */
+path.stroke.tag-tunnel {
+    stroke-opacity: 0.3;
+}
+path.casing.tag-tunnel {
+    stroke-opacity: 0.5;
+    stroke-linecap: butt;
+    stroke-dasharray: none;
+}
+
+
+/* embankments / cuttings */
+path.casing.tag-embankment,
+path.casing.tag-cutting {
+    stroke-opacity: 0.5;
+    stroke: #000;
+    stroke-width: 22;
+    stroke-dasharray: 2, 4;
+    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;
+}
+
+
+/* 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;
+}
+
+
+/* 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);
+}
+
+
+/* Labels / Markers */
+
 text {
     font-size:10px;
     pointer-events: none;
@@ -1000,18 +1483,10 @@ text {
     fill: #002F35;
 }
 
-marker#oneway-marker path {
-    fill:#000;
-    opacity: .5;
-}
-
 path.oneway {
     stroke-width: 6px;
 }
 
-/*
- * Labels
- */
 
 text.arealabel-halo,
 text.linelabel-halo,
@@ -1048,78 +1523,63 @@ text.pointlabel {
     stroke-miterlimit: 1;
 }
 
+text.proximate {
+    opacity: 0;
+}
+
 text.point {
   font-size: 10px;
 }
 
+/* Turns */
+
+g.turn rect,
+g.turn circle {
+    fill: none;
+    pointer-events: all;
+}
+
+.form-field-restrictions .vertex {
+    pointer-events: none;
+    cursor: auto !important;
+}
+
 /* Cursors */
 
-#map:hover {
+.map-in-map,
+#map {
     cursor: auto; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-grab.png") %>) 9 9, auto; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-grab.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-grab2x.png") %>) 2x
-        ) 9 9, auto;
-}
-
-#map:active {
-    cursor: pointer; /* Opera */
-    cursor: url(<%= asset_path("iD/img/cursor-grabbing.png") %>) 9 9, auto; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-grabbing.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-grabbing2x.png") %>) 2x
-        ) 9 9, auto;
 }
 
 .mode-browse .point,
 .mode-select .point {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-point.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-point.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-point2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .vertex,
 .mode-browse .vertex {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-vertex.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-vertex.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-vertex2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-browse .line,
 .mode-select .line {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-line.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-line.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-line2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .area,
 .mode-browse .area {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-area.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-area.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-area2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .midpoint,
 .mode-browse .midpoint {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-split.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-split.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-split2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .behavior-multiselect .point,
@@ -1128,19 +1588,11 @@ text.point {
 .mode-select .behavior-multiselect .area {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-add.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-add.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-add2x.png") %>) 2x
-        ), pointer;
 }
 
 .mode-select .behavior-multiselect .selected {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-remove.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-remove.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-remove2x.png") %>) 2x
-        ), pointer;
 }
 
 #map .point:active,
@@ -1151,61 +1603,52 @@ text.point {
 #map .mode-select .selected {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-select-acting.png") %>), pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-select-acting.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-select-acting2x.png") %>) 2x
-        ), pointer;
 }
 
-.mode-draw-line #map:hover,
-.mode-draw-area #map:hover,
-.mode-add-line  #map:hover,
-.mode-add-area  #map:hover,
-.mode-drag-node #map:hover {
+.mode-draw-line #map,
+.mode-draw-area #map,
+.mode-add-line  #map,
+.mode-add-area  #map,
+.mode-drag-node #map {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
-.mode-draw-line .behavior-hover .way,
-.mode-draw-area .behavior-hover .way,
-.mode-add-line  .behavior-hover .way,
-.mode-add-area  .behavior-hover .way,
-.mode-drag-node .behavior-hover .way {
+.mode-draw-line .way.hover,
+.mode-draw-area .way.hover,
+.mode-add-line  .way.hover,
+.mode-add-area  .way.hover,
+.mode-drag-node .way.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw-connect-line.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw-connect-line2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
-.mode-draw-line .behavior-hover .vertex,
-.mode-draw-area .behavior-hover .vertex,
-.mode-add-line  .behavior-hover .vertex,
-.mode-add-area  .behavior-hover .vertex,
-.mode-drag-node .behavior-hover .vertex {
+.mode-draw-line .vertex.hover,
+.mode-draw-area .vertex.hover,
+.mode-add-line  .vertex.hover,
+.mode-add-area  .vertex.hover,
+.mode-drag-node .vertex.hover {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw-connect-vertex.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw-connect-vertex2x.png") %>) 2x
-        ) 9 9, crosshair;
 }
 
-.mode-add-point #map:hover,
-.lasso #map:hover,
-.lasso .way,
-.lasso .vertex {
+.mode-add-point #map,
+.mode-browse.lasso #map,
+.mode-browse.lasso .way,
+.mode-browse.lasso .vertex,
+.mode-browse.lasso .midpoint,
+.mode-select.lasso #map,
+.mode-select.lasso .way,
+.mode-select.lasso .vertex,
+.mode-select.lasso .midpoint {
     cursor: crosshair; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-draw.png") %>) 9 9, crosshair; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-draw.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-draw2x.png") %>) 2x
-        ) 9 9, crosshair;
+}
+
+.turn rect,
+.turn circle {
+    cursor: pointer; /* Opera */
+    cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
 }
 
 .lasso #map {
@@ -1213,47 +1656,176 @@ text.point {
 }
 
 /* GPX Paths */
-path.gpx {
-    stroke:#6AFF25;
-    stroke-width:2;
-    fill:transparent;
+.layer-gpx {
     pointer-events: none;
 }
 
-/* Modes */
+path.gpx {
+    stroke: #FF26D4;
+    stroke-width: 2;
+    fill: none;
+}
 
-.mode-draw-line .vertex.active,
-.mode-draw-area .vertex.active,
-.mode-drag-node .vertex.active {
-    display: none;
+text.gpx {
+    fill: #FF26D4;
 }
 
-.mode-draw-line .way.active,
-.mode-draw-area .way.active,
-.mode-drag-node .active {
+/* Mapillary Image Layer */
+
+.layer-mapillary-images {
     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,
+.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 */
+}
+
+.layer-mapillary-images .viewfield-group * {
+    stroke-width: 1;
+    stroke: #444;
+    fill: #ffc600;
+    z-index: 50;
+}
+
+.layer-mapillary-images .viewfield-group:hover * {
+    stroke-width: 1;
+    stroke: #333;
+    fill: #ff9900;
+    z-index: 60;
+}
+
+.layer-mapillary-images .viewfield-group.selected  * {
+    stroke-width: 2;
+    stroke: #222;
+    fill: #ff5800;
+    z-index: 60;
+}
+
+.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;
+}
+
+/* Mapillary Sign Layer */
+
+.layer-mapillary-signs {
+    pointer-events: none;
+}
+
+.layer-mapillary-signs .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;
+}
+
+.layer-mapillary-signs .icon-sign:hover body {
+    border: 2px solid rgba(255,198,0,0.8);
+    z-index: 80;
+ }
+
+.layer-mapillary-signs .icon-sign.selected 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;
+    position: absolute;
+}
+
+.layer-mapillary-signs .icon-sign:hover .t,
+.layer-mapillary-signs .icon-sign.selected .t {
+    z-index: 80;
+}
+
+/* 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 .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;
 }
+
+
+/* Fill Styles */
+.low-zoom.fill-wireframe path.stroke,
+.fill-wireframe path.stroke {
+    stroke-width: 1;
+    stroke-opacity: 0.5;
+    stroke-dasharray: none;
+    fill: none;
+}
+
+.low-zoom.fill-wireframe path.shadow,
+.fill-wireframe path.shadow {
+    stroke-width: 8;
+}
+
+.fill-wireframe path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4;
+}
+.fill-wireframe path.shadow.selected {
+    stroke-opacity: 0.6;
+}
+
+.fill-wireframe .point,
+.fill-wireframe .areaicon,
+.fill-wireframe path.casing,
+.fill-wireframe path.fill,
+.fill-wireframe path.oneway {
+    display: none;
+}
+
+.fill-partial path.fill {
+    fill-opacity: 0;
+    stroke-width: 60px;
+    pointer-events: visibleStroke;
+}
 /* Basics
 ------------------------------------------------------- */
 
+/*
+  Opera misbehaves when the window is resized vertically unless 100% width + height are
+  applied to both html and body. https://gist.github.com/jfirebaugh/bd225bcfdd3a633850c4
+*/
+html, body {
+    width: 100%;
+    height: 100%;
+}
+
 body {
-    font:normal 12px/1.6666 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
     margin:0;
     padding:0;
     min-width: 768px;
     color:#333;
     overflow: hidden;
-    -webkit-font-smoothing: subpixel-antialiased;
 }
 
 .unsupported {
@@ -1266,10 +1838,27 @@ body {
 .id-container {
     height: 100%;
     width: 100%;
-    position: fixed;
     min-width: 768px;
 }
 
+#content {
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+}
+
+#defs {
+    /* Can't be display: none or the clippaths are ignored. */
+    position: absolute;
+    width: 0;
+    height: 0;
+}
+
+.spacer {
+    height: 40px;
+    margin-right: 10px;
+}
+
 .limiter {
     position: relative;
     max-width: 1200px;
@@ -1277,18 +1866,14 @@ body {
 
 .spinner {
     opacity: .5;
-    z-index: 2;
-    position: relative;
+    float: right;
 }
 
 .spinner img {
-    position: fixed;
     height: 40px;
     width: 40px;
-    right: 10px;
-    top: 10px;
-    margin: auto;
     border-radius: 4px;
+    margin-right: 10px;
     background: black;
 }
 
@@ -1310,10 +1895,6 @@ button,
 .radial-menu-item {
     cursor: pointer; /* Opera */
     cursor: url(<%= asset_path("iD/img/cursor-pointer.png") %>) 6 1, pointer; /* FF */
-    cursor: -webkit-image-set(
-        url(<%= asset_path("iD/img/cursor-pointer.png") %>) 1x,
-        url(<%= asset_path("iD/img/cursor-pointer2x.png") %>) 2x
-        ) 6 1, pointer;
 }
 
 h2 {
@@ -1365,10 +1946,6 @@ strong {
 
 a:visited, a {
     color: #7092ff;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;
 }
 
 a:hover {
@@ -1396,10 +1973,7 @@ input[type=email] {
     height:30px;
     width: 100%;
     border-radius:4px;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-       -o-transition: all 100ms;
-            transition: all 100ms;
+    text-overflow: ellipsis;
 }
 
 textarea:focus,
@@ -1407,19 +1981,20 @@ input:focus {
     background-color: #F1F1F1;
 }
 
-input.major {
-    width: 100%;
-    padding:5px 10px;
-    font-size: 18px;
-    font-weight: bold;
-    height:60px;
+input[type="checkbox"],
+input[type="radio"] {
+    float: left;
+    width: 14px;
+    height: 14px;
+    margin-right: 5px;
+    margin-top: 3px;
 }
 
-/* remove bottom border radius when combox is open */
-.combobox + div textarea:focus,
-.combobox + div input:focus {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
+/* remove bottom border radius when combobox is open */
+.combobox + * textarea:focus,
+.combobox + * input:focus {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
 }
 
 /* tables */
@@ -1440,6 +2015,10 @@ table.tags, table.tags td, table.tags th {
     padding: 4px;
 }
 
+::-ms-clear {
+   display: none;
+}
+
 /* Grid
 ------------------------------------------------------- */
 
@@ -1462,70 +2041,39 @@ table.tags, table.tags td, table.tags th {
 
 ul li { list-style: none;}
 
-ul.toggle-list {
-    border-radius: 4px;
-    border: 1px solid #CCC;
-    margin-bottom: 10px;
-}
-
-ul.toggle-list li a {
+.toggle-list > label {
     position: relative;
-    padding: 5px 10px 5px 25px;
-    display:block;
-    border-top: 1px solid #ccc;
-}
-
-ul.toggle-list li:first-child a {
-    border-top: 0;
-    border-radius: 3px 3px 0 0;
-}
-
-ul.toggle-list li:last-child a {
-    border-radius: 0 0 3px 3px;
+    padding: 5px 10px;
+    display: block;
+    height: 30px;
+    background-color: white;
+    color: #7092FF;
+    cursor: pointer;
 }
 
-ul.toggle-list li:only-child a {
-    border-radius: 3px;
+.toggle-list > label:hover {
+    background-color: #ececec;
 }
 
-ul.toggle-list li a:hover { background-color: #ececec;}
-
-ul.toggle-list li a.selected { background-color: #e8ebff;}
-
-ul.link-list li {
-    float: right;
-    border-left: 1px solid rgba(255,255,255,.5);
-    padding: 5px 0 5px 5px;
-    margin-left: 5px;
+.toggle-list > label:not(:last-child) {
+    border-bottom: 1px solid #ccc;
 }
 
-ul.link-list li:last-child {
-    border-left: 0;
-    margin-left: 0;
-    padding-left: 0;
+.toggle-list > label:last-child {
+    border-radius: 0 0 3px 3px;
 }
 
-.toggle-list a::before {
-    content: "";
-    display: inline-block;
-    border-radius: 50%;
-    height: 12px;
-    width: 12px;
-    margin-right: 10px;
-    border: 1px solid #CCC;
-    position: absolute;
-    left: 5px;
-    top: 8px;
+.toggle-list label > span {
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
-.toggle-list a:hover::before {
-    box-shadow: inset 0 0 0 2px white;
+.toggle-list > label.active {
+    background: #E8EBFF;
 }
 
-.toggle-list a.selected::before {
-    background: #7092ff;
-    box-shadow: inset 0 0 0 2px white;
-}
 
 /* Utility Classes
 ------------------------------------------------------- */
@@ -1535,12 +2083,12 @@ ul.link-list li:last-child {
 }
 
 .fillL2 {
-    background: #f7f7f7 url(<%= asset_path("iD/img/background-pattern-1.png") %>) repeat;
+    background: #f6f6f6;
     color: #333;
 }
 
 .fillL3 {
-    background: #f1f1f1;
+    background: #ececec;
     color: #333;
 }
 
@@ -1549,13 +2097,21 @@ ul.link-list li:last-child {
     color: white;
 }
 
+.fillD2 {
+    background:rgba(0,0,0,.75);
+    color: white;
+}
+
 .fl { float: left;}
 .fr { float: right;}
+.al { left: 0; }
+.ar { right: 0; }
 
 div.hide,
 form.hide,
 button.hide,
-a.hide {
+a.hide,
+li.hide {
     display: none;
 }
 
@@ -1579,10 +2135,12 @@ a.hide {
     right: -100%;
 }
 
+
 .pane {
     position:absolute;
     width:50%;
-    height:100%;
+    top: 0;
+    bottom: 30px;
 }
 
 .pane:first-child {
@@ -1597,20 +2155,15 @@ a.hide {
 
 button {
     text-align: center;
-    font-weight:bold;
     line-height:20px;
     border:0;
     background: white;
+    font-weight: bold;
     color:#333;
     font-size:12px;
     display: inline-block;
     height:40px;
     border-radius:4px;
-    /* Crashes Safari: https://github.com/systemed/iD/issues/1188 */
-    /*-webkit-transition: all 100ms;*/
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;
 }
 
 button:focus,
@@ -1621,11 +2174,11 @@ button:hover {
 button[disabled],
 button.disabled {
     background-color: rgba(255,255,255,.25);
-    color: rgba(0,0,0,.5);
+    color: rgba(0,0,0,.4);
     cursor: auto;
 }
 
-button.active:not([disabled]):not(.disabled) {
+button.active {
     background: #7092ff;
 }
 
@@ -1634,9 +2187,17 @@ button.minor {
     top: 0;
     right: 0;
     height: 100%;
-    width: 20px;
-    opacity: .5;
+    width: 10%;
     border-radius: 0;
+    background-color: #fafafa;
+}
+
+button.minor .icon {
+    opacity: .5;
+}
+
+button.minor:hover {
+    background-color: #f1f1f1;
 }
 
 .button-wrap {
@@ -1645,14 +2206,23 @@ button.minor {
     margin: 0;
 }
 
-.button-wrap button:only-child { width: 100%;}
-.button-wrap:last-of-type { padding-right: 0;}
+.button-wrap button:only-child {
+    width: 100%;
+}
+
+.button-wrap:last-of-type {
+    padding-right: 0;
+}
 
 .joined button {
     border-radius:0;
     border-right: 1px solid rgba(0,0,0,.5);
 }
 
+.fillL .joined button {
+    border-right: 1px solid white;
+}
+
 .joined button:first-child {
     border-radius:4px 0 0 4px;
 }
@@ -1664,6 +2234,13 @@ button.minor {
 
 button.action {
     background: #7092ff;
+    color: white;
+}
+
+button[disabled].action,
+button[disabled].action:hover {
+    background: #cccccc;
+    color: #888;
 }
 
 button.action:focus,
@@ -1671,6 +2248,15 @@ button.action:hover {
     background: #597BE7;
 }
 
+button.secondary-action {
+    background: #ececec;
+}
+
+button.secondary-action:focus,
+button.secondary-action:hover {
+    background: #cccccc;
+}
+
 button.save.has-count {
     padding: 9px;
 }
@@ -1710,19 +2296,38 @@ button.save.has-count .count::before {
 /* 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;
-  }
-
-.icon-pre-text {
+    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: 3px;
 }
 
+.icon.light {
+    color: #fff;
+}
+
+.icon.created {
+    color: #00ca07;
+}
+
+.icon.modified {
+    color: #666;
+}
+
+.icon.deleted {
+    color: #ea0000;
+}
+
 .user-icon {
     max-height: 20px;
     max-width: 20px;
@@ -1731,88 +2336,19 @@ button.save.has-count .count::before {
     border-radius: 3px;
 }
 
-/* Definitions for every icon */
-.icon.browse     { background-position:   0 0;}
-.icon.add-point  { background-position: -20px 0;}
-.icon.add-line   { background-position: -40px 0;}
-.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.zoom-in    { background-position: -240px 0;}
-.icon.zoom-out   { background-position: -260px 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.back       { background-position: -420px 0;}
-.icon.forward    { background-position: -440px 0;}
-.icon.help       { background-position: -460px 0;}
-
-.icon.inspect.light    { background-position: -220px -20px;}
-.icon.geocode.light    { background-position: -280px -20px;}
-.icon.help.light       { background-position: -460px -20px;}
-.icon.avatar.light     { background-position: -320px -20px;}
-.icon.nearby.light     { background-position: -340px -20px;}
-
-.icon.back.blue        { background-position: -420px -20px;}
-.icon.forward.blue     { background-position: -440px -20px;}
-
-button[disabled] .icon.browse     { 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;}
-
-/* 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
 ------------------------------------------------------- */
 
 #bar {
-    position:absolute;
-    padding: 10px;
+    position: fixed;
+    padding: 10px 0;
     left:0;
     top:0;
     right:0;
     height:60px;
+    z-index: 9;
+    min-width: 768px;
 }
 
 /* Header for modals / panes
@@ -1820,101 +2356,241 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 .header {
     border-bottom: 1px solid #ccc;
-    z-index: 2;
     height: 60px;
     position: relative;
 }
 
 .header h3 {
-    margin-right: 40px;
+    text-align: left;
     margin-bottom: 0;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
+    padding: 20px 20px 20px 40px;
 }
 
-.modal > button,
-.header button {
-    height: 100%;
+.header button,
+.modal > button {
     border-radius: 0;
-    border-left: 1px solid #CCC;
     width: 40px;
     text-align: center;
     overflow: hidden;
-    position: absolute;
-    right: 0;
-    top: 0;
 }
 
-.modal > button {
-    height: 59px;
-    z-index: 3;
+.header button {
+    position: relative;
+    height: 100%;
 }
 
-/* Inspector
-------------------------------------------------------- */
-
-.inspector-wrap {
+.entity-editor-pane .header button.preset-close,
+.preset-list-pane .header button.preset-choose {
     position: absolute;
-    height: 100%;
     right: 0;
-    overflow: hidden;
+    top: 0;
 }
 
-.inspector-body {
-    overflow-y: scroll;
-    overflow-x: hidden;
+.entity-editor-pane .header button.preset-choose {
     position: absolute;
-    right: 0;
     left: 0;
-    bottom: 30px;
-    top: 60px;
-}
-
-.pane:first-child .inspector-body {
-    top: 120px;
-}
-
-.inspector-inner {
-    padding: 20px;
-    position: relative;
+    top: 0;
 }
 
-.inspector-wrap .header button.preset-reset {
-    border-right: 1px solid #CCC;
-    position: relative;
+.preset-choose {
+    font-size: 16px;
+    line-height: 1.25;
+    font-weight: bold;
 }
 
-.inspector-wrap .header button.preset-reset > div {
-    height: 100%;
-    padding: 20px 0;
+.modal > button {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 59px;
+    z-index: 50;
 }
 
-.inspector-wrap .header button.preset-reset .col12:last-child {
+.footer {
     position: absolute;
+    bottom: 0;
+    padding: 5px 20px 5px 20px;
+    border-top: 1px solid #ccc;
+    background-color: #fafafa;
     width: 100%;
-    padding: 20px 0;
-    opacity: 0;
 }
 
-.inspector-wrap .header button:hover .col12:first-child {
-    opacity: 0;
+.sidebar-component .body {
+    width: 100%;
+    overflow: auto;
+    top: 60px;
+    bottom: 0;
+    position: absolute;
 }
 
-.inspector-wrap .header button:hover .col12:last-child {
-    opacity: 1;
+/* Inspector
+------------------------------------------------------- */
+
+#sidebar {
+    position: relative;
+    float: left;
+    height: 100%;
+    overflow: hidden;
+    z-index: 10;
+    background: #f6f6f6;
 }
 
-.inspector-wrap .header button.line > div {
-    padding: 0;
+.sidebar-component {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
 }
 
-.inspector-toggle {
-    color:#fff;
+.inspector-wrap {
+    width: 100%;
+    height: 100%;
+}
+
+.inspector-hidden {
+    display: none;
+}
+
+.inspector-body {
+    overflow-y: scroll;
+    overflow-x: hidden;
+    position: absolute;
+    right: 0;
+    left: 0;
+    bottom: 0;
+}
+
+.mapillary-image {
+    position: absolute;
+    bottom: 30px;
+    width: 330px;
+    height: 250px;
+    padding: 5px;
+    background-color: #fff;
+}
+
+.mapillary-image a {
+    display: block;
+    position: absolute;
+    height: auto;
+    background-color: rgba(0,0,0,.5);
+    bottom: 0;
+    padding: 5px 10px;
+}
+
+.mapillary-image img {
     width: 100%;
+    height: auto;
     display: block;
-    background:#7092ff;
-    border: 0;
+}
+
+.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;
+}
+
+.preset-list-pane .inspector-body {
+    top: 120px;
+}
+
+.entity-editor-pane .inspector-body {
+    top: 60px;
+}
+
+.selection-list-pane .inspector-body {
+    top: 60px;
+}
+
+.inspector-inner {
+    padding: 20px;
+    position: relative;
+}
+
+#sidebar .search-header .icon {
+    display: block;
+    position: absolute;
+    left: 10px;
+    top: 80px;
+    pointer-events: none;
+}
+
+#sidebar .search-header input {
+    position: absolute;
+    top: 60px;
+    height: 60px;
+    width: 100%;
+    padding: 5px 10px;
+    border-radius: 0;
+    border-width: 0;
+    border-bottom-width: 1px;
+    text-indent: 30px;
+    font-size: 18px;
+    font-weight: bold;
+}
+
+/* Feature list */
+
+.feature-list  {
+    width:100%;
+}
+
+.no-results-item,
+.geocode-item,
+.feature-list-item {
+    width: 100%;
+    position: relative;
+    border-bottom: 1px solid #ccc;
+    border-radius: 0;
+}
+
+.feature-list-item .label {
+    text-align: left;
+    padding: 5px 10px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    border-left: 1px solid rgba(0, 0, 0, .1);
+}
+
+.feature-list-item .label .icon {
+    opacity: .5;
+}
+
+.feature-list-item:hover .label {
+    background-color: #ececec;
+}
+
+.feature-list-item .entity-type {
+    color:#7092ff;
+}
+
+.feature-list-item:hover .entity-type {
+    color:#597be7;
+}
+
+.feature-list-item .entity-name {
+    font-weight: normal;
+    color: #666;
+    padding-left: 10px;
 }
 
 /* Presets
@@ -1922,81 +2598,136 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* Preset grid  */
 
-.preset-grid  {
+.preset-list  {
     width:100%;
     padding: 20px 20px 10px 20px;
     border-bottom: 1px solid #ccc;
 }
 
-.grid-button-wrap {
-    padding-bottom: 10px;
-    height: 70px;
+.preset-list-button-wrap {
+    position: relative;
+    margin-bottom: 10px;
+    height: 60px;
 }
 
-.grid-entry {
+.preset-list-button {
     width: 100%;
     height: 100%;
     position: relative;
     border: 1px solid #ccc;
-    float: left;
 }
 
-.grid-inner {
-    margin-bottom: 20px;
+.preset-list.filtered .preset-list-item:first-child .preset-list-button {
+    background: #ececec;
 }
 
-.preset-grid.filtered .grid-button-wrap:first-child .grid-entry {
-    background: #ececec;
+.preset-icon-fill-area {
+    cursor: inherit;
+    height: 40px;
+    width: 40px;
+    margin: auto;
+    position: absolute;
+    left: 10px;
+    top: 10px;
 }
 
-.preset-icon {
+.preset-icon-frame {
     position: absolute;
-    top: 17px;
-    left: 17px;
+    top: 7px;
+    left: 7px;
+    height: 42px;
+    width: 42px;
     margin: auto;
 }
 
-.preset-icon-line {
-    top: 0;
-    left: 0;
+.preset-icon-frame .icon {
+    width: 46px;
+    height: 46px;
 }
 
-.grid-entry .label {
-    background: #f6f6f6;
+.preset-icon-60 {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    margin: auto;
+}
+
+.preset-icon-60 .icon {
+    width: 60px;
+    height: 60px;
+}
+
+.preset-icon-44 {
+    position: absolute;
+    top: 9px;
+    left: 8px;
+    margin: auto;
+}
+
+.preset-icon-44 .icon {
+    width: 44px;
+    height: 44px;
+}
+
+.preset-icon-32 {
+    position: absolute;
+    top: 14px;
+    left: 13px;   /* Maki icons off center? */
+    margin: auto;
+}
+
+.preset-icon-32 .icon {
+    width: 32px;
+    height: 32px;
+}
+
+.preset-list-button .label {
+    background-color: #f6f6f6;
     text-align: left;
     position: absolute;
-    padding: 5px 10px;
-    height: 100%;
+    top: 0;
     bottom: 0;
-    left: 60px;
     right: 0;
+    padding: 5px 10px;
+    left: 60px;
+    line-height: 50px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
     border-left: 1px solid rgba(0, 0, 0, .1);
-    line-height: 50px;
+    border-radius: 0 3px 3px 0;
     }
 
-.grid-entry:hover .label {
-    background: none;
+.preset-list-button:hover .label {
+    background-color: #ececec;
 }
 
-.grid-button-wrap button.tag-reference-button {
-    float: right;
-    position: static;
-    margin-top: -60px;
+.preset-list-item button.tag-reference-button {
     height: 100%;
     border: 1px solid #CCC;
     border-radius: 0 3px 3px 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 10%;
+    background: #fafafa;
 }
 
-.current .grid-entry,
-.current .grid-entry .label {
+.preset-list-item button.tag-reference-button:hover {
+    background: #f1f1f1;
+}
+
+.preset-list-item button.tag-reference-button .icon {
+    opacity: .5;
+}
+
+.current .preset-list-button,
+.current .preset-list-button .label {
     background-color: #E8EBFF;
 }
 
-.category .grid-entry:after,
-.category .grid-entry:before {
+.category .preset-list-button:after,
+.category .preset-list-button:before {
     content: "";
     position: absolute;
     top: -5px;
@@ -2007,44 +2738,23 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     height: 6px;
 }
 
-.category .grid-entry:before {
+.category .preset-list-button:before {
     top: -3px;
 }
 
-.preset-grid-search-wrap .icon {
-    display: block;
-    position: absolute;
-    left: 10px;
-    top: 80px;
-    pointer-events: none;
-}
-
-.preset-grid-search-wrap input {
-    position: absolute;
-    top: 60px;
-    border-radius: 0;
-    border-width: 0;
-    border-bottom-width: 1px;
-    text-indent: 30px;
-}
-
-.preset-search-result {
-    padding: 0 10px;
-    height:30px;
-    margin: 5px;
-}
-
-.subgrid .preset-grid {
+.subgrid .preset-list {
     padding: 10px 10px 0 10px;
-    border: 1px solid #CCC;
     margin-top: 0;
+    border: 0;
     border-radius: 8px;
+    width: -webkit-calc(100% + 20px);
+    margin-left: -10px;
 }
 
 .subgrid .arrow {
     border: solid rgba(0, 0, 0, 0);
     border-width: 10px;
-    border-bottom-color: #CCC;
+    border-bottom-color: #f1f1f1;
     width: 0;
     height: 0;
     margin-left: 50%;
@@ -2052,87 +2762,39 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     margin-top: -10px;
 }
 
-.show-more {
-    text-align: center;
-    width: 100%;
-    border-bottom: 1px solid #ccc;
-    border-radius: 0;
-}
-
-.show-more a {
-    color: #222;
-}
-
-/* Preset icon colors */
-
-.inspector-body-line .icon.feature-marker-stroked {
-    top: 30px;
-}
-
-.preset-icon-fill.icon-area {
-    cursor: inherit;
-    height: 45px;
-    width: 45px;
-    margin: auto;
-    position: absolute;
-    left: 7px; top: 7px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
-}
-
-.preset-icon-fill.tag-shop,
-.preset-icon-fill.tag-building {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -80px;
-}
 
-.preset-icon-fill.tag-natural-water {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -60px -80px;
-}
+/* preset form basics */
 
-.preset-icon-fill.tag-landuse,
-.preset-icon-fill.tag-natural-wood,
-.preset-icon-fill.tag-natural-tree,
-.preset-icon-fill.tag-natural-grassland,
-.preset-icon-fill.tag-leisure-park {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -120px -80px;
+.inspector-preset {
+    overflow: hidden;
+    padding-bottom: 10px;
 }
 
-.preset-icon-fill.tag-amenity-parking {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -180px -80px;
+.inspector-preset a.hide-toggle {
+    margin: 0 20px 10px 20px;
 }
 
-/* preset form basics */
-
-.tag-wrap .preset-icon-wrap {
-    border-bottom: 1px solid #CCC;
-    background-color: #e8ebff;
+.inspector-preset .preset-form {
+    padding: 10px;
+    margin: 0 10px 10px 10px;
+    border-radius: 8px;
 }
 
-.tag-wrap .preset-icon-wrap::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: #CCC;
+.entity-editor-pane .preset-list-item .preset-list-button-wrap {
+    margin-bottom: 0;
 }
 
-.tag-wrap .preset-icon-wrap > div {
-    height: 60px;
-    width: 60px;
-    margin: auto;
-    border-radius: 4px;
-    border: 1px solid #CCC;
-    position: relative;
+.form-field {
+    margin-bottom: 10px;
+    width: 100%;
+    -webkit-transition: margin-bottom 200ms;
+       -moz-transition: margin-bottom 200ms;
+         -o-transition: margin-bottom 200ms;
+            transition: margin-bottom 200ms;
 }
 
-.inspector-preset .form-field {
-    padding-left: 20px;
-    padding-right: 20px;
+.form-field:last-child {
+    margin-bottom: 0;
 }
 
 .form-label {
@@ -2143,118 +2805,191 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
     background: #f6f6f6;
     display: block;
     border-radius: 4px 4px 0 0;
+    overflow: hidden;
 }
 
-.form-label button {
-    border-left: 1px solid #CCC;
+.form-label-button-wrap {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 100%;
+    width: 100%;
+    background: transparent;
+    text-align: right;
 }
 
-.form-label .modified-icon {
-    border-right: 0;
-    opacity: 0;
-    right: 20px;
+.form-label-button-wrap .tag-reference-button {
+    border-radius: 0 3px 0 0;
 }
 
-.modified .form-label .modified-icon {
+.form-label-button-wrap .icon {
     opacity: .5;
 }
 
-.form-label button.tag-reference-button {
-    border-top-right-radius: 3px;
+.form-label button {
+    border-left: 1px solid #CCC;
+    width: 10%;
+    height: 100%;
+    border-radius: 0;
+    background: #f6f6f6;
+}
+.form-label button:hover {
+    background: #f1f1f1;
+}
+
+.form-label .modified-icon,
+.form-field .remove-icon {
+    display: none;
+}
+
+.modified .form-label .modified-icon,
+.present .form-label .remove-icon {
+    display: inline-block;
 }
 
 .form-field > input,
 .form-field > textarea,
 .form-field .preset-input-wrap {
     border: 1px solid #CCC;
+    min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
+    overflow: hidden;
 }
 
 .form-field textarea {
     height: 65px;
 }
 
-.form-field-name input.localized-main {
-    height: 35px;
-    font-size: 18px;
-    font-weight: bold;
+.inspector-border {
+    border-bottom: 1px solid #CCC
 }
 
-/* adding additional preset fields */
+/* Preset form (hover mode) */
 
-.more-buttons {
-    margin-top: 20px;
-    border-top: 1px solid #CCC;
+.inspector-hover .checkselect label:last-of-type,
+.inspector-hover .preset-input-wrap .label,
+.inspector-hover input,
+.inspector-hover label {
+    background: #ececec;
 }
 
-.more-buttons:nth-last-child(2) {
-    border-bottom: 1px solid #CCC;
+.inspector-hover a,
+.inspector-hover .checkselect label:last-of-type {
+    color: #666;
 }
 
-button.preset-add-field {
-    width: 25%;
-    height: 40px;
-    -webkit-transition: width 200ms;
-    -moz-transition: width 200ms;
-    -o-transition: width 200ms;
-    transition: width 200ms;
+/* hide and remove from layout */
+.inspector-hidden,
+.inspector-hover label input[type="checkbox"],
+.inspector-hover label input[type="radio"],
+.inspector-hover .toggle-list label,
+.inspector-hover .toggle-list label span,
+.inspector-hover .inspector-inner .add-tag,
+.inspector-hover .inspector-inner .add-relation,
+.inspector-hover .toggle-list label.remove .icon {
+    height: 0;
+    width: 0;
+    overflow: hidden;
+    opacity: 0 !important;
+    border-width: 0;
+    margin: 0;
+    padding: 0;
 }
 
-/* set width based on # of buttons */
-
-button.preset-add-field:nth-last-child(4),
-button.preset-add-field:nth-last-child(4) ~ button.preset-add-field {
-    width: 25%;
+/* hide but preserve in layout */
+.inspector-hover .entity-editor-pane button.minor,
+.inspector-hover .combobox-caret,
+.inspector-hover .entity-editor-pane .header button,
+.inspector-hover .spin-control,
+.inspector-hover .hide-toggle:before,
+.inspector-hover .more-fields,
+.inspector-hover .form-label-button-wrap,
+.inspector-hover .tag-reference-button,
+.inspector-hover .view-on-osm {
+    opacity: 0;
 }
 
-button.preset-add-field:nth-last-child(5),
-button.preset-add-field:nth-last-child(5) ~ button.preset-add-field {
-    width: 20%;
+/* Styles for raw tag inspector on hover */
+.inspector-hover .tag-row .key-wrap,
+.inspector-hover .tag-row .form-field.input-wrap-position {
+    width: 50%;
 }
 
-button.preset-add-field:nth-last-child(6),
-button.preset-add-field:nth-last-child(6) ~ button.preset-add-field {
-    width: 16.6666%;
+.inspector-hover .tag-row:first-child input.value {
+    border-top-right-radius: 4px;
 }
 
-button.preset-add-field:nth-last-child(7),
-button.preset-add-field:nth-last-child(7) ~ button.preset-add-field {
-    width: 14.2857%;
+.inspector-hover .tag-row:last-child input.value {
+    border-bottom-right-radius: 4px;
 }
 
-button.preset-add-field:nth-last-child(8),
-button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
-    width: 12.5%;
+.inspector-hover .tag-row:last-child input.key {
+    border-bottom-left-radius: 4px;
 }
 
-.preset-add-field .tooltip.top .tooltip-arrow {
-    border-top-color: #000;
+.inspector-hover .more-fields {
+    max-height: 0;
+    margin-bottom: -10px;
 }
 
-.preset-add-field .tooltip-inner {
-    background: #000;
-    color: #ccc;
+/* Unstyle button fields */
+.inspector-hover .toggle-list label.active,
+.inspector-hover .entity-editor-pane a.hide-toggle {
+    opacity: 1;
+    background-color: transparent;
+    color: #666;
+    padding-left: 0;
+    border-width: 0;
 }
 
-.preset-fav button.fav {
-    height: 30px;
-    margin: 5px;
-    padding: 0 10px;
+.inspector-hover .toggle-list button.active {
+    padding-left: 10px;
 }
 
-/* preset form access */
+/* Add placeholder only on hover for radio buttons */
+.inspector-hover .toggle-list .placeholder {
+    color: #a9a9a9;
+    padding: 5px 10px;
+    opacity: 1;
+    line-height: 20px;
+    width: 100%;
+}
 
-.preset-input-wrap li {
-    border-bottom: 1px solid #CCC;
+/* Hide placeholder for radio buttons if another is active, or not in hover state */
+.toggle-list label.active ~ .placeholder,
+.toggle-list .placeholder {
+    padding: 0;
+    opacity: 0;
+    width: 0;
+    line-height: 0;
+    display: block;
+    overflow: hidden;
 }
-.preset-input-wrap li:last-child {
-    border-bottom: 0;
+
+/* adding additional preset fields */
+
+.more-fields {
+    padding: 0 20px 20px 20px;
+    font-weight: bold;
 }
 
+.more-fields label { padding: 5px 10px 5px 0; }
+.more-fields input { width: 50%;}
+
+/* preset form access */
+
 .preset-input-wrap .label {
+    height: 30px;
     background: #F6F6F6;
-    padding: 5px;
+    padding: 5px 10px;
+}
+
+.form-field-access .preset-input-wrap li {
+    border-bottom: 1px solid #CCC;
+}
+.form-field-access .preset-input-wrap li:last-child {
+    border-bottom: 0;
 }
 
 .preset-input-access-wrap input {
@@ -2267,32 +3002,45 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
     border-bottom-right-radius: 4px;
 }
 
+/* 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] {
     position: relative;
-    padding-right: 65px;
+    padding-right: 20%;
 }
 
 .spin-control {
-    width: 41px;
+    width: 20%;
     height: 29px;
-    border-left: 1px solid #CCC;
     display: inline-block;
-    margin-left: -41px;
+    margin-left: -20%;
     margin-bottom: -11px;
     position: relative;
 }
 
 .spin-control button {
+    right: 1px;
     position: relative;
     float: left;
     height: 100%;
     width: 50%;
     border-left: 1px solid #CCC;
-    border-right: 1px solid #CCC;
     border-radius: 0;
-    border-left: 0;
     background: rgba(0, 0, 0, 0);
 }
 
@@ -2325,9 +3073,9 @@ input[type=number] {
 
 .checkselect label:last-of-type {
     display: block;
-    padding: 5px;
-    box-sizing: border-box;
-    color: #999;
+    background: white;
+    padding: 5px 10px;
+    color: #7092FF;
 }
 
 .checkselect label:hover {
@@ -2338,146 +3086,47 @@ input[type=number] {
     color: inherit;
 }
 
-.checkselect input[type="checkbox"] {
-    margin-right: 5px;
-    width: 20px;
-    vertical-align: middle;
-    opacity: 0.5;
-}
-
-.checkselect .set input[type="checkbox"] {
-    opacity: 1;
+.checkselect label:not(.set) input[type="checkbox"] {
+    opacity: .5;
 }
 
 /* Preset form radio button */
 
-.radio-wrap button {
-    position: relative;
-    text-align: left;
-    font-weight: normal;
-    height: 30px;
-    border-radius: 0;
-    border-bottom: 1px solid #CCC;
-    color: #7092FF;
-    width: 100%;
-    padding-left: 25px;
-}
-
-.radio-wrap button::before {
-    content: "";
-    display: inline-block;
-    border-radius: 50%;
-    height: 12px;
-    width: 12px;
-    margin-right: 10px;
-    border: 1px solid #CCC;
-    position: absolute;
-    left: 5px;
-    top: 8px;
-}
-
-.radio-wrap button:hover::before {
-    box-shadow: inset 0 0 0 2px white;
-}
-
-.radio-wrap button.active::before {
-    background: #7092ff;
-    box-shadow: inset 0 0 0 2px white;
-}
-
-.radio-wrap button:last-child {
-    border-bottom: 0;
-}
-
-.radio-wrap button.active {
-    background-color: #E8EBFF !important;
-}
-
-.radio-wrap button.remove {
+.toggle-list button.remove {
     border-radius: 0 0 3px 3px;
 }
-.radio-wrap button.remove .icon {
-    position: absolute;
-    left: 2px;
-}
-
-.radio-wrap button.remove::before {
-    content: none;
-}
 
-.form-field .localized-main {
-    width: 90%;
-    border-radius: 0 0 0 4px;
-}
-
-.form-field .localized-add {
-    width: 10%;
-    height: 35px;
-    border-radius: 0 0 4px 0;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    vertical-align: top;
-}
-
-.form-field .localized-wrap .entry .localized-lang {
-    border-top: none;
-    border-right: none;
-    border-radius: 0;
-    width: 30%;
-}
-
-.form-field .localized-wrap .entry .localized-value {
-    border-top: none;
-    border-radius: 0;
-    width: 60%;
-}
-
-.form-field .localized-wrap .entry .localized-remove {
-    height: 30px;
-    border-radius: 0;
-    border-bottom: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    vertical-align: top;
-    width: 10%;
-}
-
-.form-field .localized-wrap .entry:last-child .localized-lang {
-    border-radius: 0 0 0 4px;
+.toggle-list button.remove .icon {
+    position: absolute;
+    left: 5px;
 }
 
-.form-field .localized-wrap .entry:last-child .localized-remove {
-    border-radius: 0 0 4px 0;
+.toggle-list button.remove::before {
+    content: none;
 }
 
 .form-field .wiki-lang {
-    width: 30%;
-    border-right: none;
-    border-radius: 0 0 0 4px;
+    border-radius: 0;
 }
 
 .form-field .wiki-title {
-    width: 60%;
-    border-right: none;
-    border-radius: 0;
+    padding-right: 10%;
+}
+
+.form-field .wiki-title ~ .combobox-caret {
+    margin-left: -18%;
+    margin-right: 9%;
 }
 
 .form-field .wiki-link {
-    border-radius: 0 0 4px 0;
-    border: 1px solid #ccc;
-    border-top: none;
-    height: 30px;
-    width: 10%;
     float: right;
+    background: #fafafa;
     padding: 5px;
     text-align: center;
-    -webkit-transition: all 100ms;
-       -moz-transition: all 100ms;
-         -o-transition: all 100ms;
-            transition: all 100ms;
 }
 
 .form-field .wiki-link:hover {
-    background: #ececec;
+    background: #f1f1f1;
 }
 
 #preset-input-maxspeed {
@@ -2488,52 +3137,115 @@ input[type=number] {
 
 .form-field .maxspeed-unit {
     border-radius: 0 0 4px 0;
-    border: 1px solid #ccc;
-    border-top: none;
-    height: 30px;
     width: 20%;
-    float: right;
-    padding: 5px;
-    text-align: center;
-    color: #A9A9A9;
-    font-weight: bold;
 }
 
-/* Preset form address */
+/* Name + translate form */
 
-.form-field .addr-housename {
-    border: 0;
+.form-field .localized-main {
+    padding-right: 10%;
 }
 
-.form-field .addr-number {
-    width: 33%;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+.form-field .button-input-action {
+    position: relative;
+    right: 1px;
+    width: 10%;
+    margin-left: -10%;
+    border: 1px solid #CCC;
+    border-top-width: 0;
+    border-right-width: 0;
+    border-radius: 0 0 4px 0;
+    height: 30px;
+    vertical-align: top;
+}
+
+.form-field .localized-wrap {
+    padding: 0 10px;
+}
+
+.form-field .localized-wrap .entry {
+    position: relative;
+    overflow: hidden;
+}
+
+.form-field .localized-wrap .entry::before {
+    content: "";
+    display: block;
+    position: absolute;
+    background:#ccc;
+    height: 11px;
+    width: 1px;
+    left: 0;
+    right: 0;
+    top: -11px;
+    margin: auto;
+}
+
+.form-field .localized-wrap .entry .localized-lang {
     border-radius: 0;
+    border-top-width: 0;
+}
+
+.form-field .localized-wrap .entry .localized-value {
+    border-top-width: 0;
+    border-radius: 0 0 4px 4px;
+}
+
+.form-field .localized-wrap .form-label button {
+    border-top-right-radius: 3px;
 }
 
-.form-field .addr-street {
-    width: 66%;
+/* Preset form address */
+
+.addr-row input {
     border-right: 0;
     border-bottom: 0;
-    border-radius: 0;
 }
 
-.form-field .addr-city {
-    width: 66%;
+.addr-row:first-of-type input {
+    border-top: 0;
+}
+
+.addr-row input:first-of-type {
     border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+}
+
+.addr-row input {
+    border-radius: 0;
+}
+
+.addr-row:last-of-type input:first-of-type {
     border-radius: 0 0 0 4px;
 }
 
-.form-field .addr-postcode {
-    width: 33%;
-    border-right: 0;
-    border-bottom: 0;
+.addr-row:last-of-type input:last-of-type {
     border-radius: 0 0 4px 0;
 }
+
+/* Restrictions editor */
+
+.form-field-restrictions .preset-input-wrap {
+    position: relative;
+    height: 300px;
+}
+
+.form-field-restrictions svg {
+    width: 100%;
+    height: 100%;
+}
+
+.form-field-restrictions .restriction-help {
+    z-index: 1;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    padding: 2px 6px;
+    background-color: rgba(255, 255, 255, .8);
+    color: #999;
+    text-align: center;
+}
+
 /* combobox dropdown */
 
 div.combobox {
@@ -2567,23 +3279,30 @@ div.combobox {
     border-top: 0;
 }
 
-.combobox-carat {
-    margin-left: -20px;
-    margin-right: 10px;
-    display:inline-block;
+.combobox-caret {
+    display: inline-block;
+    position: relative;
+    height: 30px;
+    width: 30px;
+    margin-left: -30px;
+    vertical-align: top;
+}
+
+.combobox-caret::after {
+    content:"";
+    height: 0; width: 0;
+    position: absolute;
+    left: 0; right: 0; bottom: 0; top: 0;
+    margin: auto;
     border-top: 5px solid #ccc;
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
 
-/* tag editor */
-
-.inspector-inner.additional-tags {
-    border-top: 1px solid #ccc;
-}
+/* Raw Tag Editor */
 
 .tag-list {
-    margin-right: 40px;
+    padding-top: 10px;
 }
 
 .tag-row {
@@ -2593,13 +3312,22 @@ div.combobox {
 }
 
 .tag-row input {
+    height: 31px;
     border: 0;
     border-radius: 0;
     border-bottom: 1px solid #CCC;
     border-left: 1px solid #CCC;
 }
 
+.tag-row .key-wrap,
+.tag-row .input-wrap-position {
+    width: 40%;
+    float: left;
+    height: 30px;
+}
+
 .tag-row input.key {
+    font-weight: bold;
     background-color: #f6f6f6;
 }
 
@@ -2618,13 +3346,11 @@ div.combobox {
 
 .tag-row button {
     position: absolute;
-    height: 30px;
-    right: -20px;
+    height: 31px;
+    right: 10%;
     border: 1px solid #CCC;
-    border-top-width: 0; border-left-width: 0;
-    border-radius: 0;
-    opacity: 1;
-    background: #fafafa;
+    border-top-width: 0;
+    border-left-width: 0;
 }
 
 .tag-row button:hover {
@@ -2639,23 +3365,26 @@ div.combobox {
     border-top-width: 1px;
 }
 
-.tag-row:first-child button.tag-help-button {
+.tag-row:first-child .tag-reference-button {
     border-top-right-radius: 4px;
 }
 
-.tag-row:last-child button.tag-help-button {
+.tag-row:last-child .tag-reference-button {
     border-bottom-right-radius: 4px;
 }
 
-.tag-row button.tag-help-button {
-    right: -40px;
+.tag-row .tag-reference-button {
+    right: 0;
+    border-radius: 0;
+    width: 10%;
+    top: 0;
+    background: #fafafa;
 }
 
 /* Adding form fields to tag editor */
 
 .inspector-inner .add-tag {
-    width: -webkit-calc(50% - 20px);
-    width: calc(50% - 20px);
+    width: 40%;
     height: 30px;
     border-top: 0;
     background: rgba(0,0,0,.5);
@@ -2672,37 +3401,60 @@ div.combobox {
 
 /* Tag reference */
 
-.preset-inspect {
-    position: relative;
+button.minor.tag-reference-loading {
+    background-color: #f5f5f5;
 }
 
-.tag-help {
+.tag-reference-loading .icon {
+    background-image: url(<%= asset_path("iD/img/mini-loader.gif") %>);
+    background-position: 0 0;
+}
+
+.tag-reference-body {
     overflow: hidden;
+    clear: both;
+}
+
+.tag-reference-body p,
+.tag-reference-body img {
+    margin-top: 20px;
+}
+
+.tag-reference-body p:last-child {
+    padding-bottom: 10px;
 }
 
-.tag-help a {
-    margin-top: 5px;
+.tag-reference-body a {
     display: block;
+    padding-bottom: 10px;
 }
 
-.grid-pane .tag-reference-wrap {
-    padding: 10px 0 20px 0;
+.preset-list .tag-reference-body {
+    position: relative;
+    width: 100%;
 }
 
-.tag-pane .tag-reference-wrap {
-    padding-top: 20px;
+.preset-list .tag-reference-body a {
+    padding-bottom: 20px;
 }
 
-.additional-tags .tag-reference-wrap {
-    border-bottom: 1px solid #ccc;
-    padding: 20px 0;
+.preset-list .tag-reference-body p,
+.preset-list .tag-reference-body img {
+    margin-top: 10px;
 }
 
-.additional-tags div.tag-help {
+.raw-tag-editor .tag-reference-body {
+    border-bottom: 1px solid #ccc;
     float: left;
     width: 100%;
-    width: -webkit-calc(100% + 40px);
-    width: calc(100% + 40px);
+}
+
+.raw-tag-editor .tag-reference-body p:last-child {
+    padding-bottom: 20px;
+}
+
+.raw-tag-editor .tag-reference-body a {
+    padding-bottom: 20px;
 }
 
 img.wiki-image {
@@ -2714,20 +3466,81 @@ img.wiki-image {
     margin-right: 10px;
     border-radius: 4px;
     max-height: 200px;
+    margin-bottom: 20px;
+}
+
+/* Raw relation membership editor */
+
+.raw-member-editor .member-list li:first-child,
+.raw-membership-editor .member-list li:first-child {
+    padding-top: 10px;
+}
+
+.raw-member-editor .member-row,
+.raw-membership-editor .member-row {
+    position: relative;
+}
+
+.raw-member-editor .member-row .member-entity-name,
+.raw-membership-editor .member-row .member-entity-name {
+    font-weight: normal;
+    padding-left: 10px;
+}
+
+.member-incomplete .member-delete {
+    display: none;
+}
+
+.member-row-new .member-entity-input {
+    border-radius: 4px 4px 0 0;
+    border: 1px solid #cfcfcf;
+}
+
+.add-relation {
+    width: 40%;
+    height: 30px;
+    background: rgba(0,0,0,.5);
+    border-radius: 4px;
+    margin-top: 10px;
+}
+
+.add-relation:hover {
+    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 {
-    left: 0;
-    top: 80px;
-    width: 30px;
-    position: absolute;
+    right: 0;
+    top: 70px;
+    width: 40px;
+    position: fixed;
     z-index: 100;
 }
 
 .map-control > button {
-    width: 30px;
+    width: 40px;
     background: rgba(0,0,0,.5);
     border-radius: 0;
 }
@@ -2736,49 +3549,126 @@ img.wiki-image {
     background: rgba(0, 0, 0, .8);
 }
 
+.map-control > button.active,
 .map-control > button.active:hover {
     background: #7092ff;
 }
 
-.map-overlay {
-    z-index: -1;
-    right: 75%;
-    max-width: 260px;
-    min-width: 210px;
-    position: fixed;
-    left: 30px;
-    display: block;
-    padding: 10px 10px 0 10px;
+/* Zoomer */
+
+.zoombuttons button.zoom-in {
+    border-radius: 4px 0 0 0;
+}
+
+/* Background / Map Data Settings */
+
+.map-data-control button {
+    border-radius: 0;
+}
+
+.background-control button {
+    border-radius: 4px 0 0 0;
+}
+
+.map-data-control,
+.background-control {
+    position: relative;
+}
+
+.imagery-faq {
+    margin-bottom: 10px;
+}
+
+.map-data-control .hide-toggle,
+.background-control .hide-toggle {
+    padding-bottom: 10px;
+}
+
+.layer-list, .controls-list {
+    margin-bottom: 10px;
+    border: 1px solid #CCC;
+    border-radius: 4px;
+}
+
+.layer-list li {
+    position: relative;
+    height: 30px;
+    background-color: white;
+    color: #7092FF;
+}
+
+.layer-list:empty {
+    display: none;
+}
+
+.layer-list > li:first-child {
+    border-radius: 3px 3px 0 0;
+}
+
+.layer-list > li:last-child {
+    border-radius: 0 0 3px 3px;
+}
+
+.layer-list > li:only-child {
+    border-radius: 3px;
+}
+
+.layer-list li:not(:last-child) {
+    border-bottom: 1px solid #ccc;
+}
+
+.layer-list li:hover {
+    background-color: #ececec;
+}
+
+.layer-list li.active {
+    background: #E8EBFF;
 }
 
-/* Zoomer */
+.layer-list li.best > div.best {
+    display: inline-block;
+    padding: 5px;
+    float: right;
+}
 
-.zoombuttons button.zoom-in {
-    border-radius:0 4px 0 0;
+/* 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;
 }
 
-/* Background Settings */
+.layer-list label {
+    display: block;
+    padding: 5px 10px;
+    cursor: pointer;
+}
 
-.background-control button {
-    border-radius:0 4px 0 0;
+.layer-list label > span {
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
-.background-control button.active {
-    border-radius: 0;
+.minimap-toggle {
+    display: block;
+    padding: 5px 10px;
+    cursor: pointer;
+    color: #7092FF;
+    border-radius: 3px;
 }
 
-.nudge-container {
-    border-top: 1px solid #CCC;
-    margin: 0 -10px;
+.minimap-toggle.active {
+    background: #E8EBFF;
 }
 
-.background-control .adjustments button:last-child {
-    border: 0;
+.minimap-toggle:hover {
+    background-color: #ececec;
 }
 
 .hide-toggle {
     display: block;
-    padding: 0 0 10px 12px;
+    padding-left:12px;
     position: relative;
 }
 
@@ -2802,16 +3692,41 @@ img.wiki-image {
     border-left:  4px solid transparent;
 }
 
-.background-control .nudge-container button {
-    float: left;
-    display: block;
-    width:20%;
-    border-radius: 0;
-    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;
@@ -2821,13 +3736,61 @@ img.wiki-image {
     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;
+}
+
+.background-control .nudge.right::after {
     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;
@@ -2848,10 +3811,10 @@ img.wiki-image {
 .opacity-options {
     background: url(<%= asset_path("iD/img/background-pattern-opacity.png") %>) 0 0 repeat;
     height:20px;
-    width:62px;
+    width:82px;
     position: absolute;
-    right: 10px;
-    top: 10px;
+    right: 50px;
+    top: 20px;
     border: 1px solid #ccc;
 }
 
@@ -2868,6 +3831,8 @@ img.wiki-image {
     z-index: 9999;
 }
 
+.map-data-control li:hover .select-box,
+.map-data-control li.selected .select-box,
 .background-control li:hover .select-box,
 .background-control li.selected .select-box {
     border: 2px solid #7092ff;
@@ -2875,6 +3840,8 @@ img.wiki-image {
     opacity: .5;
 }
 
+.map-data-control li.selected:hover .select-box,
+.map-data-control li.selected .select-box,
 .background-control li.selected:hover .select-box,
 .background-control li.selected .select-box {
     opacity: 1;
@@ -2887,74 +3854,55 @@ img.wiki-image {
     height:18px;
 }
 
-.background-control .layer-toggle-gpx .layer-extent {
+.map-data-control .layer-list button,
+.background-control .layer-list button {
+    float: right;
+    height: 100%;
+    width: 10%;
     border-left: 1px solid #CCC;
+    border-radius: 0;
 }
 
-.background-control .layer-toggle-gpx.selected .layer-extent {
-    display:inline-block;
+.map-data-control .layer-list button .icon,
+.background-control .layer-list button .icon {
+    opacity: 0.5;
 }
 
-/* Geocoder */
-
-.geocode-control form {
-    top:260px;
+.map-data-control .layer-list button:first-of-type,
+.background-control .layer-list button:first-of-type {
+    border-radius: 0 3px 3px 0;
 }
 
-.geocode-control form {
-    padding: 5px;
+.map-data-control .map-overlay,
+.background-control .map-overlay,
+.help-control .map-overlay {
+    z-index: -1;
 }
 
-.geocode-control input {
-    width: 100%;
-}
 
-.geocode-control div.map-overlay {
-    border-top: 1px solid #CCC;
-    z-index: 100;
-    max-height: 240px;
-    overflow-y: auto;
-    padding: 0;
-    margin-top: 40px;
-}
+/* Geolocator */
 
-.geocode-control div.map-overlay span {
-    display: inline-block;
-    border-bottom: 1px solid #CCC;
-    padding: 5px 10px;
-}
-.geocode-control div.map-overlay span.not-found {
-    line-height: 28px;
-    width: 100%;
+.geolocate-control {
+    margin-bottom: 10px;
 }
 
-.geocode-control a:focus {
-    text-decoration: underline;
+.geolocate-control button {
+    border-radius: 0 0 0 4px;
 }
 
-/* Geolocator */
-
-.geolocate-control button {
-    border-radius: 0 0 4px 0;
+.map-overlay.content {
+    position: fixed;
+    top:60px;
+    bottom: 30px;
+    padding: 20px 50px 20px 20px;
+    right: 0;
+    overflow: auto;
 }
 
 /* Help */
 
-.help-control {
-    margin-bottom: 20px;
-}
-
 .help-control button {
-    border-radius: 0 0 4px 0;
-}
-
-.help-wrap {
-    position: absolute;
-    top:60px;
-    bottom: 30px;
-    padding: 20px 20px 20px 50px;
-    left: 0;
-    overflow-y: scroll;
+    border-radius: 0 0 0 4px;
 }
 
 .help-wrap p {
@@ -3022,74 +3970,244 @@ img.wiki-image {
     text-align: center;
 }
 
-.help-wrap .nav a:first-child {
-    border-radius: 4px 0 0 4px;
+.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;
+}
+
+/* Map
+------------------------------------------------------- */
+
+#map {
+    position:relative;
+    overflow:hidden;
+    height:100%;
+    background:#000;
+}
+
+#supersurface {
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+#supersurface, .layer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+
+/* Map-In-Map
+------------------------------------------------------- */
+
+.map-in-map {
+    position: absolute;
+    overflow: hidden;
+    top: 60px;
+    width: 200px;
+    height: 150px;
+    z-index: 5;
+    background: #000;
+    border: #aaa 1px solid;
+    box-shadow: 0 0 2em black;
+}
+
+.map-in-map-tiles {
+    transform-origin:0 0;
+    -ms-transform-origin:0 0;
+    -webkit-transform-origin:0 0;
+    -moz-transform-origin:0 0;
+    -o-transform-origin:0 0;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.map-in-map-svg,
+.map-in-map-gpx {
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+}
+
+.map-in-map-svg {
+    position: absolute;
+}
+
+.map-in-map-gpx {
+    position: relative;
+    z-index: 10;
+}
+
+.bbox,
+.map-in-map-bbox {
+    fill: none;
+    stroke: rgba(255, 255, 0, 0.75);
+    stroke-width: 1;
+    shape-rendering: crispEdges;
+}
+
+.map-in-map-bbox.thick {
+    stroke-width: 5;
+}
+
+/* Info Box
+------------------------------------------------------- */
+.infobox {
+    position: absolute;
+    z-index: 1;
+    right: 0;
+    bottom: 30px;
+    width: 240px;
+    border-radius: 4px 0 0 0;
+    border-bottom: 1px solid black;
+}
+
+.infobox .infobox-heading {
+    display: block;
+    border-radius: 4px 0 0 0;
+    padding: 5px 10px;
+    height: 30px;
+}
+
+.infobox ul {
+    padding: 5px 10px;
+}
+
+.infobox .button {
+    position: absolute;
+    background: #7092ff;
+    border-radius: 2px;
+    padding: 0 4px;
+    color: white;
+    top: 40px;
+    right: 10px;
+}
+
+/* About Section
+------------------------------------------------------- */
+
+#about {
+    width: 100%;
+    position: absolute;
+    right:0;
+    bottom:0;
+    border-radius: 0;
+    pointer-events: none;
+}
+
+#attrib {
+    width: 100%;
+    height: 20px;
+    margin-bottom: 5px;
+    float: left;
+    clear: both;
+}
+
+#attrib * { pointer-events: all; }
+
+.base-layer-attribution,
+.overlay-layer-attribution {
+    position: absolute;
+    color: #888;
+    font-size: 10px;
+}
+
+.base-layer-attribution {
+    left: 10px;
+}
+
+.overlay-layer-attribution {
+    right: 10px;
+}
+
+.overlay-layer-attribution .attribution:not(:last-child):after {
+    content: '; ';
 }
 
-.help-wrap .nav a:last-child:not(:only-child) {
-    border-radius: 0 4px 4px 0;
-    border-left: 0;
+.source-image {
+    height:20px;
+    vertical-align:top;
 }
 
-.help-wrap .nav a:only-child {
+#footer {
     width: 100%;
-    border-radius: 4px;
+    float: left;
+    clear: both;
+    pointer-events: all;
 }
 
-/* Map
-------------------------------------------------------- */
+#scale-block {
+    display: table-cell;
+    vertical-align: bottom;
+    width: 250px;
+    max-height: 30px;
+    float: left;
+    clear: left;
+}
 
-#map {
-    display:block;
-    position:absolute;
-    overflow:hidden;
-    top:0px;
-    left:0;
-    right:0;
-    bottom:0;
-    background:#000;
+#info-block {
+    max-height: 30px;
+    clear: right;
 }
 
-#supersurface {
-    transform-origin:0 0;
-    -ms-transform-origin:0 0;
-    -webkit-transform-origin:0 0;
-    -moz-transform-origin:0 0;
-    -o-transform-origin:0 0;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+#scale {
+    height: 30px;
+    width: 100%;
 }
 
-#surface, #layer-g, .layer-layer {
-    position: absolute;
+#scale text {
+    font: 12px sans-serif;
+    stroke: none;
+    fill: #ccc;
+    text-anchor: start;
 }
 
-/* About Section
-------------------------------------------------------- */
+#scale path {
+    fill: none;
+    stroke: #ccc;
+    stroke-width: 1;
+    shape-rendering: crispEdges;
+}
 
-.about-block {
-    position: absolute;
-    right:0px;
-    bottom:0px;
+#about-list {
+    text-align: right;
+    margin-right: 10px;
+    clear: right;
     overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    border-radius: 0;
-    opacity: .625;
-    -webkit-transition: opacity 200ms;
-    -moz-transition: opacity 200ms;
-    transition: opacity 200ms;
 }
 
-.about-block:hover {
-    opacity: 1;
+#about-list li {
+    float: right;
+    border-left: 1px solid rgba(255,255,255,.5);
+    padding: 5px 0 5px 5px;
+    margin-left: 5px;
 }
 
-#about {
-    text-align: right;
-    margin-right: 10px;
+#about-list li:last-child {
+    border-left: 0;
+    margin-left: 0;
+    padding-left: 0;
 }
 
 .source-switch a {
@@ -3101,59 +4219,44 @@ img.wiki-image {
     color:#fff;
 }
 
-/* Attribution overlay */
-.attribution {
-    position: absolute;
-    bottom: 35px;
-    left:10px;
-    color:#888;
-    font-size:10px;
-}
-
-.source-image {
-    height:20px;
-    vertical-align:top;
+.feature-warning a {
+    background: #1e90ff;
+    padding: 2px 4px 4px 4px;
+    border-radius: 2px;
+    color: #eee;
 }
 
 .user-list a:not(:last-child):after {
     content: ', ';
 }
 
-/* API Status */
-
 .api-status {
-    float: left;
+    float: right;
+    clear: both;
+    text-align: right;
+    width: 100%;
+    padding: 0px 10px;
 }
 
 .api-status.offline,
-.api-status.readonly {
+.api-status.readonly,
+.api-status.error {
     background: red;
-    padding: 5px 10px;
-}
-
-/* Account Information */
-
-.account {
-    float: left;
-    padding: 5px 10px;
-}
-
-.account .logout {
-    margin-left:10px;
-    border-left: 1px solid white;
-    padding-left: 10px;
 }
 
 /* Modals
 ------------------------------------------------------- */
 
 .modal {
+    top: 40px;
     display: inline-block;
     position:absolute;
+    border-radius: 3px;
+    overflow: hidden;
     left: 0;
     right: 0;
     margin: auto;
-    z-index: 3;
+    z-index: 50;
 }
 
 .modal .loader {
@@ -3165,10 +4268,12 @@ img.wiki-image {
 }
 
 .shaded {
-    z-index: 2;
+    z-index: 49;
     position: absolute;
-    height: 100%;
-    width: 100%;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
     overflow: auto;
 }
 
@@ -3184,8 +4289,27 @@ img.wiki-image {
     border-bottom: 1px solid #CCC;
 }
 
-.modal-section:last-child {
-    border-bottom: 0;
+.modal-section.header h3 {
+    padding: 0;
+}
+
+.modal-section.buttons {
+    text-align: center;
+}
+
+.modal-section.buttons .action {
+    display: inline-block;
+    margin: 0 10px;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.save-section .buttons .action,
+.save-section .buttons .secondary-action {
+    display: inline-block;
+    margin: 0 20px 0 0;
+    text-align: center;
+    vertical-align: middle;
 }
 
 .loading-modal {
@@ -3193,69 +4317,78 @@ img.wiki-image {
 }
 
 .modal-actions button,
-.modal-actions a {
-    background-size: white;
+.save-success a.button {
     font-weight: normal;
     color: #7092FF;
     border-bottom: 1px solid #CCC;
     border-radius: 0;
-    height: 180px;
+    height: 160px;
     text-align: center;
     display: inline-block;
 }
 
-.modal-actions a {
-    /* `button` elements have box-algin: auto, need
-    compensate this for `a`*/
-    padding-top: 25px;
-}
-
-.modal-actions button:hover,
-.modal-actions a:hover {
+.modal-actions button:hover
+.save-success a.button:hover {
     background-color: #ececec;
 }
 
-.modal-actions a:before,
 .modal-actions button:before,
+.save-success a.button.osm:before,
 .walkthrough a:before {
-    background-size: white;
     display: block;
     content: '';
     height: 100px;
-    width: 100px;
+    width: 100%;
+    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 {
     border-right: 1px solid #CCC;
 }
 
+.modal-section:last-child {
+    border-bottom: 0;
+}
+
 /* Restore Modal
 ------------------------------------------------------- */
 
 .modal-actions .restore:before {
-    background-position: -500px -220px;
+    background-position: -500px -460px;
 }
 
 .modal-actions .reset:before {
-    background-position: -600px -220px;
+    background-position: -600px -460px;
 }
 
 /* Success Modal
 ------------------------------------------------------- */
 
-.modal-actions .twitter:before {
-    background-position: -100px -220px;
+.save-success p {
+    padding: 15px 15px 0 15px;
+}
+.save-success a.details {
+  padding-left: 15px;
+}
+.save-success .button {
+    padding-top: 15px;
+}
+
+.save-success a.button.social {
+    height: auto;
 }
 
-.modal-actions .facebook {
-    border-left: 1px solid #ccc;
+.save-success .icon.social {
+    height: 80px;
+    width: 80px;
+    color: #7092FF;
 }
 
-.modal-actions .facebook:before {
-    background-position: -200px -220px;
+.save-success .button.osm:before {
+    background-position: -200px -460px;
 }
 
 /* Splash Modal
@@ -3263,30 +4396,29 @@ img.wiki-image {
 
 .modal-actions .walkthrough:before,
 .walkthrough a:before {
-    background-position: -300px -220px;
+    background-position: -300px -460px;
 }
 
 .modal-actions .start:before {
-    background-position: -400px -220px;
+    background-position: -400px -460px;
 }
 
 /* Commit Modal
 ------------------------------------------------------- */
 
-.commit-modal a.user-info {
+.mode-save a.user-info {
     display: inline-block;
 }
 
-.commit-modal .commit-info {
-    margin-top: 10px;
-    padding-bottom: 20px;
+.mode-save .commit-form {
+    margin-bottom: 0;
 }
 
-.commit-modal .user-info img {
+.mode-save .user-info img {
     float: left;
 }
 
-.commit-modal h3 small.count {
+.mode-save h3 small.count {
     margin-right: 10px;
     text-align: center;
     float: left;
@@ -3300,22 +4432,33 @@ img.wiki-image {
     color:#fff;
 }
 
-.commit-modal .changeset-list {
-    overflow: auto;
+.mode-save .commit-info {
+    margin-bottom: 10px;
+}
+
+.mode-save .changeset-list {
     border:1px solid #ccc;
     border-radius: 4px;
     background:#fff;
-    max-height: 160px;
 }
 
-.commit-modal .warning-section .changeset-list button {
+.mode-save .warning-section .changeset-list button {
     border-left: 1px solid #CCC;
 }
 
-.commit-modal .changeset-list li {
+.mode-save .changeset-list li {
     position: relative;
     border-top:1px solid #ccc;
     padding:5px 10px;
+    cursor: pointer;
+}
+
+.mode-save .changeset-list li:hover {
+    background-color: #ececec;
+}
+
+.mode-save .changeset-list .alert {
+    opacity: 0.5;
 }
 
 .changeset-list li span.count {
@@ -3323,28 +4466,85 @@ img.wiki-image {
     color:#555;
 }
 
+.mode-save .commit-section .changeset-list button {
+    border-left: 1px solid #CCC;
+}
+
 .changeset-list li span.count:before { content: '('; }
 
 .changeset-list li span.count:after { content: ')'; }
 
 .changeset-list li:first-child { border-top: 0;}
 
+/* Conflict resolution
+------------------------------------------------------- */
+
+.conflicts-help {
+    padding: 20px;
+    background-color: #ffffbb;
+    border-bottom: 1px solid #ccc;
+}
+
+.conflicts-buttons {
+    padding: 20px;
+}
+
+.mode-save button.conflicts-button {
+    float: left;
+}
+
+.conflict-container {
+    border-bottom: 1px solid #ccc;
+}
+
+.conflict-description {
+    padding: 5px 20px;
+    display: block;
+}
+
+.conflicts-done {
+    padding: 20px 20px 0 20px;
+}
+
+.conflict-detail-container {
+    padding: 10px 20px;
+}
+
+.conflict-count {
+    padding: 10px 20px;
+}
+
+.conflict-choices {
+    margin-top: 10px;
+}
+
+.conflict-nav-buttons {
+    padding: 10px 0 20px 0;
+}
+
+.conflict-nav-button {
+    height: 30px;
+}
+
 /* Notices
 ------------------------------------------------------- */
 
 .notice {
-    float:left;
-    width:25%;
-    padding-right: 10px;
-    text-align:center;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    text-align: center;
+    background: #fff;
 }
 
 .notice .zoom-to {
-    width:100%;
-    height: 40px;
+    margin: auto;
+    width: 80%;
+    height: 100px;
     border-radius: 5px;
     line-height: 40px;
-    background: #fff;
     color: #000;
     opacity: 0.9;
 }
@@ -3358,15 +4558,10 @@ img.wiki-image {
     margin-right:10px;
 }
 
-.icon.zoom-in-invert {
-    background-position: -240px -40px;
-}
-
 /* Tooltips
 ------------------------------------------------------- */
 
 .tooltip {
-    width: 200px;
     position: absolute;
     display: none;
     color:#333;
@@ -3397,10 +4592,14 @@ img.wiki-image {
 
 .tooltip.left {
     margin-left: -20px;
+    text-align: right;
 }
 
 .tooltip-inner {
     display: inline-block;
+    border-radius: 3px;
+    max-width: 200px;
+    min-width: 80px;
     padding: 10px;
     font-weight: normal;
     background-color: white;
@@ -3431,6 +4630,7 @@ img.wiki-image {
 }
 
 .tail div {
+    border-radius: 3px;
     padding: 10px;
     background: white;
     position: absolute;
@@ -3494,86 +4694,109 @@ img.wiki-image {
     border-width: 0 5px 5px;
 }
 
+.keyhint-wrap {
+    background: #F6F6F6;
+    padding: 10px;
+    margin: 10px -10px -10px;
+    border-radius: 0 0 3px 3px;
+}
 
-/* Exceptions for tooltips that are up against the edge of the screen */
-.add-point .tooltip {
-    left: -20px !important; }
+.tooltip-inner .keyhint {
+    font-weight: bold;
+}
 
-.curtain-tooltip.intro-points-add .tooltip-arrow,
-.add-point .tooltip .tooltip-arrow {
-    left: 60px;
+/* Exceptions for tooltip layouts */
+
+/* make tooltips in panels dark */
+.map-overlay .tooltip.top .tooltip-arrow,
+.entity-editor-pane .tooltip.top .tooltip-arrow,
+.warning-section .tooltip.top .tooltip-arrow {
+    border-top-color: #000;
 }
 
-.tooltip .keyhint-wrap {
-    padding: 5px 0 5px 0;
+.map-overlay .tooltip.bottom .tooltip-arrow,
+.entity-editor-pane .tooltip.bottom .tooltip-arrow,
+.warning-section .tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #000;
 }
 
-.tooltip-inner .keyhint {
-    color: #222;
-    font-size: 10px;
-    padding: 0 7px;
-    font-weight: bold;
-    display: inline-block;
-    border-radius: 2px;
-    border: 1px solid #CCC;
-    position: relative;
-    z-index: 1;
-    text-align: left;
-    clear: both;
+.map-overlay .tooltip.left .tooltip-arrow,
+.entity-editor-pane .tooltip.left .tooltip-arrow,
+.warning-section .tooltip.left .tooltip-arrow {
+    border-left-color: #000;
 }
 
-.tooltip .keyhint .keyhint-label {
-    display: inline-block;
+.map-overlay .tooltip.right .tooltip-arrow,
+.entity-editor-pane .tooltip.right .tooltip-arrow,
+.warning-section .tooltip.right .tooltip-arrow {
+    border-right-color: #000;
 }
 
-.tooltip-inner .keyhint::after {
-    content: "";
-    position: absolute;
-    border-radius: 2px;
-    height: 10px;
-    width: 100%;
-    z-index: 0;
-    bottom: -4px;
-    left: -1px;
-    border: 1px solid #CCC;
-    border-top: 0;
+.map-overlay .tooltip-inner,
+.map-overlay .keyhint-wrap,
+.entity-editor-pane .tooltip-inner,
+.warning-section .tooltip-inner {
+    background: #000;
+    color: #ccc;
+}
+/* commit warning tooltips need to be closer */
+.warning-section .tooltip.top {
+    margin-top: -5px;
+}
+
+/* Uncramp map-control tooltips */
+.map-control .tooltip {
+    min-width: 160px;
+}
+/* Move over tooltips that are near the edge of screen */
+.add-point .tooltip {
+    left: 33.3333% !important;
+}
+
+.curtain-tooltip.intro-points-add .tooltip-arrow,
+.add-point .tooltip .tooltip-arrow {
+    left: 60px;
 }
 
 .radial-menu-tooltip {
-    background-color: rgba(255, 255, 255, 0.8);
+    opacity: 0.8;
     display: none;
     position: absolute;
     width: 200px;
 }
 
 .radial-menu-background {
+    fill: none;
     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);
 }
 
-.radial-menu .icon {
-    pointer-events: none;
+.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-box {
-    fill-opacity:0.1;
+.lasso-path {
+    fill-opacity:0.3;
     stroke: #fff;
     stroke-width: 1;
     stroke-opacity: 1;
@@ -3584,12 +4807,23 @@ img.wiki-image {
 ------------------------------------------------------- */
 
 @media only screen and (max-width: 840px) {
-    #bar .label {display: none;}
-    #bar .icon.icon-pre-text { margin-right: 0;}
     /* override hide for save button */
     #bar .save .label { display: block;}
 }
 
+@media screen and (max-width: 1200px) {
+    .user-list { display: none !important; }
+}
+
+@media screen and (max-width: 1000px) {
+    #userLink { display: none !important; }
+}
+
+@media screen and (max-width: 900px) {
+    #scale-block { display: none !important; }
+}
+
+
 /* Scrollbars
  ----------------------------------------------------- */
 
@@ -3689,11 +4923,12 @@ img.wiki-image {
 .intro-points-add .tooltip-inner::before,
 .intro-areas-add .tooltip-inner::before,
 .intro-lines-add .tooltip-inner::before {
+    margin-left: -20px;
     display: block;
     content: "";
     height: 80px;
     width: 200px;
-    background:transparent url(<%= asset_path("iD/img/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 {
@@ -3713,135 +4948,6 @@ img.wiki-image {
 .huge-modal-button .illustration {
     height: 100px;
     width: 100px;
-    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -301px -220px;
+    background: rgba(0, 0, 0, 0) url(<%= asset_path("iD/img/iD-sprite.svg") %>) no-repeat -300px -460px;
     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;}
-.feature-airfield{background-position:-0px -34px;}
-.feature-airport{background-position:-0px -94px;}
-.feature-alcohol-shop{background-position:-0px -154px;}
-.feature-america-football{background-position:-0px -214px;}
-.feature-art-gallery{background-position:-0px -274px;}
-.feature-bank{background-position:-0px -334px;}
-.feature-bar{background-position:-0px -394px;}
-.feature-baseball{background-position:-0px -454px;}
-.feature-basketball{background-position:-0px -514px;}
-.feature-beer{background-position:-0px -574px;}
-.feature-bicycle{background-position:-0px -634px;}
-.feature-building{background-position:-0px -694px;}
-.feature-bus{background-position:-0px -754px;}
-.feature-cafe{background-position:-0px -814px;}
-.feature-campsite{background-position:-0px -874px;}
-.feature-cemetery{background-position:-0px -934px;}
-.feature-cinema{background-position:-0px -994px;}
-.feature-circle{background-position:-0px -1054px;}
-.feature-circle-stroked{background-position:-0px -1114px;}
-.feature-college{background-position:-0px -1174px;}
-.feature-commercial{background-position:-0px -1234px;}
-.feature-cricket{background-position:-0px -1294px;}
-.feature-cross{background-position:-0px -1354px;}
-.feature-dam{background-position:-0px -1414px;}
-.feature-danger{background-position:-0px -1474px;}
-.feature-disability{background-position:-0px -1534px;}
-.feature-embassy{background-position:-0px -1594px;}
-.feature-emergency-telephone{background-position:-0px -1654px;}
-.feature-fast-food{background-position:-0px -1714px;}
-.feature-ferry{background-position:-0px -1774px;}
-.feature-fire-station{background-position:-0px -1834px;}
-.feature-fuel{background-position:-0px -1894px;}
-.feature-garden{background-position:-0px -1954px;}
-.feature-golf{background-position:-0px -2014px;}
-.feature-grocery{background-position:-0px -2074px;}
-.feature-harbor{background-position:-0px -2134px;}
-.feature-heliport{background-position:-0px -2194px;}
-.feature-hospital{background-position:-0px -2254px;}
-.feature-industrial{background-position:-0px -2314px;}
-.feature-library{background-position:-0px -2374px;}
-.feature-lodging{background-position:-0px -2434px;}
-.feature-logging{background-position:-0px -2494px;}
-.feature-marker{background-position:-0px -2554px;}
-.feature-marker-stroked{background-position:-0px -2614px;}
-.feature-monument{background-position:-0px -2674px;}
-.feature-museum{background-position:-0px -2734px;}
-.feature-music{background-position:-0px -2794px;}
-.feature-oil-well{background-position:-0px -2854px;}
-.feature-park{background-position:-0px -2914px;}
-.feature-park2{background-position:-0px -2974px;}
-.feature-parking{background-position:-0px -3034px;}
-.feature-parking-garage{background-position:-0px -3094px;}
-.feature-pharmacy{background-position:-0px -3154px;}
-.feature-pitch{background-position:-0px -3214px;}
-.feature-place-of-worship{background-position:-0px -3274px;}
-.feature-police{background-position:-0px -3334px;}
-.feature-post{background-position:-0px -3394px;}
-.feature-prison{background-position:-0px -3454px;}
-.feature-rail{background-position:-0px -3514px;}
-.feature-rail-above{background-position:-0px -3574px;}
-.feature-rail-underground{background-position:-0px -3634px;}
-.feature-religious-christian{background-position:-0px -3694px;}
-.feature-religious-jewish{background-position:-0px -3754px;}
-.feature-religious-muslim{background-position:-0px -3814px;}
-.feature-restaurant{background-position:-0px -3874px;}
-.feature-roadblock{background-position:-0px -3934px;}
-.feature-school{background-position:-0px -3994px;}
-.feature-shop{background-position:-0px -4054px;}
-.feature-skiing{background-position:-0px -4114px;}
-.feature-slaughterhouse{background-position:-0px -4174px;}
-.feature-soccer{background-position:-0px -4234px;}
-.feature-square{background-position:-0px -4294px;}
-.feature-square-stroked{background-position:-0px -4354px;}
-.feature-star{background-position:-0px -4414px;}
-.feature-star-stroked{background-position:-0px -4474px;}
-.feature-swimming{background-position:-0px -4534px;}
-.feature-telephone{background-position:-0px -4594px;}
-.feature-tennis{background-position:-0px -4654px;}
-.feature-theatre{background-position:-0px -4714px;}
-.feature-toilets{background-position:-0px -4774px;}
-.feature-town-hall{background-position:-0px -4834px;}
-.feature-triangle{background-position:-0px -4894px;}
-.feature-triangle-stroked{background-position:-0px -4954px;}
-.feature-warehouse{background-position:-0px -5014px;}
-.feature-waste-basket{background-position:-0px -5074px;}
-.feature-water{background-position:-0px -5134px;}
-.feature-wetland{background-position:-0px -5194px;}
-.feature-zoo{background-position:-0px -5254px;}
-.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;}