diff --git a/data/presets/categories.json b/data/presets/categories.json
index 65969b484..b7ecc20dc 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -86,7 +86,7 @@
       ]
     },
     "category-path": {
-      "icon": "iD-category-path",
+      "icon": "temaki-pedestrian",
       "name": "Paths",
       "members": [
         "highway/path",
@@ -100,7 +100,7 @@
       ]
     },
     "category-rail": {
-      "icon": "iD-category-rail",
+      "icon": "iD-railway-rail",
       "name": "Rails",
       "members": [
         "railway/rail",
@@ -129,7 +129,7 @@
       ]
     },
     "category-road_major": {
-      "icon": "iD-category-roads",
+      "icon": "iD-highway-unclassified",
       "name": "Major Roads",
       "members": [
         "highway/motorway",
@@ -145,7 +145,7 @@
       ]
     },
     "category-road_minor": {
-      "icon": "iD-category-roads",
+      "icon": "iD-highway-unclassified",
       "name": "Minor Roads",
       "members": [
         "highway/unclassified",
@@ -157,7 +157,7 @@
       ]
     },
     "category-road_service": {
-      "icon": "iD-category-roads",
+      "icon": "iD-highway-service",
       "name": "Service Roads",
       "members": [
         "highway/service",
@@ -192,7 +192,7 @@
       ]
     },
     "category-utility": {
-      "icon": "iD-category-utility",
+      "icon": "iD-power-line",
       "name": "Utility Features",
       "members": [
         "power/line",
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index 9c10901fd..d48958cde 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-path",
+    "icon": "temaki-pedestrian",
     "name": "Paths",
     "members": [
         "highway/path",
diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json
index 6fccacabf..89b226b35 100644
--- a/data/presets/categories/rail.json
+++ b/data/presets/categories/rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-rail",
+    "icon": "iD-railway-rail",
     "name": "Rails",
     "members": [
         "railway/rail",
diff --git a/data/presets/categories/road_major.json b/data/presets/categories/road_major.json
index 1553d728a..0a0d912a1 100644
--- a/data/presets/categories/road_major.json
+++ b/data/presets/categories/road_major.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-roads",
+    "icon": "iD-highway-unclassified",
     "name": "Major Roads",
     "members": [
         "highway/motorway",
diff --git a/data/presets/categories/road_minor.json b/data/presets/categories/road_minor.json
index ff66bfacf..5b7d5aeaa 100644
--- a/data/presets/categories/road_minor.json
+++ b/data/presets/categories/road_minor.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-roads",
+    "icon": "iD-highway-unclassified",
     "name": "Minor Roads",
     "members": [
         "highway/unclassified",
diff --git a/data/presets/categories/road_service.json b/data/presets/categories/road_service.json
index 5686395b9..632345405 100644
--- a/data/presets/categories/road_service.json
+++ b/data/presets/categories/road_service.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-roads",
+    "icon": "iD-highway-service",
     "name": "Service Roads",
     "members": [
         "highway/service",
diff --git a/data/presets/categories/utility.json b/data/presets/categories/utility.json
index 1509c4ab1..215e331fb 100644
--- a/data/presets/categories/utility.json
+++ b/data/presets/categories/utility.json
@@ -1,5 +1,5 @@
 {
-    "icon": "iD-category-utility",
+    "icon": "iD-power-line",
     "name": "Utility Features",
     "members": [
         "power/line",
diff --git a/svg/iD-sprite/presets/category-path.svg b/svg/iD-sprite/presets/category-path.svg
deleted file mode 100644
index 8d4070adf..000000000
--- a/svg/iD-sprite/presets/category-path.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M22,41 L25,30 L28,19 L32,19 L35,30 L38,41 z" fill="currentColor" id="category-path-stroke"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-rail.svg b/svg/iD-sprite/presets/category-rail.svg
deleted file mode 100644
index b9369f2a2..000000000
--- a/svg/iD-sprite/presets/category-rail.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M23.5,18 L22,19 L21.531,21 L18.25,21 C17.696,21 17.384,21.463 17.25,22 L17,23 C16.866,23.537 17.446,24 18,24 L42,24 C42.554,24 43.134,23.537 43,23 L42.75,22 C42.616,21.463 42.304,21 41.75,21 L38.969,21 L38.5,19 L37,18 L36,19 L36.469,21 L24.031,21 L24.5,19 L23.5,18 z M21.5,22 C21.776,22 22,22.224 22,22.5 C22,22.776 21.776,23 21.5,23 C21.224,23 21,22.776 21,22.5 C21,22.224 21.224,22 21.5,22 z M38.5,22 C38.776,22 39,22.224 39,22.5 C39,22.776 38.776,23 38.5,23 C38.224,23 38,22.776 38,22.5 C38,22.224 38.224,22 38.5,22 z M20.562,25 L20.094,27 L17.25,27 C16.696,27 16.384,27.463 16.25,28 L16,29 C15.866,29.537 16.446,30 17,30 L43,30 C43.554,30 44.134,29.537 44,29 L43.75,28 C43.616,27.463 43.304,27 42.75,27 L40.406,27 L39.938,25 L37.438,25 L37.906,27 L22.594,27 L23.062,25 L20.562,25 z M20.5,28 C20.776,28 21,28.224 21,28.5 C21,28.776 20.776,29 20.5,29 C20.224,29 20,28.776 20,28.5 C20,28.224 20.224,28 20.5,28 z M39.5,28 C39.776,28 40,28.224 40,28.5 C40,28.776 39.776,29 39.5,29 C39.224,29 39,28.776 39,28.5 C39,28.224 39.224,28 39.5,28 z M19.156,31 L18.688,33 L16.25,33 C15.696,33 15.384,33.463 15.25,34 L15,35 C14.866,35.537 15.446,36 16,36 L44,36 C44.554,36 45.134,35.537 45,35 L44.75,34 C44.616,33.463 44.304,33 43.75,33 L41.812,33 L41.344,31 L38.844,31 L39.312,33 L21.188,33 L21.656,31 L19.156,31 z M19.5,34 C19.776,34 20,34.224 20,34.5 C20,34.776 19.776,35 19.5,35 C19.224,35 19,34.776 19,34.5 C19,34.224 19.224,34 19.5,34 z M40.5,34 C40.776,34 41,34.224 41,34.5 C41,34.776 40.776,35 40.5,35 C40.224,35 40,34.776 40,34.5 C40,34.224 40.224,34 40.5,34 z M17.719,37 L17,40 L18.5,41 L19.5,40 L20.219,37 L17.719,37 z M40.281,37 L41,40 L42,41 L43.5,40 L42.781,37 L40.281,37 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-roads.svg b/svg/iD-sprite/presets/category-roads.svg
deleted file mode 100644
index e298e81a2..000000000
--- a/svg/iD-sprite/presets/category-roads.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M22.5,20 L19.625,26 L18,26 L17,27 L17,29 L18.406,29 L18,30 L18,35 L18,36 L18,36 C18,36 18.608,36.608 19,37 L20,37 L24,37 L26,38 L34,38 L36,37 L40,37 L41,37 L42,36 L42,36 L42,35 L42,30 L41.594,29 L43,29 L43,27 L42,26 L40.375,26 L37.5,20 z M23.5,23 L36.5,23 L38,27 L37,28 L23,28 L22,27 z M21,31 L24,31 L25,33 L25,34 L21,34 L20,33 L20,32 z M36,31 L39,31 L40,32 L40,33 L39,34 L35,34 L35,33 z M19,38 L19,40 L20,41 L23,41 L24,40 L24,38 z M36,38 L36,40 L37,41 L40,41 L41,40 L41,38 z" fill="#989898"/>
-</svg>
\ No newline at end of file
diff --git a/svg/iD-sprite/presets/category-utility.svg b/svg/iD-sprite/presets/category-utility.svg
deleted file mode 100644
index e819114fc..000000000
--- a/svg/iD-sprite/presets/category-utility.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <svg y="7">
-    <path d="M20,10 L20,11 L22,11 L22,10 L20,10 z M24,10 L24,11 L26,11 L26,10 L24,10 z M34,10 L34,11 L36,11 L36,10 L34,10 z M38,10 L38,11 L40,11 L40,10 L38,10 z M20.312,15 C19.647,18.533 17.267,20.5 15,20.5 L14,20.5 L14,21.5 L15,21.5 C16.042,21.5 17.082,21.196 18,20.594 L18,21.5 L19,21.5 C21.879,21.5 24.615,19.022 25.312,15 L24.312,15 C23.647,18.533 21.267,20.5 19,20.5 L18.125,20.5 C19.686,19.42 20.885,17.509 21.312,15 L20.312,15 z M34.688,15 C35.385,19.022 38.121,21.5 41,21.5 L42,21.5 L42,20.594 C42.918,21.196 43.958,21.5 45,21.5 L46,21.5 L46,20.5 L45,20.5 C42.733,20.5 40.353,18.533 39.688,15 L38.688,15 C39.115,17.509 40.314,19.42 41.875,20.5 L41,20.5 C38.733,20.5 36.353,18.533 35.688,15 L34.688,15 z" fill="#989898"/>
-    <path d="M28,10 L28,12 L19,12 L19,14 L28,14 L28,36 L32,36 L32,14 L41,14 L41,12 L32,12 L32,10 L28,10 z" fill="#989898"/>
-  </svg>
-</svg>
diff --git a/svg/iD-sprite/presets/category-water.svg b/svg/iD-sprite/presets/category-water.svg
deleted file mode 100644
index 47da3fd11..000000000
--- a/svg/iD-sprite/presets/category-water.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
-  <path d="M16.762,41 C16.762,41 16.225,39.154 16.417,38.25 C16.638,37.203 18.071,35.5 18.071,35.5 C18.071,35.5 19.505,33.797 19.726,32.75 C19.917,31.846 19.381,30 19.381,30 C19.381,30 18.844,28.154 19.036,27.25 C19.257,26.203 20.69,24.5 20.69,24.5 C20.69,24.5 22.124,22.797 22.345,21.75 C22.536,20.846 22,19 22,19 L38.5,19 C38.5,19 39.933,20.703 40.155,21.75 C40.346,22.654 39.809,24.5 39.809,24.5 C39.809,24.5 39.273,26.346 39.464,27.25 C39.686,28.297 41.119,30 41.119,30 C41.119,30 42.552,31.703 42.774,32.75 C42.965,33.654 42.428,35.5 42.428,35.5 C42.428,35.5 41.892,37.346 42.083,38.25 C42.305,39.297 43.738,41 43.738,41 z" fill="currentColor" id="category-water-stroke1"/>
-  <path d="M17.966,32.759 C17.751,33.559 17.145,34.092 16.612,33.949 C16.078,33.806 15.82,33.041 16.034,32.241 C16.248,31.441 16.855,30.908 17.388,31.051 C17.922,31.194 18.18,31.959 17.966,32.759 z M19.799,22.75 C20.351,21.793 20.217,20.682 19.5,20.268 C18.783,19.854 17.753,20.293 17.201,21.25 C16.649,22.207 16.783,23.318 17.5,23.732 C18.217,24.146 19.247,23.707 19.799,22.75 z M41.422,26.708 C41.208,25.908 41.467,25.143 42,25 C42.533,24.857 43.14,25.39 43.354,26.19 C43.569,26.99 43.31,27.755 42.776,27.898 C42.243,28.041 41.637,27.508 41.422,26.708 z M44.299,37.75 C43.747,36.793 43.881,35.682 44.598,35.268 C45.316,34.854 46.345,35.293 46.897,36.25 C47.449,37.207 47.316,38.318 46.598,38.732 C45.881,39.146 44.851,38.707 44.299,37.75 z" fill="currentColor" id="category-water-stroke2" opacity="0.5"/>
-</svg>
\ No newline at end of file