diff --git a/css/feature-icons.css b/css/feature-icons.css
index 6d3c638ea..9b7926f17 100644
--- a/css/feature-icons.css
+++ b/css/feature-icons.css
@@ -113,10 +113,6 @@
 .feature-laundry{background-position:-108px -504px;}
 .feature-car{background-position:-162px -504px;}
 .feature-suitcase{background-position:-216px -504px;}
-.feature-hairdresser{background-position:-0px -528px;}
-.feature-chemist{background-position:-54px -528px;}
-.feature-mobilephone{background-position:-108px -528px;}
-.feature-scooter{background-position:-162px -528px;}
 .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;}
@@ -172,3 +168,10 @@
 .preset-icon-relation.feature-route-power{background-position:-800px -25px;}
 .preset-icon-relation.feature-route-pipeline{background-position:-860px -25px;}
 .preset-icon-relation.feature-route-master{background-position:-920px -25px;}
+.preset-icon-relation.feature-restriction-no-straight-on{background-position:-980px -25px;}
+.preset-icon-relation.feature-restriction-no-u-turn{background-position:-1040px -25px;}
+.preset-icon-relation.feature-restriction-no-left-turn{background-position:-1100px -25px;}
+.preset-icon-relation.feature-restriction-no-right-turn{background-position:-1160px -25px;}
+.preset-icon-relation.feature-restriction-only-straight-ahead{background-position:-1220px -25px;}
+.preset-icon-relation.feature-restriction-only-left-turn{background-position:-1280px -25px;}
+.preset-icon-relation.feature-restriction-only-right-turn{background-position:-1340px -25px;}
diff --git a/data/feature-icons.json b/data/feature-icons.json
index 001e6aecc..750d11baf 100644
--- a/data/feature-icons.json
+++ b/data/feature-icons.json
@@ -1 +1 @@
-{"circle-stroked":{"12":[42,0],"18":[24,0],"24":[0,0]},"circle":{"12":[96,0],"18":[78,0],"24":[54,0]},"square-stroked":{"12":[150,0],"18":[132,0],"24":[108,0]},"square":{"12":[204,0],"18":[186,0],"24":[162,0]},"triangle-stroked":{"12":[258,0],"18":[240,0],"24":[216,0]},"triangle":{"12":[42,24],"18":[24,24],"24":[0,24]},"star-stroked":{"12":[96,24],"18":[78,24],"24":[54,24]},"star":{"12":[150,24],"18":[132,24],"24":[108,24]},"cross":{"12":[204,24],"18":[186,24],"24":[162,24]},"marker-stroked":{"12":[258,24],"18":[240,24],"24":[216,24]},"marker":{"12":[42,48],"18":[24,48],"24":[0,48]},"religious-jewish":{"12":[96,48],"18":[78,48],"24":[54,48]},"religious-christian":{"12":[150,48],"18":[132,48],"24":[108,48]},"religious-muslim":{"12":[204,48],"18":[186,48],"24":[162,48]},"cemetery":{"12":[258,48],"18":[240,48],"24":[216,48]},"rocket":{"12":[42,72],"18":[24,72],"24":[0,72]},"airport":{"12":[96,72],"18":[78,72],"24":[54,72]},"heliport":{"12":[150,72],"18":[132,72],"24":[108,72]},"rail":{"12":[204,72],"18":[186,72],"24":[162,72]},"rail-metro":{"12":[258,72],"18":[240,72],"24":[216,72]},"rail-light":{"12":[42,96],"18":[24,96],"24":[0,96]},"bus":{"12":[96,96],"18":[78,96],"24":[54,96]},"fuel":{"12":[150,96],"18":[132,96],"24":[108,96]},"parking":{"12":[204,96],"18":[186,96],"24":[162,96]},"parking-garage":{"12":[258,96],"18":[240,96],"24":[216,96]},"airfield":{"12":[42,120],"18":[24,120],"24":[0,120]},"roadblock":{"12":[96,120],"18":[78,120],"24":[54,120]},"ferry":{"12":[150,120],"18":[132,120],"24":[108,120],"line":[2240,25]},"harbor":{"12":[204,120],"18":[186,120],"24":[162,120]},"bicycle":{"12":[258,120],"18":[240,120],"24":[216,120]},"park":{"12":[42,144],"18":[24,144],"24":[0,144]},"park2":{"12":[96,144],"18":[78,144],"24":[54,144]},"museum":{"12":[150,144],"18":[132,144],"24":[108,144]},"lodging":{"12":[204,144],"18":[186,144],"24":[162,144]},"monument":{"12":[258,144],"18":[240,144],"24":[216,144]},"zoo":{"12":[42,168],"18":[24,168],"24":[0,168]},"garden":{"12":[96,168],"18":[78,168],"24":[54,168]},"campsite":{"12":[150,168],"18":[132,168],"24":[108,168]},"theatre":{"12":[204,168],"18":[186,168],"24":[162,168]},"art-gallery":{"12":[258,168],"18":[240,168],"24":[216,168]},"pitch":{"12":[42,192],"18":[24,192],"24":[0,192]},"soccer":{"12":[96,192],"18":[78,192],"24":[54,192]},"america-football":{"12":[150,192],"18":[132,192],"24":[108,192]},"tennis":{"12":[204,192],"18":[186,192],"24":[162,192]},"basketball":{"12":[258,192],"18":[240,192],"24":[216,192]},"baseball":{"12":[42,216],"18":[24,216],"24":[0,216]},"golf":{"12":[96,216],"18":[78,216],"24":[54,216]},"swimming":{"12":[150,216],"18":[132,216],"24":[108,216]},"cricket":{"12":[204,216],"18":[186,216],"24":[162,216]},"skiing":{"12":[258,216],"18":[240,216],"24":[216,216]},"school":{"12":[42,240],"18":[24,240],"24":[0,240]},"college":{"12":[96,240],"18":[78,240],"24":[54,240]},"library":{"12":[150,240],"18":[132,240],"24":[108,240]},"post":{"12":[204,240],"18":[186,240],"24":[162,240]},"fire-station":{"12":[258,240],"18":[240,240],"24":[216,240]},"town-hall":{"12":[42,264],"18":[24,264],"24":[0,264]},"police":{"12":[96,264],"18":[78,264],"24":[54,264]},"prison":{"12":[150,264],"18":[132,264],"24":[108,264]},"embassy":{"12":[204,264],"18":[186,264],"24":[162,264]},"beer":{"12":[258,264],"18":[240,264],"24":[216,264]},"restaurant":{"12":[42,288],"18":[24,288],"24":[0,288]},"cafe":{"12":[96,288],"18":[78,288],"24":[54,288]},"shop":{"12":[150,288],"18":[132,288],"24":[108,288]},"fast-food":{"12":[204,288],"18":[186,288],"24":[162,288]},"bar":{"12":[258,288],"18":[240,288],"24":[216,288]},"bank":{"12":[42,312],"18":[24,312],"24":[0,312]},"grocery":{"12":[96,312],"18":[78,312],"24":[54,312]},"cinema":{"12":[150,312],"18":[132,312],"24":[108,312]},"pharmacy":{"12":[204,312],"18":[186,312],"24":[162,312]},"hospital":{"12":[258,312],"18":[240,312],"24":[216,312]},"danger":{"12":[42,336],"18":[24,336],"24":[0,336]},"industrial":{"12":[96,336],"18":[78,336],"24":[54,336]},"warehouse":{"12":[150,336],"18":[132,336],"24":[108,336]},"commercial":{"12":[204,336],"18":[186,336],"24":[162,336]},"building":{"12":[258,336],"18":[240,336],"24":[216,336]},"place-of-worship":{"12":[42,360],"18":[24,360],"24":[0,360]},"alcohol-shop":{"12":[96,360],"18":[78,360],"24":[54,360]},"logging":{"12":[150,360],"18":[132,360],"24":[108,360]},"oil-well":{"12":[204,360],"18":[186,360],"24":[162,360]},"slaughterhouse":{"12":[258,360],"18":[240,360],"24":[216,360]},"dam":{"12":[42,384],"18":[24,384],"24":[0,384]},"water":{"12":[96,384],"18":[78,384],"24":[54,384]},"wetland":{"12":[150,384],"18":[132,384],"24":[108,384]},"disability":{"12":[204,384],"18":[186,384],"24":[162,384]},"telephone":{"12":[258,384],"18":[240,384],"24":[216,384]},"emergency-telephone":{"12":[42,408],"18":[24,408],"24":[0,408]},"toilets":{"12":[96,408],"18":[78,408],"24":[54,408]},"waste-basket":{"12":[150,408],"18":[132,408],"24":[108,408]},"music":{"12":[204,408],"18":[186,408],"24":[162,408]},"land-use":{"12":[258,408],"18":[240,408],"24":[216,408]},"city":{"12":[42,432],"18":[24,432],"24":[0,432]},"town":{"12":[96,432],"18":[78,432],"24":[54,432]},"village":{"12":[150,432],"18":[132,432],"24":[108,432]},"farm":{"12":[204,432],"18":[186,432],"24":[162,432]},"bakery":{"12":[258,432],"18":[240,432],"24":[216,432]},"dog-park":{"12":[42,456],"18":[24,456],"24":[0,456]},"lighthouse":{"12":[96,456],"18":[78,456],"24":[54,456]},"clothing-store":{"12":[150,456],"18":[132,456],"24":[108,456]},"polling-place":{"12":[204,456],"18":[186,456],"24":[162,456]},"playground":{"12":[258,456],"18":[240,456],"24":[216,456]},"entrance":{"12":[42,480],"18":[24,480],"24":[0,480]},"heart":{"12":[96,480],"18":[78,480],"24":[54,480]},"london-underground":{"12":[150,480],"18":[132,480],"24":[108,480]},"minefield":{"12":[204,480],"18":[186,480],"24":[162,480]},"rail-underground":{"12":[258,480],"18":[240,480],"24":[216,480]},"rail-above":{"12":[42,504],"18":[24,504],"24":[0,504]},"camera":{"12":[96,504],"18":[78,504],"24":[54,504]},"laundry":{"12":[150,504],"18":[132,504],"24":[108,504]},"car":{"12":[204,504],"18":[186,504],"24":[162,504]},"suitcase":{"12":[258,504],"18":[240,504],"24":[216,504]},"hairdresser":{"12":[42,528],"18":[24,528],"24":[0,528]},"chemist":{"12":[96,528],"18":[78,528],"24":[54,528]},"mobilephone":{"12":[150,528],"18":[132,528],"24":[108,528]},"scooter":{"12":[204,528],"18":[186,528],"24":[162,528]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]},"pipeline":{"line":[2300,25]},"relation":{"relation":[20,25]},"restriction":{"relation":[80,25]},"multipolygon":{"relation":[140,25]},"boundary":{"relation":[200,25]},"route":{"relation":[260,25]},"route-road":{"relation":[320,25]},"route-bicycle":{"relation":[380,25]},"route-foot":{"relation":[440,25]},"route-bus":{"relation":[500,25]},"route-train":{"relation":[560,25]},"route-detour":{"relation":[620,25]},"route-tram":{"relation":[680,25]},"route-ferry":{"relation":[740,25]},"route-power":{"relation":[800,25]},"route-pipeline":{"relation":[860,25]},"route-master":{"relation":[920,25]}}
\ No newline at end of file
+{"circle-stroked":{"12":[42,0],"18":[24,0],"24":[0,0]},"circle":{"12":[96,0],"18":[78,0],"24":[54,0]},"square-stroked":{"12":[150,0],"18":[132,0],"24":[108,0]},"square":{"12":[204,0],"18":[186,0],"24":[162,0]},"triangle-stroked":{"12":[258,0],"18":[240,0],"24":[216,0]},"triangle":{"12":[42,24],"18":[24,24],"24":[0,24]},"star-stroked":{"12":[96,24],"18":[78,24],"24":[54,24]},"star":{"12":[150,24],"18":[132,24],"24":[108,24]},"cross":{"12":[204,24],"18":[186,24],"24":[162,24]},"marker-stroked":{"12":[258,24],"18":[240,24],"24":[216,24]},"marker":{"12":[42,48],"18":[24,48],"24":[0,48]},"religious-jewish":{"12":[96,48],"18":[78,48],"24":[54,48]},"religious-christian":{"12":[150,48],"18":[132,48],"24":[108,48]},"religious-muslim":{"12":[204,48],"18":[186,48],"24":[162,48]},"cemetery":{"12":[258,48],"18":[240,48],"24":[216,48]},"rocket":{"12":[42,72],"18":[24,72],"24":[0,72]},"airport":{"12":[96,72],"18":[78,72],"24":[54,72]},"heliport":{"12":[150,72],"18":[132,72],"24":[108,72]},"rail":{"12":[204,72],"18":[186,72],"24":[162,72]},"rail-metro":{"12":[258,72],"18":[240,72],"24":[216,72]},"rail-light":{"12":[42,96],"18":[24,96],"24":[0,96]},"bus":{"12":[96,96],"18":[78,96],"24":[54,96]},"fuel":{"12":[150,96],"18":[132,96],"24":[108,96]},"parking":{"12":[204,96],"18":[186,96],"24":[162,96]},"parking-garage":{"12":[258,96],"18":[240,96],"24":[216,96]},"airfield":{"12":[42,120],"18":[24,120],"24":[0,120]},"roadblock":{"12":[96,120],"18":[78,120],"24":[54,120]},"ferry":{"12":[150,120],"18":[132,120],"24":[108,120],"line":[2240,25]},"harbor":{"12":[204,120],"18":[186,120],"24":[162,120]},"bicycle":{"12":[258,120],"18":[240,120],"24":[216,120]},"park":{"12":[42,144],"18":[24,144],"24":[0,144]},"park2":{"12":[96,144],"18":[78,144],"24":[54,144]},"museum":{"12":[150,144],"18":[132,144],"24":[108,144]},"lodging":{"12":[204,144],"18":[186,144],"24":[162,144]},"monument":{"12":[258,144],"18":[240,144],"24":[216,144]},"zoo":{"12":[42,168],"18":[24,168],"24":[0,168]},"garden":{"12":[96,168],"18":[78,168],"24":[54,168]},"campsite":{"12":[150,168],"18":[132,168],"24":[108,168]},"theatre":{"12":[204,168],"18":[186,168],"24":[162,168]},"art-gallery":{"12":[258,168],"18":[240,168],"24":[216,168]},"pitch":{"12":[42,192],"18":[24,192],"24":[0,192]},"soccer":{"12":[96,192],"18":[78,192],"24":[54,192]},"america-football":{"12":[150,192],"18":[132,192],"24":[108,192]},"tennis":{"12":[204,192],"18":[186,192],"24":[162,192]},"basketball":{"12":[258,192],"18":[240,192],"24":[216,192]},"baseball":{"12":[42,216],"18":[24,216],"24":[0,216]},"golf":{"12":[96,216],"18":[78,216],"24":[54,216]},"swimming":{"12":[150,216],"18":[132,216],"24":[108,216]},"cricket":{"12":[204,216],"18":[186,216],"24":[162,216]},"skiing":{"12":[258,216],"18":[240,216],"24":[216,216]},"school":{"12":[42,240],"18":[24,240],"24":[0,240]},"college":{"12":[96,240],"18":[78,240],"24":[54,240]},"library":{"12":[150,240],"18":[132,240],"24":[108,240]},"post":{"12":[204,240],"18":[186,240],"24":[162,240]},"fire-station":{"12":[258,240],"18":[240,240],"24":[216,240]},"town-hall":{"12":[42,264],"18":[24,264],"24":[0,264]},"police":{"12":[96,264],"18":[78,264],"24":[54,264]},"prison":{"12":[150,264],"18":[132,264],"24":[108,264]},"embassy":{"12":[204,264],"18":[186,264],"24":[162,264]},"beer":{"12":[258,264],"18":[240,264],"24":[216,264]},"restaurant":{"12":[42,288],"18":[24,288],"24":[0,288]},"cafe":{"12":[96,288],"18":[78,288],"24":[54,288]},"shop":{"12":[150,288],"18":[132,288],"24":[108,288]},"fast-food":{"12":[204,288],"18":[186,288],"24":[162,288]},"bar":{"12":[258,288],"18":[240,288],"24":[216,288]},"bank":{"12":[42,312],"18":[24,312],"24":[0,312]},"grocery":{"12":[96,312],"18":[78,312],"24":[54,312]},"cinema":{"12":[150,312],"18":[132,312],"24":[108,312]},"pharmacy":{"12":[204,312],"18":[186,312],"24":[162,312]},"hospital":{"12":[258,312],"18":[240,312],"24":[216,312]},"danger":{"12":[42,336],"18":[24,336],"24":[0,336]},"industrial":{"12":[96,336],"18":[78,336],"24":[54,336]},"warehouse":{"12":[150,336],"18":[132,336],"24":[108,336]},"commercial":{"12":[204,336],"18":[186,336],"24":[162,336]},"building":{"12":[258,336],"18":[240,336],"24":[216,336]},"place-of-worship":{"12":[42,360],"18":[24,360],"24":[0,360]},"alcohol-shop":{"12":[96,360],"18":[78,360],"24":[54,360]},"logging":{"12":[150,360],"18":[132,360],"24":[108,360]},"oil-well":{"12":[204,360],"18":[186,360],"24":[162,360]},"slaughterhouse":{"12":[258,360],"18":[240,360],"24":[216,360]},"dam":{"12":[42,384],"18":[24,384],"24":[0,384]},"water":{"12":[96,384],"18":[78,384],"24":[54,384]},"wetland":{"12":[150,384],"18":[132,384],"24":[108,384]},"disability":{"12":[204,384],"18":[186,384],"24":[162,384]},"telephone":{"12":[258,384],"18":[240,384],"24":[216,384]},"emergency-telephone":{"12":[42,408],"18":[24,408],"24":[0,408]},"toilets":{"12":[96,408],"18":[78,408],"24":[54,408]},"waste-basket":{"12":[150,408],"18":[132,408],"24":[108,408]},"music":{"12":[204,408],"18":[186,408],"24":[162,408]},"land-use":{"12":[258,408],"18":[240,408],"24":[216,408]},"city":{"12":[42,432],"18":[24,432],"24":[0,432]},"town":{"12":[96,432],"18":[78,432],"24":[54,432]},"village":{"12":[150,432],"18":[132,432],"24":[108,432]},"farm":{"12":[204,432],"18":[186,432],"24":[162,432]},"bakery":{"12":[258,432],"18":[240,432],"24":[216,432]},"dog-park":{"12":[42,456],"18":[24,456],"24":[0,456]},"lighthouse":{"12":[96,456],"18":[78,456],"24":[54,456]},"clothing-store":{"12":[150,456],"18":[132,456],"24":[108,456]},"polling-place":{"12":[204,456],"18":[186,456],"24":[162,456]},"playground":{"12":[258,456],"18":[240,456],"24":[216,456]},"entrance":{"12":[42,480],"18":[24,480],"24":[0,480]},"heart":{"12":[96,480],"18":[78,480],"24":[54,480]},"london-underground":{"12":[150,480],"18":[132,480],"24":[108,480]},"minefield":{"12":[204,480],"18":[186,480],"24":[162,480]},"rail-underground":{"12":[258,480],"18":[240,480],"24":[216,480]},"rail-above":{"12":[42,504],"18":[24,504],"24":[0,504]},"camera":{"12":[96,504],"18":[78,504],"24":[54,504]},"laundry":{"12":[150,504],"18":[132,504],"24":[108,504]},"car":{"12":[204,504],"18":[186,504],"24":[162,504]},"suitcase":{"12":[258,504],"18":[240,504],"24":[216,504]},"highway-motorway":{"line":[20,25]},"highway-trunk":{"line":[80,25]},"highway-primary":{"line":[140,25]},"highway-secondary":{"line":[200,25]},"highway-tertiary":{"line":[260,25]},"highway-motorway-link":{"line":[320,25]},"highway-trunk-link":{"line":[380,25]},"highway-primary-link":{"line":[440,25]},"highway-secondary-link":{"line":[500,25]},"highway-tertiary-link":{"line":[560,25]},"highway-residential":{"line":[620,25]},"highway-unclassified":{"line":[680,25]},"highway-service":{"line":[740,25]},"highway-road":{"line":[800,25]},"highway-track":{"line":[860,25]},"highway-living-street":{"line":[920,25]},"highway-path":{"line":[980,25]},"highway-cycleway":{"line":[1040,25]},"highway-footway":{"line":[1100,25]},"highway-bridleway":{"line":[1160,25]},"highway-steps":{"line":[1220,25]},"railway-rail":{"line":[1280,25]},"railway-disused":{"line":[1340,25]},"railway-abandoned":{"line":[1400,25]},"railway-subway":{"line":[1460,25]},"railway-light-rail":{"line":[1520,25]},"railway-monorail":{"line":[1580,25]},"waterway-river":{"line":[1640,25]},"waterway-stream":{"line":[1700,25]},"waterway-canal":{"line":[1760,25]},"waterway-ditch":{"line":[1820,25]},"power-line":{"line":[1880,25]},"other-line":{"line":[1940,25]},"category-roads":{"line":[2000,25]},"category-rail":{"line":[2060,25]},"category-path":{"line":[2120,25]},"category-water":{"line":[2180,25]},"pipeline":{"line":[2300,25]},"relation":{"relation":[20,25]},"restriction":{"relation":[80,25]},"multipolygon":{"relation":[140,25]},"boundary":{"relation":[200,25]},"route":{"relation":[260,25]},"route-road":{"relation":[320,25]},"route-bicycle":{"relation":[380,25]},"route-foot":{"relation":[440,25]},"route-bus":{"relation":[500,25]},"route-train":{"relation":[560,25]},"route-detour":{"relation":[620,25]},"route-tram":{"relation":[680,25]},"route-ferry":{"relation":[740,25]},"route-power":{"relation":[800,25]},"route-pipeline":{"relation":[860,25]},"route-master":{"relation":[920,25]},"restriction-no-straight-on":{"relation":[980,25]},"restriction-no-u-turn":{"relation":[1040,25]},"restriction-no-left-turn":{"relation":[1100,25]},"restriction-no-right-turn":{"relation":[1160,25]},"restriction-only-straight-ahead":{"relation":[1220,25]},"restriction-only-left-turn":{"relation":[1280,25]},"restriction-only-right-turn":{"relation":[1340,25]}}
\ No newline at end of file
diff --git a/data/presets.yaml b/data/presets.yaml
index 7956ed495..47c7f7e29 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -11,6 +11,8 @@ en:
         name: Path
       "category-rail": 
         name: Rail
