diff --git a/gulpfile.js b/gulpfile.js
index c003943fa..de440fcc7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -418,13 +418,13 @@ gulp.task('optimize', function (cb) {
 				.replace(/([Aa])\s?([0-9.]+)\s([0-9.]+)\s([0-9.]+)\s?([0-1])\s?([0-1])\s?(-?[0-9.]+)\s?(-?[0-9.]+)/gi, '$1$2 $3 $4 $5 $6 $7 $8')
 				.replace(/\n\n+/g, "\n")
 
-				.replace(/<path d="M([0-9.]*) ([0-9.]*)l([-0-9.]*) ([-0-9.]*)"/g, function(f, r1, r2, r3, r4){
+				.replace(/<path d="M([0-9.]*) ([0-9.]*)l\s?([-0-9.]*) ([-0-9.]*)"/g, function(f, r1, r2, r3, r4){
 					return `<line x1="${r1}" y1="${r2}" x2="${addFloats(r1, r3)}" y2="${addFloats(r2, r4)}"`;
 				})
-				.replace(/<path d="M([0-9.]*) ([0-9.]*)v([0-9.]*)"/g, function(f, r1, r2, r3){
+				.replace(/<path d="M([0-9.]*) ([0-9.]*)v\s?([0-9.]*)"/g, function(f, r1, r2, r3){
 					return `<line x1="${r1}" y1="${r2}" x2="${r1}" y2="${addFloats(r2, r3)}"`;
 				})
-				.replace(/<path d="M([0-9.]*) ([0-9.]*)h([0-9.]*)"/g, function(f, r1, r2, r3){
+				.replace(/<path d="M([0-9.]*) ([0-9.]*)h\s?([0-9.]*)"/g, function(f, r1, r2, r3){
 					return `<line x1="${r1}" y1="${r2}" x2="${addFloats(r1, r3)}" y2="${r2}"`;
 				});
 
diff --git a/src/_icons/bike.svg b/src/_icons/bike.svg
index 6869b5197..c0750b440 100644
--- a/src/_icons/bike.svg
+++ b/src/_icons/bike.svg
@@ -1,6 +1,6 @@
 ---
 tags: [cycling, bicycle, sport, wheel]
-category: Vehicles
+category: Sport
 ---
 <svg>
   <circle cx="5" cy="18" r="3" />
diff --git a/src/_icons/caravan.svg b/src/_icons/caravan.svg
new file mode 100644
index 000000000..fb5e5bbf1
--- /dev/null
+++ b/src/_icons/caravan.svg
@@ -0,0 +1,9 @@
+---
+category: Vehicles
+---
+<svg>
+  <circle cx="11" cy="17" r="2" />
+  <path d="M21 17h-8" />
+  <path d="M9 17h-5a1 1 0 0 1 -1 -1v-9a2 2 0 0 1 2 -2h10l4 4v8" />
+  <rect x="6" y="8" width="6" height="4" rx="1" />
+</svg>
diff --git a/src/_icons/gas-station.svg b/src/_icons/gas-station.svg
new file mode 100644
index 000000000..a72e32e2d
--- /dev/null
+++ b/src/_icons/gas-station.svg
@@ -0,0 +1,10 @@
+---
+category: Vehicles
+---
+<svg>
+  <path d="M13 11h1a2 2 0 0 1 2 2v3a1.5 1.5 0 0 0 3 0v-7l-3 -3" />
+  <line x1="4" y1="19" x2="14" y2="19" />
+  <line x1="5" y1="11" x2="13" y2="11" />
+  <path d="M5 19v-12a2 2 0 0 1 2 -2h4a2 2 0 0 1 2 2v12" />
+  <path d="M17 7v1a1 1 0 0 0 1 1h1" />
+</svg>
diff --git a/src/_icons/keyboard-hide.svg b/src/_icons/keyboard-hide.svg
new file mode 100644
index 000000000..1f9bd8463
--- /dev/null
+++ b/src/_icons/keyboard-hide.svg
@@ -0,0 +1,15 @@
+---
+tags: [computer, laptop, device, type]
+category: Devices
+---
+<svg>
+  <rect x="2" y="3" width="20" height="12" rx="2" />
+  <line x1="6" y1="7" x2="6" y2="7" />
+  <line x1="10" y1="7" x2="10" y2="7" />
+  <line x1="14" y1="7" x2="14" y2="7" />
+  <line x1="18" y1="7" x2="18" y2="7" />
+  <line x1="6" y1="11" x2="6" y2="11.01" />
+  <line x1="18" y1="11" x2="18" y2="11.01" />
+  <line x1="10" y1="11" x2="14" y2="11" />
+  <path d="M10 21l2 -2l2 2" />
+</svg>
diff --git a/src/_icons/keyboard-show.svg b/src/_icons/keyboard-show.svg
new file mode 100644
index 000000000..bdc9dc2fc
--- /dev/null
+++ b/src/_icons/keyboard-show.svg
@@ -0,0 +1,15 @@
+---
+tags: [computer, laptop, device, type]
+category: Devices
+---
+<svg>
+  <rect x="2" y="3" width="20" height="12" rx="2" />
+  <line x1="6" y1="7" x2="6" y2="7" />
+  <line x1="10" y1="7" x2="10" y2="7" />
+  <line x1="14" y1="7" x2="14" y2="7" />
+  <line x1="18" y1="7" x2="18" y2="7" />
+  <line x1="6" y1="11" x2="6" y2="11.01" />
+  <line x1="18" y1="11" x2="18" y2="11.01" />
+  <line x1="10" y1="11" x2="14" y2="11" />
+  <path d="M10 19l2 2l2 -2" />
+</svg>
diff --git a/src/_icons/keyboard.svg b/src/_icons/keyboard.svg
index 8fd5fcc70..822bc9e15 100644
--- a/src/_icons/keyboard.svg
+++ b/src/_icons/keyboard.svg
@@ -1,13 +1,14 @@
 ---
 tags: [computer, laptop, device, type]
+category: Devices
 ---
 <svg>
-  <rect x="3" y="4" width="18" height="16" rx="2" />
-  <line x1="7" y1="8" x2="7" y2="8.01" />
-  <line x1="12" y1="8" x2="12" y2="8.01" />
-  <line x1="17" y1="8" x2="17" y2="8.01" />
-  <line x1="7" y1="12" x2="7" y2="12.01" />
-  <line x1="12" y1="12" x2="12" y2="12.01" />
-  <line x1="17" y1="12" x2="17" y2="12.01" />
-  <line x1="7" y1="16" x2="17" y2="16" />
+  <rect x="2" y="6" width="20" height="12" rx="2" />
+  <line x1="6" y1="10" x2="6" y2="10" />
+  <line x1="10" y1="10" x2="10" y2="10" />
+  <line x1="14" y1="10" x2="14" y2="10" />
+  <line x1="18" y1="10" x2="18" y2="10" />
+  <line x1="6" y1="14" x2="6" y2="14.01" />
+  <line x1="18" y1="14" x2="18" y2="14.01" />
+  <line x1="10" y1="14" x2="14" y2="14" />
 </svg>
diff --git a/src/_icons/mars.svg b/src/_icons/mars.svg
new file mode 100644
index 000000000..6b2478b9e
--- /dev/null
+++ b/src/_icons/mars.svg
@@ -0,0 +1,9 @@
+---
+category: Symbols
+---
+<svg>
+  <circle cx="10" cy="14" r="5" />
+  <line x1="19" y1="5" x2="13.6" y2="10.4" />
+  <path d="M19 5h-5" />
+  <line x1="19" y1="5" x2="19" y2="10" />
+</svg>
diff --git a/src/_icons/page-break.svg b/src/_icons/page-break.svg
new file mode 100644
index 000000000..422d0dbec
--- /dev/null
+++ b/src/_icons/page-break.svg
@@ -0,0 +1,8 @@
+---
+---
+<svg>
+  <path d="M14 3v4a1 1 0 0 0 1 1h4" />
+  <path d="M19 18v1a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2v-1" />
+  <path d="M3 14h3m4.5 0h3m4.5 0h3" />
+  <path d="M5 10v-5a2 2 0 0 1 2 -2h7l5 5v2" />
+</svg>
diff --git a/src/_icons/run.svg b/src/_icons/run.svg
new file mode 100644
index 000000000..a630db54a
--- /dev/null
+++ b/src/_icons/run.svg
@@ -0,0 +1,9 @@
+---
+category: Sport
+---
+<svg>
+  <circle cx="13" cy="4" r="1" />
+  <path d="M4 17l5 1l.75 -1.5" />
+  <path d="M15 21l0 -4l-4 -3l1 -6" />
+  <path d="M7 12l0 -3l5 -1l3 3l3 1" />
+</svg>
diff --git a/src/_icons/sailboat.svg b/src/_icons/sailboat.svg
new file mode 100644
index 000000000..0dfa28de1
--- /dev/null
+++ b/src/_icons/sailboat.svg
@@ -0,0 +1,9 @@
+---
+category: Vehicles
+---
+<svg>
+  <path d="M2 20a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1" />
+  <path d="M4 18l-1 -3h18l-1 3" />
+  <path d="M11 12h7l-7 -9v9" />
+  <line x1="8" y1="7" x2="6" y2="12" />
+</svg>
diff --git a/src/_icons/ship.svg b/src/_icons/ship.svg
new file mode 100644
index 000000000..62e661b81
--- /dev/null
+++ b/src/_icons/ship.svg
@@ -0,0 +1,9 @@
+---
+category: Vehicles
+---
+<svg>
+  <path d="M2 20a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1" />
+  <path d="M4 18l-1 -5h18l-2 4" />
+  <path d="M5 13v-6h8l4 6" />
+  <path d="M7 7v-4h-1" />
+</svg>
diff --git a/src/_icons/swiming.svg b/src/_icons/swiming.svg
new file mode 100644
index 000000000..d3afee74f
--- /dev/null
+++ b/src/_icons/swiming.svg
@@ -0,0 +1,8 @@
+---
+category: Sport
+---
+<svg>
+  <circle cx="16" cy="9" r="1" />
+  <path d="M6 11l4 -2l3.5 3l-1.5 2" />
+  <path d="M3 16.75a2.4 2.4 0 0 0 1 .25a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 2 -1a2.4 2.4 0 0 1 2 -1a2.4 2.4 0 0 1 2 1a2.4 2.4 0 0 0 2 1a2.4 2.4 0 0 0 1 -.25" />
+</svg>
diff --git a/src/_icons/venus.svg b/src/_icons/venus.svg
new file mode 100644
index 000000000..ed953b847
--- /dev/null
+++ b/src/_icons/venus.svg
@@ -0,0 +1,8 @@
+---
+category: Symbols
+---
+<svg>
+  <circle cx="12" cy="9" r="5" />
+  <line x1="12" y1="14" x2="12" y2="21" />
+  <line x1="9" y1="18" x2="15" y2="18" />
+</svg>
diff --git a/src/_icons/walk.svg b/src/_icons/walk.svg
new file mode 100644
index 000000000..52d8b6f36
--- /dev/null
+++ b/src/_icons/walk.svg
@@ -0,0 +1,9 @@
+---
+category: Sport
+---
+<svg>
+  <circle cx="13" cy="4" r="1" />
+  <line x1="7" y1="21" x2="10" y2="17" />
+  <path d="M16 21l-2 -4l-3 -3l1 -6" />
+  <path d="M6 12l2 -3l4 -1l3 3l3 1" />
+</svg>