diff --git a/assets/layers/cycleways_and_roads/cycleways_and_roads.json b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
index 8c7131cd5..d3060cf28 100644
--- a/assets/layers/cycleways_and_roads/cycleways_and_roads.json
+++ b/assets/layers/cycleways_and_roads/cycleways_and_roads.json
@@ -20,6 +20,12 @@
         "highway=unclassified",
         "highway=primary",
         "highway=secondary",
+        "highway=tertiary_link",
+        "highway=primary_link",
+        "highway=secondary_link",
+        "highway=service",
+        "highway=footway",
+        "highway=pedestrian",
         {
           "and": [
             "highway=path",
@@ -109,7 +115,8 @@
       "condition": {
         "and": [
           "highway!=cycleway",
-          "highway!=path"
+          "highway!=path",
+          "highway!=footway"
         ]
       },
       "mappings": [
@@ -226,7 +233,8 @@
       "condition": {
         "and": [
           "highway!=cycleway",
-          "highway!=path"
+          "highway!=path",
+          "highway!=footway"
         ]
       },
       "mappings": [
@@ -280,7 +288,8 @@
       "condition": {
         "and": [
           "highway!=cycleway",
-          "highway!=path"
+          "highway!=path",
+          "highway!=footway"
         ]
       },
       "mappings": [
@@ -776,7 +785,8 @@
       "condition": {
         "and": [
           "highway!=cycleway",
-          "highway!=path"
+          "highway!=path",
+          "highway!=footway"
         ]
       },
       "render": {
diff --git a/assets/layers/kerbs/KerbIcon.svg b/assets/layers/kerbs/KerbIcon.svg
index 001b5eac1..d19fa5ad2 100644
--- a/assets/layers/kerbs/KerbIcon.svg
+++ b/assets/layers/kerbs/KerbIcon.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,12 +7,12 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15.46875"
-   height="14.006409"
+   width="16"
+   height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="kerb05.svg">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="KerbIcon.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -25,7 +23,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="32"
-     inkscape:cx="6.103137"
+     inkscape:cx="4.775012"
      inkscape:cy="8.2391685"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -34,11 +32,12 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="988"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1">
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0">
     <inkscape:grid
        type="xygrid"
        id="grid2985"
@@ -46,8 +45,10 @@
        visible="true"
        enabled="true"
        snapvisiblegridlinesonly="true"
-       originx="-334.84375px"
-       originy="-479.73718px" />
+       originx="-334.84375"
+       originy="-479.73718"
+       spacingx="1"
+       spacingy="1" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -66,22 +67,26 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-334.84375,-558.61859)">
-    <path
-       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.56912518;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 335.15288,572.3216 4.00775,0 0,-3.59195 -1.19172,-3.53528 -0.81215,-0.0566 -2.00388,0 z"
-       id="path2987"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.56912518;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 334.98545,565.19437 11.02133,-6.28593 c 1.62563,0.0118 2.38113,-0.13278 3.00583,0.89799 l 1.00194,2.69397 0,3.59197 -11.02133,6.28592 0,-3.59195 -1.00194,-2.69397 c -0.46801,-1.25837 -1.61212,-0.898 -3.00583,-0.898 z"
-       id="path3777"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccsc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.47427094;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 338.99322,568.78634 11.02133,-6.28594"
-       id="path3757"
-       inkscape:connector-curvature="0" />
+    <g
+       id="g837"
+       transform="translate(0.27195878,0.99513831)">
+      <path
+         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.569125;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 335.15288,572.3216 h 4.00775 v -3.59195 l -1.19172,-3.53528 -0.81215,-0.0566 h -2.00388 z"
+         id="path2987"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.569125;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 334.98545,565.19437 11.02133,-6.28593 c 1.62563,0.0118 2.38113,-0.13278 3.00583,0.89799 l 1.00194,2.69397 v 3.59197 l -11.02133,6.28592 v -3.59195 l -1.00194,-2.69397 c -0.46801,-1.25837 -1.61212,-0.898 -3.00583,-0.898 z"
+         id="path3777"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccsc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.474271;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 338.99322,568.78634 11.02133,-6.28594"
+         id="path3757"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
 </svg>
diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
index 2c73adeb7..bd007dcc8 100644
--- a/assets/layers/kerbs/kerbs.json
+++ b/assets/layers/kerbs/kerbs.json
@@ -21,10 +21,10 @@
   "mapRendering": [
     {
       "location": [
-        "point",
-        "centroid"
+        "point"
       ],
       "icon": "./assets/layers/kerbs/KerbIcon.svg",
+      "iconSize": "25,23,center",
       "iconBadges": [
         {
           "if": "kerb=raised",
@@ -39,6 +39,10 @@
           "then": "circle:#11ff00"
         }
       ]
+    },
+    {
+      "color": "#f44e42",
+      "width": "8"
     }
   ],
   "tagRenderings": [
@@ -88,5 +92,25 @@
         }
       ]
     }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a kerb",
+        "nl": "een stoeprand"
+      },
+      "tags": [
+        "barrier=kerb"
+      ],
+      "description": {
+        "en": "Kerb in a footway",
+        "nl": "Stoeprand in een voetpad"
+      },
+      "preciseInput": {
+        "maxSnapDistance": 10,
+        "preferredBackground": "photo",
+        "snapToLayer": ["cycleways_and_roads", "kerbs"]
+      }
+    }
   ]
 }
\ No newline at end of file
diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json
index 530adea9a..531a7d5bf 100644
--- a/assets/svg/license_info.json
+++ b/assets/svg/license_info.json
@@ -1281,6 +1281,14 @@
       "https://commons.wikimedia.org/wiki/File:OOjs_UI_icon_language-ltr.svg"
     ]
   },
+  {
+    "path": "triangle.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
   {
     "path": "up.svg",
     "license": "CC0; trivial",
diff --git a/assets/svg/triangle.svg b/assets/svg/triangle.svg
new file mode 100644
index 000000000..846a32f32
--- /dev/null
+++ b/assets/svg/triangle.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        style="fill:none"
+        version="1.1"
+        viewBox="0 0 100 100"
+        height="100"
+        width="100">
+        <polygon style="fill:#000000;fill-opacity:1" points="50,0 0,100 100,100" />
+</svg>
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 0a04dea61..924a272e9 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -203,6 +203,10 @@
                 "if": "theme=hailhydrant",
                 "then": "./assets/themes/hailhydrant/logo.svg"
               },
+              {
+                "if": "theme=kerbs_and_crossings",
+                "then": "./assets/layers/kerbs/KerbIcon.svg"
+              },
               {
                 "if": "theme=mapcomplete-changes",
                 "then": "./assets/svg/logo.svg"