diff --git a/assets/layers/speed_camera/license_info.json b/assets/layers/speed_camera/license_info.json
new file mode 100644
index 0000000000..6c09b57947
--- /dev/null
+++ b/assets/layers/speed_camera/license_info.json
@@ -0,0 +1,13 @@
+[
+  {
+    "path": "speed_camera.svg",
+    "license": "CC0",
+    "authors": [
+      "Earlyswerver",
+      "OpenClipArt"
+    ],
+    "sources": [
+      "https://en.wikipedia.org/wiki/File:Earlyswerver_UK_Speed_Camera_Sign.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/speed_camera/speed_camera.json b/assets/layers/speed_camera/speed_camera.json
new file mode 100644
index 0000000000..c249d78958
--- /dev/null
+++ b/assets/layers/speed_camera/speed_camera.json
@@ -0,0 +1,127 @@
+{
+  "id": "speed_camera",
+  "name": {
+    "en": "Speed Camera"
+  },
+  "description": {
+    "en": "Layer showing speed cameras"
+  },
+  "title": {
+    "render": {
+      "en": "Speed Camera"
+    }
+  },
+  "minzoom": 12,
+  "source": {
+    "osmTags": "highway=speed_camera"
+  },
+  "tagRenderings": [
+    {
+      "id": "maxspeed",
+      "question": {
+        "en": "What is the maximum speed allowed at this speed camera?"
+      },
+      "freeform": {
+        "key": "maxspeed",
+        "type": "pnat",
+        "placeholder": {
+          "en": "Maximum speed allowed"
+        }
+      },
+      "render": {
+        "en": "The maximum speed allowed is {canonical(maxspeed)}"
+      }
+    },
+    {
+      "id": "ref",
+      "render": {
+        "en": "The reference number of this speed camera is {ref}"
+      },
+      "condition": "ref~*"
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "highway=speed_camera"
+      ],
+      "title": {
+        "en": "a speed camera"
+      },
+      "preciseInput": {
+        "preferredBackground": "photo",
+        "maxSnapDistance": 10,
+        "snapToLayer": [
+          "maxspeed"
+        ]
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": "square:white;./assets/layers/speed_camera/speed_camera.svg",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "units": [
+    {
+      "appliesToKey": [
+        "maxspeed"
+      ],
+      "applicableUnits": [
+        {
+          "#": "km/h is the default for a maxspeed; should be empty string",
+          "canonicalDenomination": "",
+          "alternativeDenomination": [
+            "km/u",
+            "kmh",
+            "kph"
+          ],
+          "human": {
+            "en": "kilometers/hour",
+            "ca": "quilòmetres/hora",
+            "es": "kilómetros/hora",
+            "nl": "kilometers/uur",
+            "de": "Kilometer/Stunde"
+          },
+          "humanShort": {
+            "en": "km/h",
+            "ca": "km/h",
+            "es": "km/h",
+            "nl": "km/u",
+            "de": "km/h"
+          }
+        },
+        {
+          "canonicalDenomination": "mph",
+          "useIfNoUnitGiven": [
+            "gb",
+            "us"
+          ],
+          "alternativeDenomination": [
+            "m/u",
+            "mh",
+            "m/ph"
+          ],
+          "human": {
+            "en": "miles/hour",
+            "ca": "milles/hora",
+            "es": "millas/hora",
+            "nl": "miles/uur",
+            "de": "Meilen/Stunde"
+          },
+          "humanShort": {
+            "en": "mph",
+            "ca": "mph",
+            "es": "mph",
+            "nl": "mph",
+            "de": "mph"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/assets/layers/speed_camera/speed_camera.svg b/assets/layers/speed_camera/speed_camera.svg
new file mode 100644
index 0000000000..3d4755a264
--- /dev/null
+++ b/assets/layers/speed_camera/speed_camera.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="236.196"
+   height="194.823"
+   viewBox="0 0 236.196 194.823"
+   xml:space="preserve"
+>
+    <g>
+	<path fill="none" stroke="#000000" stroke-width="7.5222" d="M 232.436,182.036 C 232.436,187.021 228.395,191.062 223.41,191.062 L 12.788,191.062 C 7.803,191.062 3.761,187.021 3.761,182.036 L 3.761,12.787 C 3.761,7.801 7.803,3.761 12.788,3.761 L 223.409,3.761 C 228.394,3.761 232.435,7.801 232.435,12.787 L 232.435,182.036 L 232.436,182.036 z "/>
+	<path d="M 120.43,24.971 L 42.857,24.971 C 30.902,24.971 21.21,34.582 21.21,46.436 L 21.21,148.389 C 21.21,160.243 30.902,169.852 42.857,169.852 L 120.43,169.852 C 132.386,169.852 142.078,160.243 142.078,148.389 L 142.078,46.436 C 142.078,34.582 132.386,24.971 120.43,24.971 z M 69.535,154.813 C 52.736,154.813 39.118,141.197 39.118,124.401 C 39.118,107.599 52.736,93.984 69.535,93.984 C 86.332,93.984 99.95,107.599 99.95,124.401 C 99.949,141.196 86.332,154.813 69.535,154.813 z M 107.645,68.695 C 98.335,68.695 90.788,61.148 90.788,51.839 C 90.788,42.528 98.335,34.983 107.645,34.983 C 116.955,34.983 124.502,42.529 124.502,51.839 C 124.501,61.148 116.955,68.695 107.645,68.695 z "/>
+	<circle cx="107.645" cy="51.839001" r="9.5279999"/>
+	<circle cx="69.492" cy="124.31" r="20.978"/>
+	<rect width="8.9469995" height="82.337997" x="148.371" y="50.320999"/>
+	<rect width="8.9469995" height="78.117996" x="164.03999" y="54.541"/>
+	<polygon points="214.988,79.89 188.554,79.89 188.554,66.341 179.604,66.341 179.604,138.997 148.358,138.997 148.358,148.058 179.604,148.058 188.299,148.058 188.554,148.058 188.554,126.068 214.988,126.068 214.988,79.89 "/>
+    </g>
+</svg>
diff --git a/assets/layers/speed_display/license_info.json b/assets/layers/speed_display/license_info.json
new file mode 100644
index 0000000000..04cf544188
--- /dev/null
+++ b/assets/layers/speed_display/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "speed_display.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": [
+      "https://www.keshikan.net/fonts-e.html"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/speed_display/speed_display.json b/assets/layers/speed_display/speed_display.json
new file mode 100644
index 0000000000..4c2b1fa488
--- /dev/null
+++ b/assets/layers/speed_display/speed_display.json
@@ -0,0 +1,132 @@
+{
+  "id": "speed_display",
+  "name": {
+    "en": "Speed Display"
+  },
+  "description": {
+    "en": "Layer showing speed displays that alert drivers of their speed."
+  },
+  "title": {
+    "render": {
+      "en": "Speed Display"
+    }
+  },
+  "minzoom": 12,
+  "source": {
+    "osmTags": "highway=speed_display"
+  },
+  "tagRenderings": [
+    {
+      "id": "maxspeed",
+      "question": {
+        "en": "What is the maximum speed allowed at this speed display?"
+      },
+      "freeform": {
+        "key": "maxspeed",
+        "type": "pnat",
+        "placeholder": {
+          "en": "Speed allowed at speed display"
+        }
+      },
+      "render": {
+        "en": "The maximum speed allowed at this speed display is {canonical(maxspeed)}"
+      }
+    },
+    {
+      "id": "inscription",
+      "question": {
+        "en": "What is the text on this speed display?"
+      },
+      "freeform": {
+        "key": "inscription",
+        "type": "string",
+        "placeholder": {
+          "en": "Text on speed display (e.g. 'Your speed')"
+        }
+      },
+      "render": {
+        "en": "The text on this speed display is {inscription}"
+      }
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a speed display"
+      },
+      "tags": [
+        "highway=speed_display"
+      ],
+      "preciseInput": {
+        "preferredBackground": "photo"
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "icon": "./assets/layers/speed_display/speed_display.svg"
+    }
+  ],
+  "units": [
+    {
+      "appliesToKey": [
+        "maxspeed"
+      ],
+      "applicableUnits": [
+        {
+          "#": "km/h is the default for a maxspeed; should be empty string",
+          "canonicalDenomination": "",
+          "alternativeDenomination": [
+            "km/u",
+            "kmh",
+            "kph"
+          ],
+          "human": {
+            "en": "kilometers/hour",
+            "ca": "quilòmetres/hora",
+            "es": "kilómetros/hora",
+            "nl": "kilometers/uur",
+            "de": "Kilometer/Stunde"
+          },
+          "humanShort": {
+            "en": "km/h",
+            "ca": "km/h",
+            "es": "km/h",
+            "nl": "km/u",
+            "de": "km/h"
+          }
+        },
+        {
+          "canonicalDenomination": "mph",
+          "useIfNoUnitGiven": [
+            "gb",
+            "us"
+          ],
+          "alternativeDenomination": [
+            "m/u",
+            "mh",
+            "m/ph"
+          ],
+          "human": {
+            "en": "miles/hour",
+            "ca": "milles/hora",
+            "es": "millas/hora",
+            "nl": "miles/uur",
+            "de": "Meilen/Stunde"
+          },
+          "humanShort": {
+            "en": "mph",
+            "ca": "mph",
+            "es": "mph",
+            "nl": "mph",
+            "de": "mph"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/assets/layers/speed_display/speed_display.svg b/assets/layers/speed_display/speed_display.svg
new file mode 100644
index 0000000000..45546f684b
--- /dev/null
+++ b/assets/layers/speed_display/speed_display.svg
@@ -0,0 +1,6 @@
+<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="400" height="400" rx="50" fill="#D9D9D9"/>
+<path d="M45.376 84.56C45.376 68.7733 54.848 60.88 73.792 60.88C80.448 60.88 88.0427 62.3733 96.576 65.36L93.632 77.008C84.928 74.2773 78.0587 72.912 73.024 72.912C68.0747 72.8267 64.4907 73.6373 62.272 75.344C60.0533 77.0507 58.944 80.0373 58.944 84.304C58.944 87.2053 60.1813 89.68 62.656 91.728C65.1307 93.6907 69.312 95.44 75.2 96.976C84.16 99.3653 90.304 102.437 93.632 106.192C96.96 109.947 98.624 115.536 98.624 122.96C98.624 139.088 88.9813 147.152 69.696 147.152C63.296 147.152 55.232 145.787 45.504 143.056L48.192 130.896C48.192 130.981 49.5147 131.365 52.16 132.048C60.4373 134.181 66.8373 135.248 71.36 135.248C75.968 135.248 79.3813 134.096 81.6 131.792C83.904 129.488 85.056 126.587 85.056 123.088C85.056 119.589 84.0747 116.901 82.112 115.024C80.2347 113.147 76.736 111.483 71.616 110.032C62.4 107.472 55.7013 104.315 51.52 100.56C47.424 96.8053 45.376 91.472 45.376 84.56ZM135.744 119.12H123.072V146H109.76V62.16H136.128C145.856 62.16 152.939 64.4213 157.376 68.944C161.899 73.3813 164.16 80.3787 164.16 89.936C164.16 109.392 154.688 119.12 135.744 119.12ZM134.08 73.936H123.072V106.96H134.08C139.797 106.96 143.979 105.637 146.624 102.992C149.269 100.261 150.592 95.9093 150.592 89.936C150.592 83.9627 149.227 79.824 146.496 77.52C143.851 75.1307 139.712 73.936 134.08 73.936ZM175.68 146V62.16H224.704V74.192H188.992V97.488H221.248V109.008H188.992V133.968H225.088V146H175.68ZM239.68 146V62.16H288.704V74.192H252.992V97.488H285.248V109.008H252.992V133.968H289.088V146H239.68ZM300.864 146V62.16H320.832C327.573 62.16 332.992 62.7147 337.088 63.824C341.269 64.9333 344.811 67.024 347.712 70.096C350.613 73.168 352.661 77.4347 353.856 82.896C355.051 88.272 355.648 95.952 355.648 105.936C355.648 115.835 354.411 123.813 351.936 129.872C349.547 135.931 345.92 140.155 341.056 142.544C336.192 144.848 329.365 146 320.576 146H300.864ZM336.96 128.976C338.923 126.757 340.245 123.728 340.928 119.888C341.696 115.963 342.08 110.672 342.08 104.016C342.08 97.2747 341.781 91.984 341.184 88.144C340.587 84.304 339.307 81.2747 337.344 79.056C335.467 76.752 333.12 75.3013 330.304 74.704C327.488 74.0213 323.477 73.68 318.272 73.68H314.176V134.48H318.016C322.965 134.48 326.848 134.139 329.664 133.456C332.565 132.688 334.997 131.195 336.96 128.976Z" fill="#1E1E1E"/>
+<rect x="40" y="170" width="320" height="200" fill="#1E1E1E"/>
+<path d="M168.856 262.064L176.92 270.128L169.112 277.936H125.336L117.4 270L125.336 262.064H168.856ZM111.64 328.24L107.672 324.272V271.28H115.096L115.608 271.92L123.544 279.728V316.336L111.64 328.24ZM113.432 209.968L117.4 206H177.048L181.016 209.968L169.112 221.872H125.336L113.432 209.968ZM182.808 211.76L186.776 215.728V268.72H179.352L178.84 268.208L170.904 260.4V223.664L182.808 211.76ZM181.016 330.032L177.048 334H117.4L113.432 330.032L125.336 318.128H169.112L181.016 330.032ZM273.356 262.064L281.42 270.128L273.612 277.936H229.836L221.9 270L229.836 262.064H273.356ZM220.108 268.08L219.596 268.72H212.172V215.728L216.14 211.76L228.044 223.664V260.272L220.108 268.08ZM217.932 209.968L221.9 206H281.548L285.516 209.968L273.612 221.872H229.836L217.932 209.968ZM283.34 271.92L283.852 271.408H291.276V324.272L287.308 328.24L275.404 316.336V279.728L283.34 271.92ZM287.308 211.76L291.276 215.728V268.72H283.852L283.34 268.208L275.404 260.4V223.664L287.308 211.76ZM285.516 330.032L281.548 334H221.9L217.932 330.032L229.836 318.128H273.612L285.516 330.032Z" fill="#05FF00"/>
+</svg>
diff --git a/assets/themes/maxspeed/maxspeed.json b/assets/themes/maxspeed/maxspeed.json
index 23114c8fbb..9d3e18d768 100644
--- a/assets/themes/maxspeed/maxspeed.json
+++ b/assets/themes/maxspeed/maxspeed.json
@@ -28,6 +28,8 @@
   "startZoom": 1,
   "widenFactor": 0.01,
   "layers": [
-    "maxspeed"
+    "maxspeed",
+    "speed_camera",
+    "speed_display"
   ]
-}
\ No newline at end of file
+}