+      "category-restriction": 
+        name: Restriction
       "category-road": 
         name: Road
       "category-route": 
@@ -1802,8 +1804,17 @@ en:
         name: No Straight On
         terms: "<translate with synonyms or related terms for 'No Straight On', separated by commas>"
       type/restriction/no_u_turn: 
-        name: No U Turn
-        terms: "<translate with synonyms or related terms for 'No U Turn', separated by commas>"
+        name: "No U-turn"
+        terms: "<translate with synonyms or related terms for 'No U-turn', separated by commas>"
+      type/restriction/only_left_turn: 
+        name: Left Turn Only
+        terms: "<translate with synonyms or related terms for 'Left Turn Only', separated by commas>"
+      type/restriction/only_right_turn: 
+        name: Right Turn Only
+        terms: "<translate with synonyms or related terms for 'Right Turn Only', separated by commas>"
+      type/restriction/only_straight_ahead: 
+        name: No Turns
+        terms: "<translate with synonyms or related terms for 'No Turns', separated by commas>"
       type/route: 
         name: Route
         terms: "<translate with synonyms or related terms for 'Route', separated by commas>"
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 20e9ea3d7..ff320f113 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -68,6 +68,21 @@
             "railway/abandoned"
         ]
     },
+    "category-restriction": {
+        "geometry": "relation",
+        "name": "Restriction",
+        "icon": "restriction",
+        "members": [
+            "type/restriction/no_left_turn",
+            "type/restriction/no_right_turn",
+            "type/restriction/no_straight_on",
+            "type/restriction/no_u_turn",
+            "type/restriction/only_left_turn",
+            "type/restriction/only_right_turn",
+            "type/restriction/only_straight_ahead",
+            "type/restriction"
+        ]
+    },
     "category-road": {
         "geometry": "line",
         "name": "Road",
diff --git a/data/presets/categories/restriction.json b/data/presets/categories/restriction.json
new file mode 100644
index 000000000..9403d50e1
--- /dev/null
+++ b/data/presets/categories/restriction.json
@@ -0,0 +1,15 @@
+{
+    "geometry": "relation",
+    "name": "Restriction",
+    "icon": "restriction",
+    "members": [
+        "type/restriction/no_left_turn",
+        "type/restriction/no_right_turn",
+        "type/restriction/no_straight_on",
+        "type/restriction/no_u_turn",
+        "type/restriction/only_left_turn",
+        "type/restriction/only_right_turn",
+        "type/restriction/only_straight_ahead",
+        "type/restriction"
+    ]
+}
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 2fdd42049..00a385aca 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -40,8 +40,8 @@
     ],
     "relation": [
         "category-route",
+        "category-restriction",
         "type/boundary",
-        "type/restriction",
         "type/multipolygon",
         "relation"
     ]
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 407d0418b..94de478d4 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7980,7 +7980,7 @@
         "fields": [
             "except"
         ],
