diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index 4521e57d9d..56959d73e7 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -16,7 +16,7 @@
       ]
     }
   },
-  "minzoom": 14,
+  "minzoom": 17,
   "title": {
     "render": {
       "en": "Crossing",
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 56b39046a4..e5437ad57b 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -17,13 +17,14 @@
     "nl"
   ],
   "maintainer": "",
+  "defaultBackgroundId": "CartoDB.Positron",
   "icon": "./assets/svg/cycle-infra.svg",
   "version": "0",
   "startLat": 51,
   "startLon": 3.75,
   "startZoom": 11,
   "widenFactor": 0.05,
-  "socialImage": "",
+  "socialImage": "./assets/svg/cycle-infra.svg",
   "enableDownload": true,
   "layers": [
     {
@@ -777,29 +778,63 @@
         "render": "#aaaaaa",
         "mappings": [
           {
-            "if": {
-              "or": [
-                "highway=cycleway",
-                "highway=path"
-              ]
-            },
-            "then": "#00ff00"
+            "if": "highway=cycleway",
+            "then": "rgba(0, 189, 141, 0.7)"
+          },
+          {
+            "if": "highway=path",
+            "then": "rgba(204, 74, 207, 0.7)"
           },
           {
             "if": "cycleway=track",
-            "then": "#45c445"
+            "then": "rgba(113, 3, 200, 0.7)"
           },
           {
             "if": "cycleway=shared_lane",
-            "then": "#ff0000"
+            "then": "rgba(74, 59, 247, 0.7)"
           },
           {
             "if": "cycleway=lane",
-            "then": "#ff9900"
+            "then": "rgba(254, 155, 6, 0.9)"
           },
           {
             "if": "cyclestreet=yes",
-            "then": "#0000ff"
+            "then": "rgba(57, 159, 191, 0.7)"
+          }
+        ]
+      },
+      "dashArray": {
+        "render": "",
+        "mappings": [
+          {
+            "if": {
+              "or": [
+                "oneway=yes",
+                {
+                  "or": [
+                    "highway=cycleway",
+                    "highway=path"
+                  ]
+                }
+              ]
+            },
+            "then": ""
+          },
+          {
+            "if": "cycleway=track",
+            "then": "30 15"
+          },
+          {
+            "if": "cycleway=shared_lane",
+            "then": "15 30"
+          },
+          {
+            "if": "cycleway=lane",
+            "then": "25 15 15 15 25"
+          },
+          {
+            "if": "cyclestreet=yes",
+            "then": ""
           }
         ]
       },
@@ -826,7 +861,7 @@
           ]
         }
       },
-      "minzoom": 19,
+      "minzoom": 14,
       "wayHandling": 0,
       "title": {
         "render": {
@@ -989,7 +1024,7 @@
           ]
         }
       },
-      "minzoom": 14,
+      "minzoom": 17,
       "title": {
         "render": {
           "en": "Barrier",