diff --git a/css/preset-icons.css b/css/preset-icons.css
index b569c8367..c62bae90c 100644
--- a/css/preset-icons.css
+++ b/css/preset-icons.css
@@ -1,6 +1,7 @@
-/* glue: 0.3 hash: 3c6bb028c6 */
+/* glue: 0.3 hash: df242e0604 */
 .preset-waterway-river,
 .preset-railway-rail,
+.preset-highway,
 .preset-highway-trunk,
 .preset-highway-tertiary,
 .preset-highway-service,
@@ -96,96 +97,97 @@
 .preset-airfield{background-image:url('../img/preset-icons.png');background-repeat:no-repeat}
 .preset-waterway-river{background-position:0px 0px;width:100px;height:100px;}
 .preset-railway-rail{background-position:-100px 0px;width:100px;height:100px;}
-.preset-highway-trunk{background-position:0px -100px;width:100px;height:100px;}
-.preset-highway-tertiary{background-position:-100px -100px;width:100px;height:100px;}
-.preset-highway-service{background-position:-200px 0px;width:100px;height:100px;}
-.preset-highway-secondary{background-position:-200px -100px;width:100px;height:100px;}
-.preset-highway-residential{background-position:0px -200px;width:100px;height:100px;}
-.preset-highway-primary{background-position:-100px -200px;width:100px;height:100px;}
-.preset-highway-motorway{background-position:-200px -200px;width:100px;height:100px;}
-.preset-highway-footway{background-position:-300px 0px;width:100px;height:100px;}
-.preset-highway-cycleway{background-position:-300px -100px;width:100px;height:100px;}
-.preset-zoo{background-position:-300px -200px;width:24px;height:24px;}
-.preset-x{background-position:-324px -200px;width:24px;height:24px;}
-.preset-waste-basket{background-position:-348px -200px;width:24px;height:24px;}
-.preset-warehouse{background-position:-372px -200px;width:24px;height:24px;}
-.preset-triangle{background-position:-300px -224px;width:24px;height:24px;}
-.preset-triangle-stroked{background-position:-324px -224px;width:24px;height:24px;}
-.preset-town-hall{background-position:-348px -224px;width:24px;height:24px;}
-.preset-toilets{background-position:-372px -224px;width:24px;height:24px;}
-.preset-theatre{background-position:-300px -248px;width:24px;height:24px;}
-.preset-tennis{background-position:-324px -248px;width:24px;height:24px;}
-.preset-swimming{background-position:-348px -248px;width:24px;height:24px;}
-.preset-star{background-position:-372px -248px;width:24px;height:24px;}
-.preset-star-stroked{background-position:-300px -272px;width:24px;height:24px;}
-.preset-square{background-position:-324px -272px;width:24px;height:24px;}
-.preset-square-stroked{background-position:-348px -272px;width:24px;height:24px;}
-.preset-soccer{background-position:-372px -272px;width:24px;height:24px;}
-.preset-slaughterhouse{background-position:0px -300px;width:24px;height:24px;}
-.preset-skiing{background-position:-24px -300px;width:24px;height:24px;}
-.preset-shop{background-position:-48px -300px;width:24px;height:24px;}
-.preset-school{background-position:-72px -300px;width:24px;height:24px;}
-.preset-roadblock{background-position:-96px -300px;width:24px;height:24px;}
-.preset-restaurant{background-position:-120px -300px;width:24px;height:24px;}
-.preset-religious-muslim{background-position:-144px -300px;width:24px;height:24px;}
-.preset-religious-jewish{background-position:-168px -300px;width:24px;height:24px;}
-.preset-religious-christian{background-position:-192px -300px;width:24px;height:24px;}
-.preset-rail{background-position:-216px -300px;width:24px;height:24px;}
-.preset-rail-underground{background-position:-240px -300px;width:24px;height:24px;}
-.preset-rail-above{background-position:-264px -300px;width:24px;height:24px;}
-.preset-prison{background-position:-288px -300px;width:24px;height:24px;}
-.preset-post{background-position:-312px -300px;width:24px;height:24px;}
-.preset-police{background-position:-336px -300px;width:24px;height:24px;}
-.preset-place-of-worship{background-position:-360px -300px;width:24px;height:24px;}
-.preset-pitch{background-position:0px -324px;width:24px;height:24px;}
-.preset-pharmacy{background-position:-24px -324px;width:24px;height:24px;}
-.preset-parking{background-position:-48px -324px;width:24px;height:24px;}
-.preset-parking-garage{background-position:-72px -324px;width:24px;height:24px;}
-.preset-park2{background-position:-96px -324px;width:24px;height:24px;}
-.preset-park{background-position:-120px -324px;width:24px;height:24px;}
-.preset-oil-well{background-position:-144px -324px;width:24px;height:24px;}
-.preset-museum{background-position:-168px -324px;width:24px;height:24px;}
-.preset-monument{background-position:-192px -324px;width:24px;height:24px;}
-.preset-minefield{background-position:-216px -324px;width:24px;height:24px;}
-.preset-marker{background-position:-240px -324px;width:24px;height:24px;}
-.preset-marker-stroked{background-position:-264px -324px;width:24px;height:24px;}
-.preset-london-underground{background-position:-288px -324px;width:24px;height:24px;}
-.preset-logging{background-position:-312px -324px;width:24px;height:24px;}
-.preset-lodging{background-position:-336px -324px;width:24px;height:24px;}
-.preset-library{background-position:-360px -324px;width:24px;height:24px;}
-.preset-industrial{background-position:0px -348px;width:24px;height:24px;}
-.preset-hospital{background-position:-24px -348px;width:24px;height:24px;}
-.preset-heliport{background-position:-48px -348px;width:24px;height:24px;}
-.preset-harbor{background-position:-72px -348px;width:24px;height:24px;}
-.preset-grocery{background-position:-96px -348px;width:24px;height:24px;}
-.preset-golf{background-position:-120px -348px;width:24px;height:24px;}
-.preset-garden{background-position:-144px -348px;width:24px;height:24px;}
-.preset-fuel{background-position:-168px -348px;width:24px;height:24px;}
-.preset-fire-station{background-position:-192px -348px;width:24px;height:24px;}
-.preset-ferry{background-position:-216px -348px;width:24px;height:24px;}
-.preset-fast-food{background-position:-240px -348px;width:24px;height:24px;}
-.preset-embassy{background-position:-264px -348px;width:24px;height:24px;}
-.preset-danger{background-position:-288px -348px;width:24px;height:24px;}
-.preset-dam{background-position:-312px -348px;width:24px;height:24px;}
-.preset-cross{background-position:-336px -348px;width:24px;height:24px;}
-.preset-cricket{background-position:-360px -348px;width:24px;height:24px;}
-.preset-commercial{background-position:0px -372px;width:24px;height:24px;}
-.preset-college{background-position:-24px -372px;width:24px;height:24px;}
-.preset-circle{background-position:-48px -372px;width:24px;height:24px;}
-.preset-circle-stroked{background-position:-72px -372px;width:24px;height:24px;}
-.preset-cinema{background-position:-96px -372px;width:24px;height:24px;}
-.preset-cemetery{background-position:-120px -372px;width:24px;height:24px;}
-.preset-campsite{background-position:-144px -372px;width:24px;height:24px;}
-.preset-cafe{background-position:-168px -372px;width:24px;height:24px;}
-.preset-bus{background-position:-192px -372px;width:24px;height:24px;}
-.preset-bicycle{background-position:-216px -372px;width:24px;height:24px;}
-.preset-beer{background-position:-240px -372px;width:24px;height:24px;}
-.preset-basketball{background-position:-264px -372px;width:24px;height:24px;}
-.preset-baseball{background-position:-288px -372px;width:24px;height:24px;}
-.preset-bar{background-position:-312px -372px;width:24px;height:24px;}
-.preset-bank{background-position:-336px -372px;width:24px;height:24px;}
-.preset-art-gallery{background-position:-360px -372px;width:24px;height:24px;}
-.preset-america-football{background-position:-400px 0px;width:24px;height:24px;}
-.preset-alcohol-shop{background-position:-400px -24px;width:24px;height:24px;}
-.preset-airport{background-position:-400px -48px;width:24px;height:24px;}
-.preset-airfield{background-position:-400px -72px;width:24px;height:24px;}
+.preset-highway{background-position:0px -100px;width:100px;height:100px;}
+.preset-highway-trunk{background-position:-100px -100px;width:100px;height:100px;}
+.preset-highway-tertiary{background-position:-200px 0px;width:100px;height:100px;}
+.preset-highway-service{background-position:-200px -100px;width:100px;height:100px;}
+.preset-highway-secondary{background-position:0px -200px;width:100px;height:100px;}
+.preset-highway-residential{background-position:-100px -200px;width:100px;height:100px;}
+.preset-highway-primary{background-position:-200px -200px;width:100px;height:100px;}
+.preset-highway-motorway{background-position:-300px 0px;width:100px;height:100px;}
+.preset-highway-footway{background-position:-300px -100px;width:100px;height:100px;}
+.preset-highway-cycleway{background-position:-300px -200px;width:100px;height:100px;}
+.preset-zoo{background-position:0px -300px;width:24px;height:24px;}
+.preset-x{background-position:-24px -300px;width:24px;height:24px;}
+.preset-waste-basket{background-position:-48px -300px;width:24px;height:24px;}
+.preset-warehouse{background-position:-72px -300px;width:24px;height:24px;}
+.preset-triangle{background-position:-96px -300px;width:24px;height:24px;}
+.preset-triangle-stroked{background-position:-120px -300px;width:24px;height:24px;}
+.preset-town-hall{background-position:-144px -300px;width:24px;height:24px;}
+.preset-toilets{background-position:-168px -300px;width:24px;height:24px;}
+.preset-theatre{background-position:-192px -300px;width:24px;height:24px;}
+.preset-tennis{background-position:-216px -300px;width:24px;height:24px;}
+.preset-swimming{background-position:-240px -300px;width:24px;height:24px;}
+.preset-star{background-position:-264px -300px;width:24px;height:24px;}
+.preset-star-stroked{background-position:-288px -300px;width:24px;height:24px;}
+.preset-square{background-position:-312px -300px;width:24px;height:24px;}
+.preset-square-stroked{background-position:-336px -300px;width:24px;height:24px;}
+.preset-soccer{background-position:-360px -300px;width:24px;height:24px;}
+.preset-slaughterhouse{background-position:0px -324px;width:24px;height:24px;}
+.preset-skiing{background-position:-24px -324px;width:24px;height:24px;}
+.preset-shop{background-position:-48px -324px;width:24px;height:24px;}
+.preset-school{background-position:-72px -324px;width:24px;height:24px;}
+.preset-roadblock{background-position:-96px -324px;width:24px;height:24px;}
+.preset-restaurant{background-position:-120px -324px;width:24px;height:24px;}
+.preset-religious-muslim{background-position:-144px -324px;width:24px;height:24px;}
+.preset-religious-jewish{background-position:-168px -324px;width:24px;height:24px;}
+.preset-religious-christian{background-position:-192px -324px;width:24px;height:24px;}
+.preset-rail{background-position:-216px -324px;width:24px;height:24px;}
+.preset-rail-underground{background-position:-240px -324px;width:24px;height:24px;}
+.preset-rail-above{background-position:-264px -324px;width:24px;height:24px;}
+.preset-prison{background-position:-288px -324px;width:24px;height:24px;}
+.preset-post{background-position:-312px -324px;width:24px;height:24px;}
+.preset-police{background-position:-336px -324px;width:24px;height:24px;}
+.preset-place-of-worship{background-position:-360px -324px;width:24px;height:24px;}
+.preset-pitch{background-position:0px -348px;width:24px;height:24px;}
+.preset-pharmacy{background-position:-24px -348px;width:24px;height:24px;}
+.preset-parking{background-position:-48px -348px;width:24px;height:24px;}
+.preset-parking-garage{background-position:-72px -348px;width:24px;height:24px;}
+.preset-park2{background-position:-96px -348px;width:24px;height:24px;}
+.preset-park{background-position:-120px -348px;width:24px;height:24px;}
+.preset-oil-well{background-position:-144px -348px;width:24px;height:24px;}
+.preset-museum{background-position:-168px -348px;width:24px;height:24px;}
+.preset-monument{background-position:-192px -348px;width:24px;height:24px;}
+.preset-minefield{background-position:-216px -348px;width:24px;height:24px;}
+.preset-marker{background-position:-240px -348px;width:24px;height:24px;}
+.preset-marker-stroked{background-position:-264px -348px;width:24px;height:24px;}
+.preset-london-underground{background-position:-288px -348px;width:24px;height:24px;}
+.preset-logging{background-position:-312px -348px;width:24px;height:24px;}
+.preset-lodging{background-position:-336px -348px;width:24px;height:24px;}
+.preset-library{background-position:-360px -348px;width:24px;height:24px;}
+.preset-industrial{background-position:0px -372px;width:24px;height:24px;}
+.preset-hospital{background-position:-24px -372px;width:24px;height:24px;}
+.preset-heliport{background-position:-48px -372px;width:24px;height:24px;}
+.preset-harbor{background-position:-72px -372px;width:24px;height:24px;}
+.preset-grocery{background-position:-96px -372px;width:24px;height:24px;}
+.preset-golf{background-position:-120px -372px;width:24px;height:24px;}
+.preset-garden{background-position:-144px -372px;width:24px;height:24px;}
+.preset-fuel{background-position:-168px -372px;width:24px;height:24px;}
+.preset-fire-station{background-position:-192px -372px;width:24px;height:24px;}
+.preset-ferry{background-position:-216px -372px;width:24px;height:24px;}
+.preset-fast-food{background-position:-240px -372px;width:24px;height:24px;}
+.preset-embassy{background-position:-264px -372px;width:24px;height:24px;}
+.preset-danger{background-position:-288px -372px;width:24px;height:24px;}
+.preset-dam{background-position:-312px -372px;width:24px;height:24px;}
+.preset-cross{background-position:-336px -372px;width:24px;height:24px;}
+.preset-cricket{background-position:-360px -372px;width:24px;height:24px;}
+.preset-commercial{background-position:-400px 0px;width:24px;height:24px;}
+.preset-college{background-position:-400px -24px;width:24px;height:24px;}
+.preset-circle{background-position:-400px -48px;width:24px;height:24px;}
+.preset-circle-stroked{background-position:-400px -72px;width:24px;height:24px;}
+.preset-cinema{background-position:-400px -96px;width:24px;height:24px;}
+.preset-cemetery{background-position:-400px -120px;width:24px;height:24px;}
+.preset-campsite{background-position:-400px -144px;width:24px;height:24px;}
+.preset-cafe{background-position:-400px -168px;width:24px;height:24px;}
+.preset-bus{background-position:-400px -192px;width:24px;height:24px;}
+.preset-bicycle{background-position:-400px -216px;width:24px;height:24px;}
+.preset-beer{background-position:-400px -240px;width:24px;height:24px;}
+.preset-basketball{background-position:-400px -264px;width:24px;height:24px;}
+.preset-baseball{background-position:-400px -288px;width:24px;height:24px;}
+.preset-bar{background-position:-400px -312px;width:24px;height:24px;}
+.preset-bank{background-position:-400px -336px;width:24px;height:24px;}
+.preset-art-gallery{background-position:-400px -360px;width:24px;height:24px;}
+.preset-america-football{background-position:0px -396px;width:24px;height:24px;}
+.preset-alcohol-shop{background-position:-24px -396px;width:24px;height:24px;}
+.preset-airport{background-position:-48px -396px;width:24px;height:24px;}
+.preset-airfield{background-position:-72px -396px;width:24px;height:24px;}
diff --git a/img/preset-icons.png b/img/preset-icons.png
index eae619586..5623a7b51 100644
Binary files a/img/preset-icons.png and b/img/preset-icons.png differ
diff --git a/img/source/line-presets.svg b/img/source/line-presets.svg
index 8dbcdc275..e1139f38c 100644
--- a/img/source/line-presets.svg
+++ b/img/source/line-presets.svg
@@ -14,7 +14,7 @@
    height="100"
    id="svg7013"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="line-presets.svg">
   <defs
      id="defs7015">