-        "icon": "restriction"
+        "icon": "restriction-no-left-turn"
     },
     "type/restriction/no_right_turn": {
         "name": "No Right Turn",
@@ -7994,7 +7994,7 @@
         "fields": [
             "except"
         ],
-        "icon": "restriction"
+        "icon": "restriction-no-right-turn"
     },
     "type/restriction/no_straight_on": {
         "name": "No Straight On",
@@ -8008,10 +8008,10 @@
         "fields": [
             "except"
         ],
-        "icon": "restriction"
+        "icon": "restriction-no-straight-on"
     },
     "type/restriction/no_u_turn": {
-        "name": "No U Turn",
+        "name": "No U-turn",
         "geometry": [
             "relation"
         ],
@@ -8022,7 +8022,49 @@
         "fields": [
             "except"
         ],
-        "icon": "restriction"
+        "icon": "restriction-no-u-turn"
+    },
+    "type/restriction/only_left_turn": {
+        "name": "Left Turn Only",
+        "geometry": [
+            "relation"
+        ],
+        "tags": {
+            "type": "restriction",
+            "restriction": "only_left_turn"
+        },
+        "fields": [
+            "except"
+        ],
+        "icon": "restriction-only-left-turn"
+    },
+    "type/restriction/only_right_turn": {
+        "name": "Right Turn Only",
+        "geometry": [
+            "relation"
+        ],
+        "tags": {
+            "type": "restriction",
+            "restriction": "only_right_turn"
+        },
+        "fields": [
+            "except"
+        ],
+        "icon": "restriction-only-right-turn"
+    },
+    "type/restriction/only_straight_ahead": {
+        "name": "No Turns",
+        "geometry": [
+            "relation"
+        ],
+        "tags": {
+            "type": "restriction",
+            "restriction": "only_straight_ahead"
+        },
+        "fields": [
+            "except"
+        ],
+        "icon": "restriction-only-straight-ahead"
     },
     "type/route": {
         "geometry": [
diff --git a/data/presets/presets/type/restriction/no_left_turn.json b/data/presets/presets/type/restriction/no_left_turn.json
index aa9bcaf95..68a035964 100644
--- a/data/presets/presets/type/restriction/no_left_turn.json
+++ b/data/presets/presets/type/restriction/no_left_turn.json
@@ -10,5 +10,5 @@
     "fields": [
         "except"
     ],
-    "icon": "restriction"
+    "icon": "restriction-no-left-turn"
 }
diff --git a/data/presets/presets/type/restriction/no_right_turn.json b/data/presets/presets/type/restriction/no_right_turn.json
index cb0f6698c..1fe2b3eb7 100644
--- a/data/presets/presets/type/restriction/no_right_turn.json
+++ b/data/presets/presets/type/restriction/no_right_turn.json
@@ -10,5 +10,5 @@
     "fields": [
         "except"
     ],
-    "icon": "restriction"
+    "icon": "restriction-no-right-turn"
 }
