diff --git a/css/20_map.css b/css/20_map.css
index 5823f3878..697880e6e 100644
--- a/css/20_map.css
+++ b/css/20_map.css
@@ -251,64 +251,3 @@ path.gpx {
 text.gpx {
     fill: #FF26D4;
 }
-
-/* 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.related:not(.selected),
-.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.area.fill {
-    fill-opacity: 0;
-    stroke-width: 60px;
-    pointer-events: visibleStroke;
-}
diff --git a/css/70_fills.css b/css/70_fills.css
new file mode 100644
index 000000000..6d564417a
--- /dev/null
+++ b/css/70_fills.css
@@ -0,0 +1,61 @@
+/* Fill Styles */
+
+.low-zoom.fill-wireframe path.stroke,
+.fill-wireframe path.stroke {
+    stroke-width: 1 !important;
+    stroke-opacity: 0.5 !important;
+    stroke-dasharray: none !important;
+    fill: none !important;
+}
+
+.low-zoom.fill-wireframe path.shadow,
+.fill-wireframe path.shadow {
+    stroke-width: 8 !important;
+}
+
+.fill-wireframe path.shadow.related:not(.selected),
+.fill-wireframe path.shadow.hover:not(.selected) {
+    stroke-opacity: 0.4 !important;
+}
+.fill-wireframe path.shadow.selected {
+    stroke-opacity: 0.6 !important;
+}
+
+.fill-wireframe .point,
+.fill-wireframe .areaicon,
+.fill-wireframe .areaicon-halo,
+.fill-wireframe path.casing,
+.fill-wireframe path.fill,
+.fill-wireframe path.oneway {
+    display: none !important;
+}
+
+.fill-partial path.area.fill {
+    fill-opacity: 0;
+    stroke-width: 60px;
+    pointer-events: visibleStroke;
+}
+
+/* Modes */
+
+.mode-draw-line .vertex.active,
+.mode-draw-area .vertex.active,
+.mode-drag-node .vertex.active {
+    display: none;
+}
+
+.mode-draw-line .way.active,
+.mode-draw-area .way.active,
+.mode-drag-node .active {
+    pointer-events: none;
+}
+
+/* Ensure drawing doesn't interact with area fills. */
+.mode-add-point path.area.fill,
+.mode-draw-line path.area.fill,
+.mode-draw-area path.area.fill,
+.mode-add-line path.area.fill,
+.mode-add-area path.area.fill,
+.mode-drag-node path.area.fill {
+    pointer-events: none;
+}