@@ -84,17 +84,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="1013.1487"
-     inkscape:cy="34.46777"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="1225.1189"
+     inkscape:cy="88.134143"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="highway-primary-1"
      showgrid="false"
-     inkscape:window-width="1556"
-     inkscape:window-height="801"
-     inkscape:window-x="119"
-     inkscape:window-y="107"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -2185,5 +2185,53 @@
          d="m 637,55.362183 -4.5,4 -1.5,3 0,1 1.5,0 2,-3.5 3.5,-3 0,-1.5 z"
          style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
+    <g
+       transform="translate(1099.75,0)"
+       id="highway-primary-1"
+       inkscape:label="">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9774-1"
+         width="100"
+         height="100"
+         x="-180"
+         y="12.362183" />
+      <rect
+         transform="matrix(0,1,-1,0,0,0)"
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect15468-7"
+         width="14"
+         height="100"
+         x="62.362183"
+         y="80" />
+      <rect
+         y="80"
+         x="-83.362183"
+         height="100"
+         width="6.000001"
+         id="rect15630-7"
+         style="color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(0,-1,-1,0,0,0)" />
+      <rect
+         transform="matrix(0,-1,-1,0,0,0)"
+         style="color:#000000;fill:#b5b5b5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect15632-4"
+         width="5.0000014"
+         height="100"
+         x="-46.362183"
+         y="80" />
+      <g
+         id="g15472-7"
+         transform="translate(220,3)">
+        <rect
+           transform="matrix(0,1,-1,0,0,0)"
+           style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect15474-8"
+           width="13.999989"
+           height="100"
+           x="44.362183"
+           y="300" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/img/source/renders/line-presets/highway.png b/img/source/renders/line-presets/highway.png
new file mode 100644
index 000000000..63bc75e61
Binary files /dev/null and b/img/source/renders/line-presets/highway.png differ
diff --git a/presets/categories.json b/presets/categories.json
index 367e74231..184ab0df1 100644
--- a/presets/categories.json
+++ b/presets/categories.json
@@ -3,11 +3,17 @@
     "match": {
         "type": "line"
     },
-    "icon": "road",
+    "icon": "highway",
     "name": "roads",
     "members": [
         "residential road",
-        "primary road"
+        "primary road",
+        "secondary road",
+        "tertiary road",
+        "motorway",
+        "trunk highway",
+        "service road",
+        "other"
     ]
 }
 ]