diff --git a/data/presets/presets/type/restriction/no_straight_on.json b/data/presets/presets/type/restriction/no_straight_on.json
index fe2927d79..b6e20e952 100644
--- a/data/presets/presets/type/restriction/no_straight_on.json
+++ b/data/presets/presets/type/restriction/no_straight_on.json
@@ -10,5 +10,5 @@
     "fields": [
         "except"
     ],
-    "icon": "restriction"
+    "icon": "restriction-no-straight-on"
 }
diff --git a/data/presets/presets/type/restriction/no_u_turn.json b/data/presets/presets/type/restriction/no_u_turn.json
index 6f1f40cd3..ce526a5f6 100644
--- a/data/presets/presets/type/restriction/no_u_turn.json
+++ b/data/presets/presets/type/restriction/no_u_turn.json
@@ -1,5 +1,5 @@
 {
-    "name": "No U Turn",
+    "name": "No U-turn",
     "geometry": [
         "relation"
     ],
@@ -10,5 +10,5 @@
     "fields": [
         "except"
     ],
-    "icon": "restriction"
+    "icon": "restriction-no-u-turn"
 }
diff --git a/data/presets/presets/type/restriction/only_left_turn.json b/data/presets/presets/type/restriction/only_left_turn.json
new file mode 100644
index 000000000..516f178f1
--- /dev/null
+++ b/data/presets/presets/type/restriction/only_left_turn.json
@@ -0,0 +1,14 @@
+{
+    "name": "Left Turn Only",
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "restriction",
+        "restriction": "only_left_turn"
+    },
+    "fields": [
+        "except"
+    ],
+    "icon": "restriction-only-left-turn"
+}
diff --git a/data/presets/presets/type/restriction/only_right_turn.json b/data/presets/presets/type/restriction/only_right_turn.json
new file mode 100644
index 000000000..428d274e7
--- /dev/null
+++ b/data/presets/presets/type/restriction/only_right_turn.json
@@ -0,0 +1,14 @@
+{
+    "name": "Right Turn Only",
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "restriction",
+        "restriction": "only_right_turn"
+    },
+    "fields": [
+        "except"
+    ],
+    "icon": "restriction-only-right-turn"
+}
diff --git a/data/presets/presets/type/restriction/only_straight_ahead.json b/data/presets/presets/type/restriction/only_straight_ahead.json
new file mode 100644
index 000000000..dcad31ab0
--- /dev/null
+++ b/data/presets/presets/type/restriction/only_straight_ahead.json
@@ -0,0 +1,14 @@
+{
+    "name": "No Turns",
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "restriction",
+        "restriction": "only_straight_ahead"
+    },
+    "fields": [
+        "except"
+    ],
+    "icon": "restriction-only-straight-ahead"
+}
diff --git a/data/relation-icons.json b/data/relation-icons.json
index 79d4f115f..2715cc804 100644
--- a/data/relation-icons.json
+++ b/data/relation-icons.json
@@ -14,5 +14,12 @@
     "route-ferry": [740, 25],
     "route-power": [800, 25],
     "route-pipeline": [860, 25],
-    "route-master": [920, 25]
+    "route-master": [920, 25],
+    "restriction-no-straight-on": [980, 25],
+    "restriction-no-u-turn": [1040, 25],
+    "restriction-no-left-turn": [1100, 25],
+    "restriction-no-right-turn": [1160, 25],
+    "restriction-only-straight-ahead": [1220, 25],
+    "restriction-only-left-turn": [1280, 25],
+    "restriction-only-right-turn": [1340, 25]
 }
diff --git a/dist/img/maki-sprite.png b/dist/img/maki-sprite.png
index e4028833d..af7b5322c 100644
Binary files a/dist/img/maki-sprite.png and b/dist/img/maki-sprite.png differ
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 64d57639d..2c5a525fe 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -416,6 +416,9 @@
             "category-rail": {
                 "name": "Rail"
             },
+            "category-restriction": {
+                "name": "Restriction"
+            },
             "category-road": {
                 "name": "Road"
             },
@@ -2844,7 +2847,19 @@
                 "terms": ""
             },
             "type/restriction/no_u_turn": {
-                "name": "No U Turn",
+                "name": "No U-turn",
+                "terms": ""
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Left Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Right Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_straight_ahead": {
+                "name": "No Turns",
                 "terms": ""
             },
             "type/route": {