diff --git a/categories/currency.json b/categories/currency.json
deleted file mode 100644
index 0879774d1..000000000
--- a/categories/currency.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "../category.schema.json",
-  "title": "Currency",
-  "icon": "dollar-sign"
-}
diff --git a/categories/money.json b/categories/finance.json
similarity index 75%
rename from categories/money.json
rename to categories/finance.json
index fd706dee5..267643671 100644
--- a/categories/money.json
+++ b/categories/finance.json
@@ -1,5 +1,5 @@
 {
   "$schema": "../category.schema.json",
-  "title": "Money",
+  "title": "Finance",
   "icon": "piggy-bank"
 }
diff --git a/categories/furniture.json b/categories/furniture.json
deleted file mode 100644
index 56cf3fa30..000000000
--- a/categories/furniture.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "../category.schema.json",
-  "title": "Furniture",
-  "icon": "rocking-chair"
-}
diff --git a/categories/maps.json b/categories/maps.json
deleted file mode 100644
index 1a948f119..000000000
--- a/categories/maps.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "../category.schema.json",
-  "title": "Maps",
-  "icon": "map"
-}
diff --git a/categories/maths.json b/categories/math.json
similarity index 70%
rename from categories/maths.json
rename to categories/math.json
index f80691908..1ae72ad9e 100644
--- a/categories/maths.json
+++ b/categories/math.json
@@ -1,5 +1,5 @@
 {
   "$schema": "../category.schema.json",
-  "title": "Maths",
+  "title": "Mathematics",
   "icon": "divide"
 }
diff --git a/categories/notifications.json b/categories/notifications.json
index 8ef569fd0..c2a729bec 100644
--- a/categories/notifications.json
+++ b/categories/notifications.json
@@ -1,5 +1,5 @@
 {
   "$schema": "../category.schema.json",
-  "title": "Notifications",
+  "title": "Notification",
   "icon": "triangle-alert"
 }
diff --git a/docs/.vitepress/data/categoriesData.json b/docs/.vitepress/data/categoriesData.json
index 03712cc23..0c112d82f 100644
--- a/docs/.vitepress/data/categoriesData.json
+++ b/docs/.vitepress/data/categoriesData.json
@@ -35,10 +35,6 @@
     "name": "connectivity",
     "title": "Connectivity"
   },
-  {
-    "name": "currency",
-    "title": "Currency"
-  },
   {
     "name": "cursors",
     "title": "Cursors"
@@ -64,12 +60,12 @@
     "title": "File icons"
   },
   {
-    "name": "food-beverage",
-    "title": "Food & beverage"
+    "name": "finance",
+    "title": "Money"
   },
   {
-    "name": "furniture",
-    "title": "Furniture"
+    "name": "food-beverage",
+    "title": "Food & beverage"
   },
   {
     "name": "gaming",
@@ -88,21 +84,13 @@
     "title": "Mail"
   },
   {
-    "name": "maps",
-    "title": "Maps"
-  },
-  {
-    "name": "maths",
-    "title": "Maths"
+    "name": "math",
+    "title": "Math"
   },
   {
     "name": "medical",
     "title": "Medical"
   },
-  {
-    "name": "money",
-    "title": "Money"
-  },
   {
     "name": "multimedia",
     "title": "Multimedia"
@@ -117,7 +105,7 @@
   },
   {
     "name": "notifications",
-    "title": "Notifications"
+    "title": "Notification"
   },
   {
     "name": "people",
diff --git a/icon.schema.json b/icon.schema.json
index 2e3fd3500..0a9e8c6b0 100644
--- a/icon.schema.json
+++ b/icon.schema.json
@@ -64,23 +64,20 @@
           "charts",
           "communication",
           "connectivity",
-          "currency",
           "cursors",
           "design",
           "development",
           "devices",
           "emoji",
           "files",
+          "finance",
           "food-beverage",
-          "furniture",
           "gaming",
           "home",
           "layout",
           "mail",
-          "maps",
-          "maths",
+          "math",
           "medical",
-          "money",
           "multimedia",
           "nature",
           "navigation",
diff --git a/icons/anchor.json b/icons/anchor.json
index acfbdb57a..49fe6bb19 100644
--- a/icons/anchor.json
+++ b/icons/anchor.json
@@ -10,7 +10,6 @@
   ],
   "categories": [
     "transportation",
-    "text",
-    "maps"
+    "text"
   ]
 }
diff --git a/icons/armchair.json b/icons/armchair.json
index 9ebdf13c6..379b8a116 100644
--- a/icons/armchair.json
+++ b/icons/armchair.json
@@ -13,6 +13,6 @@
     "couch"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/arrow-down-to-dot.json b/icons/arrow-down-to-dot.json
index 465d7afcb..b0c0d1112 100644
--- a/icons/arrow-down-to-dot.json
+++ b/icons/arrow-down-to-dot.json
@@ -13,7 +13,6 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/arrow-up-from-dot.json b/icons/arrow-up-from-dot.json
index 0b3ff50e1..788517778 100644
--- a/icons/arrow-up-from-dot.json
+++ b/icons/arrow-up-from-dot.json
@@ -11,7 +11,6 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/asterisk.json b/icons/asterisk.json
index f099fa79f..79b4151e6 100644
--- a/icons/asterisk.json
+++ b/icons/asterisk.json
@@ -17,7 +17,7 @@
   ],
   "categories": [
     "text",
-    "maths",
+    "math",
     "development"
   ]
 }
diff --git a/icons/badge-alert.json b/icons/badge-alert.json
index 043186d15..9681ecd46 100644
--- a/icons/badge-alert.json
+++ b/icons/badge-alert.json
@@ -14,7 +14,6 @@
   ],
   "categories": [
     "account",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-cent.json b/icons/badge-cent.json
index 981488ef3..720d0aee9 100644
--- a/icons/badge-cent.json
+++ b/icons/badge-cent.json
@@ -24,9 +24,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-check.json b/icons/badge-check.json
index 09018aaec..1cd05ca39 100644
--- a/icons/badge-check.json
+++ b/icons/badge-check.json
@@ -12,8 +12,6 @@
     "check"
   ],
   "categories": [
-    "account",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-dollar-sign.json b/icons/badge-dollar-sign.json
index 67949367f..5dc732382 100644
--- a/icons/badge-dollar-sign.json
+++ b/icons/badge-dollar-sign.json
@@ -22,9 +22,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-euro.json b/icons/badge-euro.json
index 96599207b..4d2cdd70e 100644
--- a/icons/badge-euro.json
+++ b/icons/badge-euro.json
@@ -20,9 +20,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-help.json b/icons/badge-help.json
index e462ef373..53ff2695c 100644
--- a/icons/badge-help.json
+++ b/icons/badge-help.json
@@ -10,9 +10,7 @@
     "help"
   ],
   "categories": [
-    "account",
     "accessibility",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-indian-rupee.json b/icons/badge-indian-rupee.json
index c5c4ba778..36f55ab24 100644
--- a/icons/badge-indian-rupee.json
+++ b/icons/badge-indian-rupee.json
@@ -21,9 +21,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-info.json b/icons/badge-info.json
index e462ef373..3a86435b5 100644
--- a/icons/badge-info.json
+++ b/icons/badge-info.json
@@ -12,7 +12,6 @@
   "categories": [
     "account",
     "accessibility",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-japanese-yen.json b/icons/badge-japanese-yen.json
index 2fc678b96..471c03572 100644
--- a/icons/badge-japanese-yen.json
+++ b/icons/badge-japanese-yen.json
@@ -21,9 +21,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-minus.json b/icons/badge-minus.json
index 80522be09..11358485a 100644
--- a/icons/badge-minus.json
+++ b/icons/badge-minus.json
@@ -12,8 +12,6 @@
     "erase"
   ],
   "categories": [
-    "account",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-percent.json b/icons/badge-percent.json
index 2529c91d9..e8de44c6e 100644
--- a/icons/badge-percent.json
+++ b/icons/badge-percent.json
@@ -15,11 +15,9 @@
     "price tag"
   ],
   "categories": [
-    "account",
     "social",
-    "money",
+    "finance",
     "shopping",
-    "maths",
-    "shapes"
+    "math"
   ]
 }
diff --git a/icons/badge-plus.json b/icons/badge-plus.json
index d3f182f8d..bb178b961 100644
--- a/icons/badge-plus.json
+++ b/icons/badge-plus.json
@@ -12,8 +12,6 @@
     "new"
   ],
   "categories": [
-    "account",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/badge-pound-sterling.json b/icons/badge-pound-sterling.json
index 5fd90f576..1aa80f8e9 100644
--- a/icons/badge-pound-sterling.json
+++ b/icons/badge-pound-sterling.json
@@ -22,9 +22,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-russian-ruble.json b/icons/badge-russian-ruble.json
index 278f331a6..811dc0f33 100644
--- a/icons/badge-russian-ruble.json
+++ b/icons/badge-russian-ruble.json
@@ -21,9 +21,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-swiss-franc.json b/icons/badge-swiss-franc.json
index cac722e0f..a87a9fa72 100644
--- a/icons/badge-swiss-franc.json
+++ b/icons/badge-swiss-franc.json
@@ -21,9 +21,6 @@
   ],
   "categories": [
     "shopping",
-    "money",
-    "currency",
-    "account",
-    "shapes"
+    "finance"
   ]
 }
diff --git a/icons/badge-x.json b/icons/badge-x.json
index bd0cb6cad..994e4f965 100644
--- a/icons/badge-x.json
+++ b/icons/badge-x.json
@@ -12,8 +12,6 @@
     "remove"
   ],
   "categories": [
-    "account",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/banknote.json b/icons/banknote.json
index 18aa12075..7cea7dd72 100644
--- a/icons/banknote.json
+++ b/icons/banknote.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/bed-double.json b/icons/bed-double.json
index 501871408..5e42b3487 100644
--- a/icons/bed-double.json
+++ b/icons/bed-double.json
@@ -10,6 +10,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/bed-single.json b/icons/bed-single.json
index 501871408..5e42b3487 100644
--- a/icons/bed-single.json
+++ b/icons/bed-single.json
@@ -10,6 +10,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/bed.json b/icons/bed.json
index 501871408..5e42b3487 100644
--- a/icons/bed.json
+++ b/icons/bed.json
@@ -10,6 +10,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/between-horizontal-end.json b/icons/between-horizontal-end.json
index 3421ae714..a6472a92d 100644
--- a/icons/between-horizontal-end.json
+++ b/icons/between-horizontal-end.json
@@ -29,8 +29,7 @@
   "categories": [
     "layout",
     "design",
-    "tools",
-    "account"
+    "tools"
   ],
   "aliases": [
     {
diff --git a/icons/between-horizontal-start.json b/icons/between-horizontal-start.json
index c71070506..6fd713043 100644
--- a/icons/between-horizontal-start.json
+++ b/icons/between-horizontal-start.json
@@ -29,8 +29,7 @@
   "categories": [
     "layout",
     "design",
-    "tools",
-    "account"
+    "tools"
   ],
   "aliases": [
     {
diff --git a/icons/binoculars.json b/icons/binoculars.json
index f568c545e..247977c87 100644
--- a/icons/binoculars.json
+++ b/icons/binoculars.json
@@ -24,7 +24,7 @@
     "research"
   ],
   "categories": [
-    "maps",
+    "navigation",
     "nature",
     "photography",
     "science",
diff --git a/icons/bitcoin.json b/icons/bitcoin.json
index 9aa218b57..6c94334ea 100644
--- a/icons/bitcoin.json
+++ b/icons/bitcoin.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "brands",
-    "currency",
     "development",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/bolt.json b/icons/bolt.json
index 3bfebd88e..c5e142722 100644
--- a/icons/bolt.json
+++ b/icons/bolt.json
@@ -18,7 +18,6 @@
     "parts"
   ],
   "categories": [
-    "account",
     "tools",
     "home"
   ]
diff --git a/icons/book-a.json b/icons/book-a.json
index 48425c496..f2ef6c309 100644
--- a/icons/book-a.json
+++ b/icons/book-a.json
@@ -45,7 +45,6 @@
   ],
   "categories": [
     "text",
-    "maps",
     "gaming"
   ]
 }
diff --git a/icons/book-heart.json b/icons/book-heart.json
index 38b960d61..4de1b0000 100644
--- a/icons/book-heart.json
+++ b/icons/book-heart.json
@@ -41,7 +41,6 @@
   "categories": [
     "social",
     "text",
-    "communication",
     "gaming"
   ]
 }
diff --git a/icons/book-text.json b/icons/book-text.json
index 2a720572e..1f3955940 100644
--- a/icons/book-text.json
+++ b/icons/book-text.json
@@ -35,7 +35,6 @@
   ],
   "categories": [
     "text",
-    "development",
     "gaming"
   ]
 }
diff --git a/icons/book-x.json b/icons/book-x.json
index 659294ac4..8c30a096c 100644
--- a/icons/book-x.json
+++ b/icons/book-x.json
@@ -31,7 +31,6 @@
     "unlearn"
   ],
   "categories": [
-    "development",
     "text",
     "gaming"
   ]
diff --git a/icons/box.json b/icons/box.json
index cf15e41b9..8d485ad42 100644
--- a/icons/box.json
+++ b/icons/box.json
@@ -19,6 +19,6 @@
     "shapes",
     "gaming",
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/calculator.json b/icons/calculator.json
index 4805f427c..6f5ad610b 100644
--- a/icons/calculator.json
+++ b/icons/calculator.json
@@ -9,7 +9,7 @@
     "calculating machine"
   ],
   "categories": [
-    "maths",
+    "math",
     "devices"
   ]
 }
diff --git a/icons/castle.json b/icons/castle.json
index 12191f4a3..9dcf26f95 100644
--- a/icons/castle.json
+++ b/icons/castle.json
@@ -12,7 +12,6 @@
   ],
   "categories": [
     "buildings",
-    "gaming",
-    "maps"
+    "gaming"
   ]
 }
diff --git a/icons/chart-candlestick.json b/icons/chart-candlestick.json
index 97eabbbe9..b8dbbf5bf 100644
--- a/icons/chart-candlestick.json
+++ b/icons/chart-candlestick.json
@@ -16,6 +16,7 @@
     "commodities",
     "currencies",
     "currency",
+    "stocks",
     "exchange",
     "hedge fund",
     "statistics",
@@ -25,7 +26,7 @@
   ],
   "categories": [
     "charts",
-    "money"
+    "finance"
   ],
   "aliases": [
     {
diff --git a/icons/chevron-right.json b/icons/chevron-right.json
index 33faf78ce..c070b3f37 100644
--- a/icons/chevron-right.json
+++ b/icons/chevron-right.json
@@ -20,7 +20,7 @@
   "categories": [
     "arrows",
     "navigation",
-    "maths",
+    "math",
     "development"
   ]
 }
diff --git a/icons/chevron-up.json b/icons/chevron-up.json
index 6cad0aa70..475719a6a 100644
--- a/icons/chevron-up.json
+++ b/icons/chevron-up.json
@@ -20,7 +20,7 @@
   "categories": [
     "arrows",
     "navigation",
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/church.json b/icons/church.json
index ff2ed68ab..94d0bd9b8 100644
--- a/icons/church.json
+++ b/icons/church.json
@@ -10,6 +10,6 @@
   ],
   "categories": [
     "buildings",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/circle-alert.json b/icons/circle-alert.json
index 727d171e7..98ddb988c 100644
--- a/icons/circle-alert.json
+++ b/icons/circle-alert.json
@@ -11,8 +11,7 @@
     "exclamation mark"
   ],
   "categories": [
-    "notifications",
-    "shapes"
+    "notifications"
   ],
   "aliases": [
     "alert-circle"
diff --git a/icons/circle-arrow-down.json b/icons/circle-arrow-down.json
index e3ba44ed4..b832900a0 100644
--- a/icons/circle-arrow-down.json
+++ b/icons/circle-arrow-down.json
@@ -15,7 +15,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/circle-arrow-left.json b/icons/circle-arrow-left.json
index f9457a921..034c90e03 100644
--- a/icons/circle-arrow-left.json
+++ b/icons/circle-arrow-left.json
@@ -17,7 +17,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/circle-arrow-out-down-left.json b/icons/circle-arrow-out-down-left.json
index 59c9d0850..d851ac2f1 100644
--- a/icons/circle-arrow-out-down-left.json
+++ b/icons/circle-arrow-out-down-left.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "arrow-down-left-from-circle"
diff --git a/icons/circle-arrow-out-down-right.json b/icons/circle-arrow-out-down-right.json
index fbc6c55d3..7499fa5cc 100644
--- a/icons/circle-arrow-out-down-right.json
+++ b/icons/circle-arrow-out-down-right.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "arrow-down-right-from-circle"
diff --git a/icons/circle-arrow-out-up-left.json b/icons/circle-arrow-out-up-left.json
index 458a54ecf..7d6b8f553 100644
--- a/icons/circle-arrow-out-up-left.json
+++ b/icons/circle-arrow-out-up-left.json
@@ -15,7 +15,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "maps",
     "development"
   ],
   "aliases": [
diff --git a/icons/circle-arrow-out-up-right.json b/icons/circle-arrow-out-up-right.json
index 187587626..8333bc338 100644
--- a/icons/circle-arrow-out-up-right.json
+++ b/icons/circle-arrow-out-up-right.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "arrow-up-right-from-circle"
diff --git a/icons/circle-arrow-right.json b/icons/circle-arrow-right.json
index c52cf3059..0da418c5f 100644
--- a/icons/circle-arrow-right.json
+++ b/icons/circle-arrow-right.json
@@ -17,7 +17,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/circle-arrow-up.json b/icons/circle-arrow-up.json
index c14b890d9..4fafbc31c 100644
--- a/icons/circle-arrow-up.json
+++ b/icons/circle-arrow-up.json
@@ -14,7 +14,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/circle-check-big.json b/icons/circle-check-big.json
index 229b9a7f6..c78f658bb 100644
--- a/icons/circle-check-big.json
+++ b/icons/circle-check-big.json
@@ -14,8 +14,7 @@
     "task"
   ],
   "categories": [
-    "notifications",
-    "shapes"
+    "notifications"
   ],
   "aliases": [
     "check-circle"
diff --git a/icons/circle-check.json b/icons/circle-check.json
index 118dea332..491bce0a1 100644
--- a/icons/circle-check.json
+++ b/icons/circle-check.json
@@ -12,8 +12,7 @@
     "task"
   ],
   "categories": [
-    "notifications",
-    "shapes"
+    "notifications"
   ],
   "aliases": [
     "check-circle-2"
diff --git a/icons/circle-chevron-down.json b/icons/circle-chevron-down.json
index f4042390a..32fe85754 100644
--- a/icons/circle-chevron-down.json
+++ b/icons/circle-chevron-down.json
@@ -10,8 +10,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-down-circle"
diff --git a/icons/circle-chevron-left.json b/icons/circle-chevron-left.json
index 6a7b17a12..c910113d5 100644
--- a/icons/circle-chevron-left.json
+++ b/icons/circle-chevron-left.json
@@ -13,8 +13,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-left-circle"
diff --git a/icons/circle-chevron-right.json b/icons/circle-chevron-right.json
index b258d90c9..d42e119cd 100644
--- a/icons/circle-chevron-right.json
+++ b/icons/circle-chevron-right.json
@@ -12,8 +12,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-right-circle"
diff --git a/icons/circle-chevron-up.json b/icons/circle-chevron-up.json
index f57466021..94e0e77aa 100644
--- a/icons/circle-chevron-up.json
+++ b/icons/circle-chevron-up.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-up-circle"
diff --git a/icons/circle-divide.json b/icons/circle-divide.json
index 2460a4553..7a2b1957e 100644
--- a/icons/circle-divide.json
+++ b/icons/circle-divide.json
@@ -6,13 +6,12 @@
   ],
   "tags": [
     "calculate",
-    "maths",
+    "math",
     "÷",
     "/"
   ],
   "categories": [
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "divide-circle"
diff --git a/icons/circle-dollar-sign.json b/icons/circle-dollar-sign.json
index 04bb535db..8f36d7e81 100644
--- a/icons/circle-dollar-sign.json
+++ b/icons/circle-dollar-sign.json
@@ -12,8 +12,6 @@
     "payment"
   ],
   "categories": [
-    "shapes",
-    "money",
-    "currency"
+    "finance"
   ]
 }
diff --git a/icons/circle-ellipsis.json b/icons/circle-ellipsis.json
index fba7b7955..e3b1c4011 100644
--- a/icons/circle-ellipsis.json
+++ b/icons/circle-ellipsis.json
@@ -29,7 +29,6 @@
   ],
   "categories": [
     "layout",
-    "development",
-    "shapes"
+    "development"
   ]
 }
diff --git a/icons/circle-equal.json b/icons/circle-equal.json
index 900a5822b..b1e2969be 100644
--- a/icons/circle-equal.json
+++ b/icons/circle-equal.json
@@ -9,7 +9,6 @@
     "="
   ],
   "categories": [
-    "maths",
-    "shapes"
+    "math"
   ]
 }
diff --git a/icons/circle-fading-plus.json b/icons/circle-fading-plus.json
index 433abef7a..20cbe1ba9 100644
--- a/icons/circle-fading-plus.json
+++ b/icons/circle-fading-plus.json
@@ -16,7 +16,6 @@
   ],
   "categories": [
     "communication",
-    "social",
-    "shapes"
+    "social"
   ]
 }
diff --git a/icons/circle-gauge.json b/icons/circle-gauge.json
index e947d79ce..2a8ff4dfa 100644
--- a/icons/circle-gauge.json
+++ b/icons/circle-gauge.json
@@ -13,7 +13,6 @@
     "level"
   ],
   "categories": [
-    "account",
     "transportation",
     "sports",
     "science"
diff --git a/icons/circle-help.json b/icons/circle-help.json
index e59f0effb..a49677a80 100644
--- a/icons/circle-help.json
+++ b/icons/circle-help.json
@@ -13,7 +13,6 @@
   "categories": [
     "accessibility",
     "text",
-    "shapes",
     "notifications"
   ],
   "aliases": [
diff --git a/icons/circle-minus.json b/icons/circle-minus.json
index 0a2f40576..a74838086 100644
--- a/icons/circle-minus.json
+++ b/icons/circle-minus.json
@@ -19,8 +19,7 @@
     "-"
   ],
   "categories": [
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "minus-circle"
diff --git a/icons/circle-parking-off.json b/icons/circle-parking-off.json
index b29a34dad..d1190afc5 100644
--- a/icons/circle-parking-off.json
+++ b/icons/circle-parking-off.json
@@ -12,7 +12,7 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "parking-circle-off"
diff --git a/icons/circle-parking.json b/icons/circle-parking.json
index 36f28a289..c015e096e 100644
--- a/icons/circle-parking.json
+++ b/icons/circle-parking.json
@@ -10,7 +10,7 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "parking-circle"
diff --git a/icons/circle-pause.json b/icons/circle-pause.json
index 2c586e6ee..2cc44e2d7 100644
--- a/icons/circle-pause.json
+++ b/icons/circle-pause.json
@@ -10,8 +10,7 @@
     "stop"
   ],
   "categories": [
-    "multimedia",
-    "shapes"
+    "multimedia"
   ],
   "aliases": [
     "pause-circle"
diff --git a/icons/circle-percent.json b/icons/circle-percent.json
index 0cf652fd4..884eb1fab 100644
--- a/icons/circle-percent.json
+++ b/icons/circle-percent.json
@@ -14,12 +14,10 @@
     "price tag"
   ],
   "categories": [
-    "account",
     "social",
-    "money",
+    "finance",
     "shopping",
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "percent-circle"
diff --git a/icons/circle-play.json b/icons/circle-play.json
index 8b9f5031f..e0fd5c2f3 100644
--- a/icons/circle-play.json
+++ b/icons/circle-play.json
@@ -9,7 +9,6 @@
     "run"
   ],
   "categories": [
-    "shapes",
     "multimedia"
   ],
   "aliases": [
diff --git a/icons/circle-plus.json b/icons/circle-plus.json
index a9e7e60b4..0d3d8f09a 100644
--- a/icons/circle-plus.json
+++ b/icons/circle-plus.json
@@ -28,9 +28,8 @@
     "+"
   ],
   "categories": [
-    "maths",
+    "math",
     "development",
-    "shapes",
     "cursors",
     "gaming"
   ],
diff --git a/icons/circle-slash-2.json b/icons/circle-slash-2.json
index a021fdd97..001278b6f 100644
--- a/icons/circle-slash-2.json
+++ b/icons/circle-slash-2.json
@@ -11,7 +11,7 @@
     "null",
     "void",
     "ban",
-    "maths",
+    "math",
     "divide",
     "division",
     "half",
@@ -20,7 +20,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "development"
   ],
   "aliases": [
diff --git a/icons/circle-slash.json b/icons/circle-slash.json
index afd07abae..2f2c541ce 100644
--- a/icons/circle-slash.json
+++ b/icons/circle-slash.json
@@ -27,8 +27,7 @@
     "/"
   ],
   "categories": [
-    "shapes",
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/circle-stop.json b/icons/circle-stop.json
index ffe08c780..191e098d3 100644
--- a/icons/circle-stop.json
+++ b/icons/circle-stop.json
@@ -9,8 +9,7 @@
     "music"
   ],
   "categories": [
-    "multimedia",
-    "shapes"
+    "multimedia"
   ],
   "aliases": [
     "stop-circle"
diff --git a/icons/circle-user-round.json b/icons/circle-user-round.json
index 207d5f91e..0074d26b1 100644
--- a/icons/circle-user-round.json
+++ b/icons/circle-user-round.json
@@ -9,8 +9,7 @@
     "contact"
   ],
   "categories": [
-    "account",
-    "shapes"
+    "account"
   ],
   "aliases": [
     {
diff --git a/icons/circle-user.json b/icons/circle-user.json
index 2187471de..d1eedee41 100644
--- a/icons/circle-user.json
+++ b/icons/circle-user.json
@@ -9,8 +9,7 @@
     "contact"
   ],
   "categories": [
-    "account",
-    "shapes"
+    "account"
   ],
   "aliases": [
     "user-circle"
diff --git a/icons/circle-x.json b/icons/circle-x.json
index fb618e9bf..2e593b728 100644
--- a/icons/circle-x.json
+++ b/icons/circle-x.json
@@ -21,8 +21,7 @@
     "multiplication"
   ],
   "categories": [
-    "maths",
-    "shapes",
+    "math",
     "development"
   ],
   "aliases": [
diff --git a/icons/clipboard-pen-line.json b/icons/clipboard-pen-line.json
index 2fb6486da..834752ea4 100644
--- a/icons/clipboard-pen-line.json
+++ b/icons/clipboard-pen-line.json
@@ -8,8 +8,7 @@
     "paste"
   ],
   "categories": [
-    "text",
-    "account"
+    "text"
   ],
   "aliases": [
     "clipboard-signature"
diff --git a/icons/coins.json b/icons/coins.json
index 7e46ed743..f15a7734e 100644
--- a/icons/coins.json
+++ b/icons/coins.json
@@ -12,7 +12,6 @@
     "gamble"
   ],
   "categories": [
-    "money",
     "gaming"
   ]
 }
diff --git a/icons/combine.json b/icons/combine.json
index 33c8e8993..003ace263 100644
--- a/icons/combine.json
+++ b/icons/combine.json
@@ -17,7 +17,6 @@
     "merge"
   ],
   "categories": [
-    "shapes",
     "development",
     "files"
   ]
diff --git a/icons/compass.json b/icons/compass.json
index a5891a774..dfeb579f2 100644
--- a/icons/compass.json
+++ b/icons/compass.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "navigation",
-    "maps",
     "travel"
   ]
 }
diff --git a/icons/cone.json b/icons/cone.json
index db7653e23..19bf8a2c3 100644
--- a/icons/cone.json
+++ b/icons/cone.json
@@ -17,6 +17,6 @@
   ],
   "categories": [
     "shapes",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/copy-minus.json b/icons/copy-minus.json
index 381e3f933..f9129f748 100644
--- a/icons/copy-minus.json
+++ b/icons/copy-minus.json
@@ -16,6 +16,6 @@
   ],
   "categories": [
     "text",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/copy-plus.json b/icons/copy-plus.json
index 4cf0eef7b..93dfe4108 100644
--- a/icons/copy-plus.json
+++ b/icons/copy-plus.json
@@ -14,6 +14,6 @@
   ],
   "categories": [
     "text",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/copy-slash.json b/icons/copy-slash.json
index b2eee7b57..5bffab0d7 100644
--- a/icons/copy-slash.json
+++ b/icons/copy-slash.json
@@ -24,6 +24,6 @@
   "categories": [
     "text",
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/copy-x.json b/icons/copy-x.json
index 358818fc1..1a6d3989c 100644
--- a/icons/copy-x.json
+++ b/icons/copy-x.json
@@ -17,6 +17,6 @@
   ],
   "categories": [
     "notifications",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/credit-card.json b/icons/credit-card.json
index b0a3e0d51..f5ea81710 100644
--- a/icons/credit-card.json
+++ b/icons/credit-card.json
@@ -13,6 +13,6 @@
   ],
   "categories": [
     "account",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/cuboid.json b/icons/cuboid.json
index 1a67f0dac..6d7b48935 100644
--- a/icons/cuboid.json
+++ b/icons/cuboid.json
@@ -14,7 +14,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "buildings"
   ]
 }
diff --git a/icons/currency.json b/icons/currency.json
index 3a39571ba..055c602c9 100644
--- a/icons/currency.json
+++ b/icons/currency.json
@@ -9,7 +9,6 @@
     "money"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/cylinder.json b/icons/cylinder.json
index 3d9448124..54b05f5ba 100644
--- a/icons/cylinder.json
+++ b/icons/cylinder.json
@@ -15,6 +15,6 @@
   "categories": [
     "shapes",
     "design",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/diameter.json b/icons/diameter.json
index 5cbeb3fd0..f46bdcd6a 100644
--- a/icons/diameter.json
+++ b/icons/diameter.json
@@ -17,7 +17,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "design",
     "tools"
   ]
diff --git a/icons/diamond-minus.json b/icons/diamond-minus.json
index 0c74e1c1c..62fc5dea4 100644
--- a/icons/diamond-minus.json
+++ b/icons/diamond-minus.json
@@ -30,7 +30,6 @@
   ],
   "categories": [
     "multimedia",
-    "shapes",
     "photography",
     "tools",
     "devices"
diff --git a/icons/diamond-percent.json b/icons/diamond-percent.json
index b1a884d9a..dddd434cf 100644
--- a/icons/diamond-percent.json
+++ b/icons/diamond-percent.json
@@ -14,12 +14,10 @@
     "price tag"
   ],
   "categories": [
-    "account",
     "social",
-    "money",
+    "finance",
     "shopping",
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "percent-diamond"
diff --git a/icons/diamond-plus.json b/icons/diamond-plus.json
index c8a376441..2cc7c8acb 100644
--- a/icons/diamond-plus.json
+++ b/icons/diamond-plus.json
@@ -25,7 +25,6 @@
   ],
   "categories": [
     "multimedia",
-    "shapes",
     "photography",
     "tools",
     "devices"
diff --git a/icons/diff.json b/icons/diff.json
index 63da516da..18bf76909 100644
--- a/icons/diff.json
+++ b/icons/diff.json
@@ -11,7 +11,7 @@
     "plus",
     "minus",
     "plus-minus",
-    "maths"
+    "math"
   ],
   "categories": [
     "development",
diff --git a/icons/divide.json b/icons/divide.json
index 8dc734006..daa7eaeb5 100644
--- a/icons/divide.json
+++ b/icons/divide.json
@@ -6,7 +6,7 @@
   ],
   "tags": [
     "calculate",
-    "maths",
+    "math",
     "division",
     "operator",
     "code",
@@ -14,7 +14,7 @@
     "/"
   ],
   "categories": [
-    "maths",
+    "math",
     "development"
   ]
 }
diff --git a/icons/dollar-sign.json b/icons/dollar-sign.json
index 9d0a4469b..7023dd9b1 100644
--- a/icons/dollar-sign.json
+++ b/icons/dollar-sign.json
@@ -11,7 +11,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/door-closed.json b/icons/door-closed.json
index 9a213ac06..61f1bc6b7 100644
--- a/icons/door-closed.json
+++ b/icons/door-closed.json
@@ -16,7 +16,6 @@
   "categories": [
     "home",
     "travel",
-    "furniture",
     "security"
   ]
 }
diff --git a/icons/door-open.json b/icons/door-open.json
index 9a213ac06..61f1bc6b7 100644
--- a/icons/door-open.json
+++ b/icons/door-open.json
@@ -16,7 +16,6 @@
   "categories": [
     "home",
     "travel",
-    "furniture",
     "security"
   ]
 }
diff --git a/icons/drafting-compass.json b/icons/drafting-compass.json
index 9282f21fe..72be1249a 100644
--- a/icons/drafting-compass.json
+++ b/icons/drafting-compass.json
@@ -19,8 +19,7 @@
     "sketch"
   ],
   "categories": [
-    "shapes",
-    "maths",
+    "math",
     "design",
     "tools"
   ]
diff --git a/icons/dumbbell.json b/icons/dumbbell.json
index 742de0a7e..0401830b8 100644
--- a/icons/dumbbell.json
+++ b/icons/dumbbell.json
@@ -11,7 +11,7 @@
     "gym"
   ],
   "categories": [
-    "maps",
+    "navigation",
     "sports"
   ]
 }
diff --git a/icons/earth.json b/icons/earth.json
index 912094ba6..63e65c3cc 100644
--- a/icons/earth.json
+++ b/icons/earth.json
@@ -13,7 +13,6 @@
     "globe"
   ],
   "categories": [
-    "maps",
     "navigation"
   ],
   "aliases": [
diff --git a/icons/equal-approximately.json b/icons/equal-approximately.json
index e40a9d621..46b46f6a6 100644
--- a/icons/equal-approximately.json
+++ b/icons/equal-approximately.json
@@ -6,10 +6,10 @@
   "tags": [
     "about",
     "calculate",
-    "maths",
+    "math",
     "operater"
   ],
   "categories": [
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/equal-not.json b/icons/equal-not.json
index 354e984e9..0d7f784b5 100644
--- a/icons/equal-not.json
+++ b/icons/equal-not.json
@@ -6,13 +6,13 @@
   "tags": [
     "calculate",
     "off",
-    "maths",
+    "math",
     "operator",
     "code",
     "≠"
   ],
   "categories": [
-    "maths",
+    "math",
     "development"
   ]
 }
diff --git a/icons/equal.json b/icons/equal.json
index 4825a3705..7725d6234 100644
--- a/icons/equal.json
+++ b/icons/equal.json
@@ -5,14 +5,14 @@
   ],
   "tags": [
     "calculate",
-    "maths",
+    "math",
     "operator",
     "assignment",
     "code",
     "="
   ],
   "categories": [
-    "maths",
+    "math",
     "development"
   ]
 }
diff --git a/icons/euro.json b/icons/euro.json
index 18aa12075..7cea7dd72 100644
--- a/icons/euro.json
+++ b/icons/euro.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/facebook.json b/icons/facebook.json
index 36924c7c4..eda8d9580 100644
--- a/icons/facebook.json
+++ b/icons/facebook.json
@@ -13,7 +13,6 @@
     "social"
   ],
   "categories": [
-    "account",
     "social",
     "brands"
   ]
diff --git a/icons/ferris-wheel.json b/icons/ferris-wheel.json
index 3ce96913e..1aef5547a 100644
--- a/icons/ferris-wheel.json
+++ b/icons/ferris-wheel.json
@@ -14,6 +14,6 @@
     "funfair"
   ],
   "categories": [
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/file-user.json b/icons/file-user.json
index 621895310..80b5ac4d5 100644
--- a/icons/file-user.json
+++ b/icons/file-user.json
@@ -22,7 +22,6 @@
   ],
   "categories": [
     "account",
-    "communication",
     "files"
   ]
 }
diff --git a/icons/footprints.json b/icons/footprints.json
index 6ac82f7fb..6af87e7a5 100644
--- a/icons/footprints.json
+++ b/icons/footprints.json
@@ -12,6 +12,6 @@
     "shoe"
   ],
   "categories": [
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/fuel.json b/icons/fuel.json
index 789ccbfd2..74d97031f 100644
--- a/icons/fuel.json
+++ b/icons/fuel.json
@@ -12,6 +12,6 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/gauge.json b/icons/gauge.json
index 37960bf45..92f3fef39 100644
--- a/icons/gauge.json
+++ b/icons/gauge.json
@@ -16,7 +16,6 @@
     "level"
   ],
   "categories": [
-    "account",
     "transportation",
     "sports",
     "science"
diff --git a/icons/gavel.json b/icons/gavel.json
index 5969917d4..a1927d962 100644
--- a/icons/gavel.json
+++ b/icons/gavel.json
@@ -10,7 +10,7 @@
     "mallet"
   ],
   "categories": [
-    "maps",
+    "navigation",
     "tools"
   ]
 }
diff --git a/icons/gem.json b/icons/gem.json
index 6f575ca3f..3dc495d7a 100644
--- a/icons/gem.json
+++ b/icons/gem.json
@@ -21,7 +21,7 @@
   ],
   "categories": [
     "gaming",
-    "money",
-    "development"
+    "development",
+    "finance"
   ]
 }
diff --git a/icons/git-commit-horizontal.json b/icons/git-commit-horizontal.json
index 4b6fe54e1..ca38ab279 100644
--- a/icons/git-commit-horizontal.json
+++ b/icons/git-commit-horizontal.json
@@ -14,7 +14,6 @@
   ],
   "categories": [
     "development",
-    "maps",
     "navigation"
   ],
   "aliases": [
diff --git a/icons/git-commit-vertical.json b/icons/git-commit-vertical.json
index 1824dc525..166f2ed38 100644
--- a/icons/git-commit-vertical.json
+++ b/icons/git-commit-vertical.json
@@ -12,7 +12,6 @@
   ],
   "categories": [
     "development",
-    "maps",
     "navigation"
   ]
 }
diff --git a/icons/git-compare.json b/icons/git-compare.json
index 2373c155b..a005b7078 100644
--- a/icons/git-compare.json
+++ b/icons/git-compare.json
@@ -10,7 +10,6 @@
     "diff"
   ],
   "categories": [
-    "development",
-    "arrows"
+    "development"
   ]
 }
diff --git a/icons/git-pull-request-create.json b/icons/git-pull-request-create.json
index 1cf605a18..1bd4f9557 100644
--- a/icons/git-pull-request-create.json
+++ b/icons/git-pull-request-create.json
@@ -12,7 +12,6 @@
     "+"
   ],
   "categories": [
-    "development",
-    "arrows"
+    "development"
   ]
 }
diff --git a/icons/git-pull-request.json b/icons/git-pull-request.json
index 8e700ec8b..22b986137 100644
--- a/icons/git-pull-request.json
+++ b/icons/git-pull-request.json
@@ -11,7 +11,6 @@
     "open"
   ],
   "categories": [
-    "development",
-    "arrows"
+    "development"
   ]
 }
diff --git a/icons/globe.json b/icons/globe.json
index 12edf30f1..f8d742999 100644
--- a/icons/globe.json
+++ b/icons/globe.json
@@ -12,7 +12,6 @@
     "translate"
   ],
   "categories": [
-    "maps",
     "navigation"
   ]
 }
diff --git a/icons/graduation-cap.json b/icons/graduation-cap.json
index 41adb1ace..7e468a8dd 100644
--- a/icons/graduation-cap.json
+++ b/icons/graduation-cap.json
@@ -22,7 +22,6 @@
     "doctorate"
   ],
   "categories": [
-    "buildings",
-    "maps"
+    "buildings"
   ]
 }
diff --git a/icons/grid-2x2-check.json b/icons/grid-2x2-check.json
index 20348266c..b21de1893 100644
--- a/icons/grid-2x2-check.json
+++ b/icons/grid-2x2-check.json
@@ -25,8 +25,6 @@
   "categories": [
     "text",
     "layout",
-    "design",
-    "shapes",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/grid-2x2-plus.json b/icons/grid-2x2-plus.json
index c0fb6dddc..bbc29555e 100644
--- a/icons/grid-2x2-plus.json
+++ b/icons/grid-2x2-plus.json
@@ -26,9 +26,7 @@
   "categories": [
     "text",
     "layout",
-    "design",
-    "shapes",
-    "maths"
+    "math"
   ],
   "aliases": [
     "grid-2-x-2-plus"
diff --git a/icons/grid-2x2-x.json b/icons/grid-2x2-x.json
index 08b3b720d..951cdb632 100644
--- a/icons/grid-2x2-x.json
+++ b/icons/grid-2x2-x.json
@@ -25,8 +25,6 @@
   "categories": [
     "text",
     "layout",
-    "design",
-    "shapes",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/grid-2x2.json b/icons/grid-2x2.json
index 625f93bb6..5c65189dc 100644
--- a/icons/grid-2x2.json
+++ b/icons/grid-2x2.json
@@ -26,8 +26,7 @@
     "text",
     "layout",
     "design",
-    "shapes",
-    "maths"
+    "math"
   ],
   "aliases": [
     "grid-2-x-2"
diff --git a/icons/group.json b/icons/group.json
index 3ec35df6e..545eaee6d 100644
--- a/icons/group.json
+++ b/icons/group.json
@@ -14,7 +14,6 @@
     "dashed"
   ],
   "categories": [
-    "shapes",
     "files"
   ]
 }
diff --git a/icons/hand-coins.json b/icons/hand-coins.json
index 917250da2..76f3cea01 100644
--- a/icons/hand-coins.json
+++ b/icons/hand-coins.json
@@ -21,7 +21,7 @@
     "pennies"
   ],
   "categories": [
-    "money",
+    "finance",
     "account"
   ]
 }
diff --git a/icons/handshake.json b/icons/handshake.json
index 13454d16f..0ef310a4e 100644
--- a/icons/handshake.json
+++ b/icons/handshake.json
@@ -19,7 +19,7 @@
     "account",
     "social",
     "communication",
-    "money",
+    "finance",
     "security"
   ]
 }
diff --git a/icons/heading-1.json b/icons/heading-1.json
index b45bd7222..4f8272fdb 100644
--- a/icons/heading-1.json
+++ b/icons/heading-1.json
@@ -10,7 +10,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading-2.json b/icons/heading-2.json
index 9a0f35941..afb9627f0 100644
--- a/icons/heading-2.json
+++ b/icons/heading-2.json
@@ -10,7 +10,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading-3.json b/icons/heading-3.json
index 987659e3e..e5f8d2b0b 100644
--- a/icons/heading-3.json
+++ b/icons/heading-3.json
@@ -11,7 +11,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading-4.json b/icons/heading-4.json
index 582870e19..0a22618eb 100644
--- a/icons/heading-4.json
+++ b/icons/heading-4.json
@@ -11,7 +11,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading-5.json b/icons/heading-5.json
index 3ec5dedd5..e98292381 100644
--- a/icons/heading-5.json
+++ b/icons/heading-5.json
@@ -11,7 +11,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading-6.json b/icons/heading-6.json
index 8aed377e5..de18a94c3 100644
--- a/icons/heading-6.json
+++ b/icons/heading-6.json
@@ -10,7 +10,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/heading.json b/icons/heading.json
index b45bd7222..4f8272fdb 100644
--- a/icons/heading.json
+++ b/icons/heading.json
@@ -10,7 +10,6 @@
     "markdown"
   ],
   "categories": [
-    "text",
-    "development"
+    "text"
   ]
 }
diff --git a/icons/hospital.json b/icons/hospital.json
index 820455607..10ce2aed9 100644
--- a/icons/hospital.json
+++ b/icons/hospital.json
@@ -20,7 +20,7 @@
   "categories": [
     "medical",
     "buildings",
-    "maps",
+    "navigation",
     "travel"
   ]
 }
diff --git a/icons/hotel.json b/icons/hotel.json
index 25f3237b2..bd934518e 100644
--- a/icons/hotel.json
+++ b/icons/hotel.json
@@ -12,7 +12,7 @@
   ],
   "categories": [
     "buildings",
-    "maps",
+    "navigation",
     "travel"
   ]
 }
diff --git a/icons/house-plus.json b/icons/house-plus.json
index 773729568..95e6feb53 100644
--- a/icons/house-plus.json
+++ b/icons/house-plus.json
@@ -16,7 +16,6 @@
   ],
   "categories": [
     "buildings",
-    "account",
     "medical"
   ]
 }
diff --git a/icons/house.json b/icons/house.json
index 304ea8c5d..794a65f6b 100644
--- a/icons/house.json
+++ b/icons/house.json
@@ -12,7 +12,6 @@
     "architecture"
   ],
   "categories": [
-    "account",
     "buildings",
     "home"
   ],
diff --git a/icons/indian-rupee.json b/icons/indian-rupee.json
index 18aa12075..7cea7dd72 100644
--- a/icons/indian-rupee.json
+++ b/icons/indian-rupee.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/infinity.json b/icons/infinity.json
index 1c299d78e..9a9aff112 100644
--- a/icons/infinity.json
+++ b/icons/infinity.json
@@ -9,7 +9,7 @@
     "unlimited",
     "forever",
     "loop",
-    "maths"
+    "math"
   ],
   "categories": [
     "multimedia"
diff --git a/icons/japanese-yen.json b/icons/japanese-yen.json
index 6ff2de44e..9be4bb849 100644
--- a/icons/japanese-yen.json
+++ b/icons/japanese-yen.json
@@ -9,7 +9,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/lamp-ceiling.json b/icons/lamp-ceiling.json
index 9e6e3c14d..02798420b 100644
--- a/icons/lamp-ceiling.json
+++ b/icons/lamp-ceiling.json
@@ -11,6 +11,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/lamp-desk.json b/icons/lamp-desk.json
index 780bc4ce1..9df577bfc 100644
--- a/icons/lamp-desk.json
+++ b/icons/lamp-desk.json
@@ -13,6 +13,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/lamp-floor.json b/icons/lamp-floor.json
index c0a4035c9..50497f1d0 100644
--- a/icons/lamp-floor.json
+++ b/icons/lamp-floor.json
@@ -12,6 +12,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/lamp-wall-down.json b/icons/lamp-wall-down.json
index e36252ba2..ccd8cf429 100644
--- a/icons/lamp-wall-down.json
+++ b/icons/lamp-wall-down.json
@@ -12,6 +12,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/lamp-wall-up.json b/icons/lamp-wall-up.json
index e36252ba2..ccd8cf429 100644
--- a/icons/lamp-wall-up.json
+++ b/icons/lamp-wall-up.json
@@ -12,6 +12,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/lamp.json b/icons/lamp.json
index df2b0ff59..deba59caf 100644
--- a/icons/lamp.json
+++ b/icons/lamp.json
@@ -11,6 +11,6 @@
     "furniture"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/land-plot.json b/icons/land-plot.json
index bbe31aa10..aff947601 100644
--- a/icons/land-plot.json
+++ b/icons/land-plot.json
@@ -20,10 +20,9 @@
     "hole"
   ],
   "categories": [
-    "shapes",
     "design",
     "tools",
-    "maths",
+    "math",
     "sports",
     "gaming"
   ]
diff --git a/icons/landmark.json b/icons/landmark.json
index 494aa82b7..b02003605 100644
--- a/icons/landmark.json
+++ b/icons/landmark.json
@@ -9,11 +9,13 @@
     "building",
     "capitol",
     "finance",
-    "money"
+    "money",
+    "government",
+    "institution"
   ],
   "categories": [
-    "money",
-    "maps",
+    "finance",
+    "navigation",
     "buildings"
   ]
 }
diff --git a/icons/library-big.json b/icons/library-big.json
index 78381b0b8..05ee0b4a6 100644
--- a/icons/library-big.json
+++ b/icons/library-big.json
@@ -32,7 +32,7 @@
     "text",
     "photography",
     "multimedia",
-    "maps",
+    "navigation",
     "development"
   ]
 }
diff --git a/icons/library.json b/icons/library.json
index c70f1d2b0..2ca485d86 100644
--- a/icons/library.json
+++ b/icons/library.json
@@ -34,7 +34,7 @@
     "text",
     "photography",
     "multimedia",
-    "maps",
+    "navigation",
     "development"
   ]
 }
diff --git a/icons/linkedin.json b/icons/linkedin.json
index d51c83a95..1d2d920fb 100644
--- a/icons/linkedin.json
+++ b/icons/linkedin.json
@@ -14,7 +14,6 @@
     "social"
   ],
   "categories": [
-    "account",
     "social",
     "brands"
   ]
diff --git a/icons/locate-fixed.json b/icons/locate-fixed.json
index c24c3d4cf..62ae2353d 100644
--- a/icons/locate-fixed.json
+++ b/icons/locate-fixed.json
@@ -13,7 +13,6 @@
     "cross"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/locate-off.json b/icons/locate-off.json
index 619c05aeb..1b9f8d368 100644
--- a/icons/locate-off.json
+++ b/icons/locate-off.json
@@ -10,7 +10,6 @@
     "cross"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/locate.json b/icons/locate.json
index c979128a1..a1d8ad93a 100644
--- a/icons/locate.json
+++ b/icons/locate.json
@@ -12,7 +12,6 @@
     "cross"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/map-pin-check-inside.json b/icons/map-pin-check-inside.json
index 134f06214..defe1469f 100644
--- a/icons/map-pin-check-inside.json
+++ b/icons/map-pin-check-inside.json
@@ -18,7 +18,6 @@
     "added"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-check.json b/icons/map-pin-check.json
index 134f06214..defe1469f 100644
--- a/icons/map-pin-check.json
+++ b/icons/map-pin-check.json
@@ -18,7 +18,6 @@
     "added"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-house.json b/icons/map-pin-house.json
index d56dd2d9b..ae5824b38 100644
--- a/icons/map-pin-house.json
+++ b/icons/map-pin-house.json
@@ -27,7 +27,6 @@
     "landmark"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-minus-inside.json b/icons/map-pin-minus-inside.json
index 3f54224bd..aca46c986 100644
--- a/icons/map-pin-minus-inside.json
+++ b/icons/map-pin-minus-inside.json
@@ -16,7 +16,6 @@
     "erase"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-minus.json b/icons/map-pin-minus.json
index 3f54224bd..aca46c986 100644
--- a/icons/map-pin-minus.json
+++ b/icons/map-pin-minus.json
@@ -16,7 +16,6 @@
     "erase"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-off.json b/icons/map-pin-off.json
index 053b07fc1..65fef792c 100644
--- a/icons/map-pin-off.json
+++ b/icons/map-pin-off.json
@@ -11,7 +11,6 @@
     "remove"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel"
   ]
diff --git a/icons/map-pin-plus-inside.json b/icons/map-pin-plus-inside.json
index 61342f455..b6165edc6 100644
--- a/icons/map-pin-plus-inside.json
+++ b/icons/map-pin-plus-inside.json
@@ -16,7 +16,6 @@
     "new"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-plus.json b/icons/map-pin-plus.json
index 61342f455..b6165edc6 100644
--- a/icons/map-pin-plus.json
+++ b/icons/map-pin-plus.json
@@ -16,7 +16,6 @@
     "new"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-x-inside.json b/icons/map-pin-x-inside.json
index 3f54224bd..aca46c986 100644
--- a/icons/map-pin-x-inside.json
+++ b/icons/map-pin-x-inside.json
@@ -16,7 +16,6 @@
     "erase"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin-x.json b/icons/map-pin-x.json
index 3f54224bd..aca46c986 100644
--- a/icons/map-pin-x.json
+++ b/icons/map-pin-x.json
@@ -16,7 +16,6 @@
     "erase"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pin.json b/icons/map-pin.json
index 3ca79e634..71a8ac19f 100644
--- a/icons/map-pin.json
+++ b/icons/map-pin.json
@@ -13,7 +13,6 @@
     "drop"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map-pinned.json b/icons/map-pinned.json
index c56cb42ce..25a0846df 100644
--- a/icons/map-pinned.json
+++ b/icons/map-pinned.json
@@ -11,7 +11,6 @@
     "drop"
   ],
   "categories": [
-    "maps",
     "navigation",
     "travel",
     "account"
diff --git a/icons/map.json b/icons/map.json
index b14c066cb..a6537dbbc 100644
--- a/icons/map.json
+++ b/icons/map.json
@@ -12,6 +12,6 @@
   ],
   "categories": [
     "text",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/memory-stick.json b/icons/memory-stick.json
index 6a1acefca..8133cc3fd 100644
--- a/icons/memory-stick.json
+++ b/icons/memory-stick.json
@@ -18,7 +18,6 @@
   ],
   "categories": [
     "devices",
-    "development",
     "gaming"
   ]
 }
diff --git a/icons/message-circle-code.json b/icons/message-circle-code.json
index 927fec67a..4da7f86bf 100644
--- a/icons/message-circle-code.json
+++ b/icons/message-circle-code.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "development",
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-dashed.json b/icons/message-circle-dashed.json
index d3d68baab..610f41bd6 100644
--- a/icons/message-circle-dashed.json
+++ b/icons/message-circle-dashed.json
@@ -13,7 +13,6 @@
     "draft"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-more.json b/icons/message-circle-more.json
index ecec7b7db..ef33e38af 100644
--- a/icons/message-circle-more.json
+++ b/icons/message-circle-more.json
@@ -20,7 +20,6 @@
     "…"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-off.json b/icons/message-circle-off.json
index 7bfbe2aff..29f8b6d29 100644
--- a/icons/message-circle-off.json
+++ b/icons/message-circle-off.json
@@ -20,7 +20,6 @@
     "moderate"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-plus.json b/icons/message-circle-plus.json
index 7d07795e9..c93499d5e 100644
--- a/icons/message-circle-plus.json
+++ b/icons/message-circle-plus.json
@@ -13,7 +13,6 @@
     "add"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-question.json b/icons/message-circle-question.json
index 27fcbb748..03bb01554 100644
--- a/icons/message-circle-question.json
+++ b/icons/message-circle-question.json
@@ -13,7 +13,6 @@
     "help"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-reply.json b/icons/message-circle-reply.json
index da7fc0984..d49df99ac 100644
--- a/icons/message-circle-reply.json
+++ b/icons/message-circle-reply.json
@@ -14,7 +14,6 @@
     "response"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-circle-warning.json b/icons/message-circle-warning.json
index fb824cda0..0864fadb8 100644
--- a/icons/message-circle-warning.json
+++ b/icons/message-circle-warning.json
@@ -20,7 +20,6 @@
     "exclamation mark"
   ],
   "categories": [
-    "account",
     "social",
     "notifications"
   ]
diff --git a/icons/message-circle.json b/icons/message-circle.json
index 7bae92232..929d070d9 100644
--- a/icons/message-circle.json
+++ b/icons/message-circle.json
@@ -16,7 +16,6 @@
     "speech bubble"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-code.json b/icons/message-square-code.json
index 927fec67a..4da7f86bf 100644
--- a/icons/message-square-code.json
+++ b/icons/message-square-code.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "development",
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-dashed.json b/icons/message-square-dashed.json
index 8946199cd..cc8a0171a 100644
--- a/icons/message-square-dashed.json
+++ b/icons/message-square-dashed.json
@@ -14,7 +14,6 @@
     "draft"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-diff.json b/icons/message-square-diff.json
index de88101db..07dd5157e 100644
--- a/icons/message-square-diff.json
+++ b/icons/message-square-diff.json
@@ -16,7 +16,7 @@
     "plus",
     "minus",
     "plus-minus",
-    "maths",
+    "math",
     "code review",
     "coding",
     "version control",
@@ -25,7 +25,6 @@
   "categories": [
     "development",
     "files",
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-dot.json b/icons/message-square-dot.json
index b35d3dacc..d34835e97 100644
--- a/icons/message-square-dot.json
+++ b/icons/message-square-dot.json
@@ -14,7 +14,6 @@
     "speech bubble"
   ],
   "categories": [
-    "account",
     "social",
     "notifications"
   ]
diff --git a/icons/message-square-lock.json b/icons/message-square-lock.json
index 9174a7d5e..4dde5efe6 100644
--- a/icons/message-square-lock.json
+++ b/icons/message-square-lock.json
@@ -17,7 +17,6 @@
     "encrypted"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-more.json b/icons/message-square-more.json
index ecec7b7db..ef33e38af 100644
--- a/icons/message-square-more.json
+++ b/icons/message-square-more.json
@@ -20,7 +20,6 @@
     "…"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-off.json b/icons/message-square-off.json
index 7bfbe2aff..29f8b6d29 100644
--- a/icons/message-square-off.json
+++ b/icons/message-square-off.json
@@ -20,7 +20,6 @@
     "moderate"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-plus.json b/icons/message-square-plus.json
index 7d07795e9..c93499d5e 100644
--- a/icons/message-square-plus.json
+++ b/icons/message-square-plus.json
@@ -13,7 +13,6 @@
     "add"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-quote.json b/icons/message-square-quote.json
index 2c32f5eea..4ec7660da 100644
--- a/icons/message-square-quote.json
+++ b/icons/message-square-quote.json
@@ -17,7 +17,6 @@
     "response"
   ],
   "categories": [
-    "account",
     "social",
     "text"
   ]
diff --git a/icons/message-square-reply.json b/icons/message-square-reply.json
index da7fc0984..d49df99ac 100644
--- a/icons/message-square-reply.json
+++ b/icons/message-square-reply.json
@@ -14,7 +14,6 @@
     "response"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-share.json b/icons/message-square-share.json
index e7804db32..e4ebb57b8 100644
--- a/icons/message-square-share.json
+++ b/icons/message-square-share.json
@@ -14,7 +14,6 @@
     "forward"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-text.json b/icons/message-square-text.json
index 0dd02dd37..accc6b093 100644
--- a/icons/message-square-text.json
+++ b/icons/message-square-text.json
@@ -12,7 +12,6 @@
     "speech bubble"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square-warning.json b/icons/message-square-warning.json
index fb824cda0..0864fadb8 100644
--- a/icons/message-square-warning.json
+++ b/icons/message-square-warning.json
@@ -20,7 +20,6 @@
     "exclamation mark"
   ],
   "categories": [
-    "account",
     "social",
     "notifications"
   ]
diff --git a/icons/message-square-x.json b/icons/message-square-x.json
index 7bfbe2aff..29f8b6d29 100644
--- a/icons/message-square-x.json
+++ b/icons/message-square-x.json
@@ -20,7 +20,6 @@
     "moderate"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/message-square.json b/icons/message-square.json
index 252f2e407..6b4db95d4 100644
--- a/icons/message-square.json
+++ b/icons/message-square.json
@@ -14,7 +14,6 @@
     "speech bubble"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/messages-square.json b/icons/messages-square.json
index 2582e280d..6204d93b4 100644
--- a/icons/messages-square.json
+++ b/icons/messages-square.json
@@ -14,7 +14,6 @@
     "multiple"
   ],
   "categories": [
-    "account",
     "social"
   ]
 }
diff --git a/icons/minus.json b/icons/minus.json
index 8c6253dfa..9776701e8 100644
--- a/icons/minus.json
+++ b/icons/minus.json
@@ -29,10 +29,9 @@
     "downgrade"
   ],
   "categories": [
-    "maths",
+    "math",
     "development",
     "text",
-    "tools",
-    "shapes"
+    "tools"
   ]
 }
diff --git a/icons/monitor-check.json b/icons/monitor-check.json
index 32dd7042c..05dc4e4e4 100644
--- a/icons/monitor-check.json
+++ b/icons/monitor-check.json
@@ -17,7 +17,6 @@
   ],
   "categories": [
     "connectivity",
-    "devices",
-    "development"
+    "devices"
   ]
 }
diff --git a/icons/monitor-cog.json b/icons/monitor-cog.json
index 2408d53df..56efd964f 100644
--- a/icons/monitor-cog.json
+++ b/icons/monitor-cog.json
@@ -24,7 +24,6 @@
   ],
   "categories": [
     "connectivity",
-    "devices",
-    "development"
+    "devices"
   ]
 }
diff --git a/icons/monitor-dot.json b/icons/monitor-dot.json
index 32dd7042c..05dc4e4e4 100644
--- a/icons/monitor-dot.json
+++ b/icons/monitor-dot.json
@@ -17,7 +17,6 @@
   ],
   "categories": [
     "connectivity",
-    "devices",
-    "development"
+    "devices"
   ]
 }
diff --git a/icons/monitor-pause.json b/icons/monitor-pause.json
index 93de5b99a..47c551039 100644
--- a/icons/monitor-pause.json
+++ b/icons/monitor-pause.json
@@ -22,7 +22,6 @@
   "categories": [
     "connectivity",
     "devices",
-    "multimedia",
-    "development"
+    "multimedia"
   ]
 }
diff --git a/icons/monitor-play.json b/icons/monitor-play.json
index a4351fa99..a712495d4 100644
--- a/icons/monitor-play.json
+++ b/icons/monitor-play.json
@@ -22,7 +22,6 @@
   "categories": [
     "connectivity",
     "devices",
-    "multimedia",
-    "development"
+    "multimedia"
   ]
 }
diff --git a/icons/monitor-stop.json b/icons/monitor-stop.json
index eaee4b976..281aa804c 100644
--- a/icons/monitor-stop.json
+++ b/icons/monitor-stop.json
@@ -21,7 +21,6 @@
   "categories": [
     "connectivity",
     "devices",
-    "multimedia",
-    "development"
+    "multimedia"
   ]
 }
diff --git a/icons/monitor-x.json b/icons/monitor-x.json
index 5a09254ae..86ac8e20f 100644
--- a/icons/monitor-x.json
+++ b/icons/monitor-x.json
@@ -20,7 +20,6 @@
   ],
   "categories": [
     "connectivity",
-    "devices",
-    "development"
+    "devices"
   ]
 }
diff --git a/icons/monitor.json b/icons/monitor.json
index 8713be1a3..0084b9be2 100644
--- a/icons/monitor.json
+++ b/icons/monitor.json
@@ -16,7 +16,6 @@
   ],
   "categories": [
     "connectivity",
-    "devices",
-    "development"
+    "devices"
   ]
 }
diff --git a/icons/navigation-2-off.json b/icons/navigation-2-off.json
index e203d294e..b7036158e 100644
--- a/icons/navigation-2-off.json
+++ b/icons/navigation-2-off.json
@@ -9,7 +9,6 @@
     "travel"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/navigation-2.json b/icons/navigation-2.json
index eb8d3b5f3..d78835165 100644
--- a/icons/navigation-2.json
+++ b/icons/navigation-2.json
@@ -8,7 +8,6 @@
     "travel"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/navigation-off.json b/icons/navigation-off.json
index e203d294e..b7036158e 100644
--- a/icons/navigation-off.json
+++ b/icons/navigation-off.json
@@ -9,7 +9,6 @@
     "travel"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/navigation.json b/icons/navigation.json
index eb8d3b5f3..d78835165 100644
--- a/icons/navigation.json
+++ b/icons/navigation.json
@@ -8,7 +8,6 @@
     "travel"
   ],
   "categories": [
-    "navigation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/nfc.json b/icons/nfc.json
index a9ed27f8f..3c8ce4c07 100644
--- a/icons/nfc.json
+++ b/icons/nfc.json
@@ -12,7 +12,7 @@
   ],
   "categories": [
     "communication",
-    "money",
+    "finance",
     "devices"
   ]
 }
diff --git a/icons/notebook-tabs.json b/icons/notebook-tabs.json
index 45a03d67b..549cc8603 100644
--- a/icons/notebook-tabs.json
+++ b/icons/notebook-tabs.json
@@ -27,7 +27,6 @@
   ],
   "categories": [
     "account",
-    "connectivity",
     "communication",
     "social"
   ]
diff --git a/icons/octagon-x.json b/icons/octagon-x.json
index b4167acf7..f59ceaf42 100644
--- a/icons/octagon-x.json
+++ b/icons/octagon-x.json
@@ -11,11 +11,10 @@
     "warning",
     "times",
     "clear",
-    "maths"
+    "math"
   ],
   "categories": [
-    "maths",
-    "shapes",
+    "math",
     "notifications"
   ],
   "aliases": [
diff --git a/icons/omega.json b/icons/omega.json
index 5f0e4bc1a..7d3ed405e 100644
--- a/icons/omega.json
+++ b/icons/omega.json
@@ -19,7 +19,7 @@
     "philosophy"
   ],
   "categories": [
-    "maths",
+    "math",
     "development",
     "text",
     "science"
diff --git a/icons/origami.json b/icons/origami.json
index 9b8563839..817da4022 100644
--- a/icons/origami.json
+++ b/icons/origami.json
@@ -9,7 +9,6 @@
   ],
   "categories": [
     "animals",
-    "design",
-    "shapes"
+    "design"
   ]
 }
diff --git a/icons/panels-top-left.json b/icons/panels-top-left.json
index 3a9379429..82d718021 100644
--- a/icons/panels-top-left.json
+++ b/icons/panels-top-left.json
@@ -17,8 +17,7 @@
   "categories": [
     "layout",
     "design",
-    "development",
-    "charts"
+    "development"
   ],
   "aliases": [
     "layout"
diff --git a/icons/parentheses.json b/icons/parentheses.json
index f844c7806..d638732a1 100644
--- a/icons/parentheses.json
+++ b/icons/parentheses.json
@@ -15,7 +15,7 @@
     "args",
     "input",
     "call",
-    "maths",
+    "math",
     "formula",
     "function",
     "(",
@@ -24,6 +24,6 @@
   "categories": [
     "development",
     "files",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/parking-meter.json b/icons/parking-meter.json
index fd73f972c..732bfaa99 100644
--- a/icons/parking-meter.json
+++ b/icons/parking-meter.json
@@ -13,6 +13,6 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/percent.json b/icons/percent.json
index 291d964b4..3382a917f 100644
--- a/icons/percent.json
+++ b/icons/percent.json
@@ -16,9 +16,9 @@
     "marketing"
   ],
   "categories": [
-    "maths",
+    "math",
     "development",
-    "money",
+    "finance",
     "shopping"
   ]
 }
diff --git a/icons/philippine-peso.json b/icons/philippine-peso.json
index 6ade30144..ae8a8b15f 100644
--- a/icons/philippine-peso.json
+++ b/icons/philippine-peso.json
@@ -12,6 +12,6 @@
     "php"
   ],
   "categories": [
-    "currency"
+    "finance"
   ]
 }
diff --git a/icons/pi.json b/icons/pi.json
index 748fd6dd1..91d842acf 100644
--- a/icons/pi.json
+++ b/icons/pi.json
@@ -16,7 +16,6 @@
   ],
   "categories": [
     "development",
-    "maths",
-    "shapes"
+    "math"
   ]
 }
diff --git a/icons/pickaxe.json b/icons/pickaxe.json
index ea5c3cee4..0e2fe12ca 100644
--- a/icons/pickaxe.json
+++ b/icons/pickaxe.json
@@ -18,7 +18,6 @@
   ],
   "categories": [
     "tools",
-    "maps",
     "gaming"
   ]
 }
diff --git a/icons/piggy-bank.json b/icons/piggy-bank.json
index f4a549491..932725ecf 100644
--- a/icons/piggy-bank.json
+++ b/icons/piggy-bank.json
@@ -8,6 +8,6 @@
     "savings"
   ],
   "categories": [
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/pin-off.json b/icons/pin-off.json
index 228f4d75f..26a1bf76e 100644
--- a/icons/pin-off.json
+++ b/icons/pin-off.json
@@ -13,6 +13,6 @@
     "remove"
   ],
   "categories": [
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/pin.json b/icons/pin.json
index f253c24e5..be15ac2f3 100644
--- a/icons/pin.json
+++ b/icons/pin.json
@@ -12,7 +12,7 @@
     "fix"
   ],
   "categories": [
-    "maps",
+    "navigation",
     "account"
   ]
 }
diff --git a/icons/plus.json b/icons/plus.json
index 435362ec6..b6512d9f2 100644
--- a/icons/plus.json
+++ b/icons/plus.json
@@ -24,7 +24,7 @@
     "+"
   ],
   "categories": [
-    "maths",
+    "math",
     "tools",
     "development",
     "text",
diff --git a/icons/pocket.json b/icons/pocket.json
index 2889d865e..c0297adb3 100644
--- a/icons/pocket.json
+++ b/icons/pocket.json
@@ -13,7 +13,6 @@
     "save"
   ],
   "categories": [
-    "brands",
-    "development"
+    "brands"
   ]
 }
diff --git a/icons/pound-sterling.json b/icons/pound-sterling.json
index 18aa12075..7cea7dd72 100644
--- a/icons/pound-sterling.json
+++ b/icons/pound-sterling.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/printer-check.json b/icons/printer-check.json
index b672bfcb4..a467416b4 100644
--- a/icons/printer-check.json
+++ b/icons/printer-check.json
@@ -14,7 +14,6 @@
     "printed"
   ],
   "categories": [
-    "devices",
-    "account"
+    "devices"
   ]
 }
diff --git a/icons/printer.json b/icons/printer.json
index 3389414cc..9030e765f 100644
--- a/icons/printer.json
+++ b/icons/printer.json
@@ -11,7 +11,6 @@
     "device"
   ],
   "categories": [
-    "devices",
-    "account"
+    "devices"
   ]
 }
diff --git a/icons/pyramid.json b/icons/pyramid.json
index 4367598e3..fc5c4a488 100644
--- a/icons/pyramid.json
+++ b/icons/pyramid.json
@@ -18,7 +18,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "travel"
   ]
 }
diff --git a/icons/radar.json b/icons/radar.json
index 7b81fd7c6..f34c2dcc6 100644
--- a/icons/radar.json
+++ b/icons/radar.json
@@ -13,7 +13,6 @@
   ],
   "categories": [
     "navigation",
-    "maps",
     "security",
     "communication"
   ]
diff --git a/icons/radical.json b/icons/radical.json
index ecb34c30e..c3e7c2171 100644
--- a/icons/radical.json
+++ b/icons/radical.json
@@ -7,7 +7,7 @@
   "tags": [
     "calculate",
     "formula",
-    "maths",
+    "math",
     "operator",
     "root",
     "square",
@@ -15,6 +15,6 @@
   ],
   "categories": [
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/radius.json b/icons/radius.json
index a621b4ffd..9876ce6ee 100644
--- a/icons/radius.json
+++ b/icons/radius.json
@@ -16,7 +16,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "design",
     "tools"
   ]
diff --git a/icons/rail-symbol.json b/icons/rail-symbol.json
index b2aa5d3b8..096bfbdab 100644
--- a/icons/rail-symbol.json
+++ b/icons/rail-symbol.json
@@ -11,6 +11,6 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/ratio.json b/icons/ratio.json
index f1b338af1..89f00fcbf 100644
--- a/icons/ratio.json
+++ b/icons/ratio.json
@@ -27,8 +27,6 @@
   "categories": [
     "layout",
     "design",
-    "photography",
-    "devices",
-    "connectivity"
+    "photography"
   ]
 }
diff --git a/icons/receipt-cent.json b/icons/receipt-cent.json
index 202a9f360..a7ffe0aa5 100644
--- a/icons/receipt-cent.json
+++ b/icons/receipt-cent.json
@@ -17,8 +17,7 @@
     "¢"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-euro.json b/icons/receipt-euro.json
index 5638862c3..00b7c8522 100644
--- a/icons/receipt-euro.json
+++ b/icons/receipt-euro.json
@@ -13,8 +13,7 @@
     "€"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-indian-rupee.json b/icons/receipt-indian-rupee.json
index 372049be8..f050782f9 100644
--- a/icons/receipt-indian-rupee.json
+++ b/icons/receipt-indian-rupee.json
@@ -9,12 +9,12 @@
     "slip",
     "check",
     "counterfoil",
+    "currency",
     "inr",
     "₹"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-japanese-yen.json b/icons/receipt-japanese-yen.json
index e2ada4d18..d474e1397 100644
--- a/icons/receipt-japanese-yen.json
+++ b/icons/receipt-japanese-yen.json
@@ -11,12 +11,12 @@
     "slip",
     "check",
     "counterfoil",
+    "currency",
     "jpy",
     "¥"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-pound-sterling.json b/icons/receipt-pound-sterling.json
index 1f171f35d..4a6de8034 100644
--- a/icons/receipt-pound-sterling.json
+++ b/icons/receipt-pound-sterling.json
@@ -10,12 +10,12 @@
     "check",
     "counterfoil",
     "british",
+    "currency",
     "gbp",
     "£"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-russian-ruble.json b/icons/receipt-russian-ruble.json
index f12c4cd5e..6a1c5b627 100644
--- a/icons/receipt-russian-ruble.json
+++ b/icons/receipt-russian-ruble.json
@@ -9,12 +9,12 @@
     "slip",
     "check",
     "counterfoil",
+    "currency",
     "rub",
     "₽"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-swiss-franc.json b/icons/receipt-swiss-franc.json
index aba9b0095..2d08836e9 100644
--- a/icons/receipt-swiss-franc.json
+++ b/icons/receipt-swiss-franc.json
@@ -9,12 +9,12 @@
     "slip",
     "check",
     "counterfoil",
+    "currency",
     "chf",
     "₣"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt-text.json b/icons/receipt-text.json
index e88c9ff3e..77317a44b 100644
--- a/icons/receipt-text.json
+++ b/icons/receipt-text.json
@@ -16,7 +16,7 @@
     "contract"
   ],
   "categories": [
-    "money",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/receipt.json b/icons/receipt.json
index ffb5b538a..5dbfacc95 100644
--- a/icons/receipt.json
+++ b/icons/receipt.json
@@ -17,8 +17,7 @@
     "$"
   ],
   "categories": [
-    "money",
-    "currency",
+    "finance",
     "travel"
   ]
 }
diff --git a/icons/rectangle-ellipsis.json b/icons/rectangle-ellipsis.json
index fdd7d2ad2..3e1431412 100644
--- a/icons/rectangle-ellipsis.json
+++ b/icons/rectangle-ellipsis.json
@@ -35,8 +35,7 @@
   ],
   "categories": [
     "text",
-    "development",
-    "shapes"
+    "development"
   ],
   "aliases": [
     "form-input"
diff --git a/icons/refresh-ccw-dot.json b/icons/refresh-ccw-dot.json
index 309a06e4b..8327f4841 100644
--- a/icons/refresh-ccw-dot.json
+++ b/icons/refresh-ccw-dot.json
@@ -18,7 +18,6 @@
   ],
   "categories": [
     "arrows",
-    "development",
-    "shapes"
+    "development"
   ]
 }
diff --git a/icons/rocking-chair.json b/icons/rocking-chair.json
index 307a592ec..51e337771 100644
--- a/icons/rocking-chair.json
+++ b/icons/rocking-chair.json
@@ -10,6 +10,6 @@
     "seat"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/roller-coaster.json b/icons/roller-coaster.json
index 39f613a2a..6ef1a7911 100644
--- a/icons/roller-coaster.json
+++ b/icons/roller-coaster.json
@@ -11,6 +11,6 @@
     "funfair"
   ],
   "categories": [
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/rotate-ccw-square.json b/icons/rotate-ccw-square.json
index 7d7753857..a5d74a5ff 100644
--- a/icons/rotate-ccw-square.json
+++ b/icons/rotate-ccw-square.json
@@ -18,7 +18,6 @@
     "design",
     "photography",
     "tools",
-    "shapes",
     "arrows"
   ]
 }
diff --git a/icons/rotate-cw-square.json b/icons/rotate-cw-square.json
index a981f5196..0a98a655b 100644
--- a/icons/rotate-cw-square.json
+++ b/icons/rotate-cw-square.json
@@ -18,7 +18,6 @@
     "design",
     "photography",
     "tools",
-    "shapes",
     "arrows"
   ]
 }
diff --git a/icons/route-off.json b/icons/route-off.json
index 4c2c29ae7..d884a4e0b 100644
--- a/icons/route-off.json
+++ b/icons/route-off.json
@@ -17,7 +17,6 @@
     "blocked"
   ],
   "categories": [
-    "maps",
     "navigation"
   ]
 }
diff --git a/icons/route.json b/icons/route.json
index 0641bf648..b9695c829 100644
--- a/icons/route.json
+++ b/icons/route.json
@@ -12,7 +12,6 @@
     "stations"
   ],
   "categories": [
-    "maps",
     "navigation"
   ]
 }
diff --git a/icons/russian-ruble.json b/icons/russian-ruble.json
index 18aa12075..7cea7dd72 100644
--- a/icons/russian-ruble.json
+++ b/icons/russian-ruble.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/scale.json b/icons/scale.json
index 494aaa8b4..183443bd8 100644
--- a/icons/scale.json
+++ b/icons/scale.json
@@ -14,6 +14,6 @@
     "law"
   ],
   "categories": [
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/scan-eye.json b/icons/scan-eye.json
index 39df76fe7..c31ba13da 100644
--- a/icons/scan-eye.json
+++ b/icons/scan-eye.json
@@ -25,7 +25,6 @@
   "categories": [
     "photography",
     "multimedia",
-    "layout",
     "accessibility",
     "security",
     "devices",
diff --git a/icons/scan-search.json b/icons/scan-search.json
index b95e41d58..2bfbb2a56 100644
--- a/icons/scan-search.json
+++ b/icons/scan-search.json
@@ -16,7 +16,6 @@
   "categories": [
     "photography",
     "multimedia",
-    "layout",
     "accessibility"
   ]
 }
diff --git a/icons/school.json b/icons/school.json
index 9f459021e..c0762e23d 100644
--- a/icons/school.json
+++ b/icons/school.json
@@ -30,6 +30,6 @@
   ],
   "categories": [
     "buildings",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/search-check.json b/icons/search-check.json
index d2de3f7f8..a3540f97c 100644
--- a/icons/search-check.json
+++ b/icons/search-check.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "text",
-    "account",
     "social"
   ]
 }
diff --git a/icons/search-code.json b/icons/search-code.json
index 7e3325cc5..3a4fc8fb6 100644
--- a/icons/search-code.json
+++ b/icons/search-code.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "text",
-    "account",
     "social",
     "development"
   ]
diff --git a/icons/search-slash.json b/icons/search-slash.json
index 93648bb4f..5f14aecf5 100644
--- a/icons/search-slash.json
+++ b/icons/search-slash.json
@@ -16,7 +16,6 @@
   ],
   "categories": [
     "text",
-    "account",
     "social"
   ]
 }
diff --git a/icons/search-x.json b/icons/search-x.json
index 4eee70741..705317b0d 100644
--- a/icons/search-x.json
+++ b/icons/search-x.json
@@ -15,7 +15,6 @@
   ],
   "categories": [
     "text",
-    "account",
     "social"
   ]
 }
diff --git a/icons/search.json b/icons/search.json
index 49beed21e..729443e15 100644
--- a/icons/search.json
+++ b/icons/search.json
@@ -12,7 +12,6 @@
   ],
   "categories": [
     "text",
-    "account",
     "social"
   ]
 }
diff --git a/icons/ship-wheel.json b/icons/ship-wheel.json
index 0a3c18924..95f5a863f 100644
--- a/icons/ship-wheel.json
+++ b/icons/ship-wheel.json
@@ -21,7 +21,7 @@
   ],
   "categories": [
     "transportation",
-    "travel",
-    "maps"
+    "navigation",
+    "travel"
   ]
 }
diff --git a/icons/ship.json b/icons/ship.json
index 5ff4dc1d2..3a8771f06 100644
--- a/icons/ship.json
+++ b/icons/ship.json
@@ -20,7 +20,7 @@
   ],
   "categories": [
     "transportation",
-    "travel",
-    "maps"
+    "navigation",
+    "travel"
   ]
 }
diff --git a/icons/sigma.json b/icons/sigma.json
index 0796ae315..55fc6ef9d 100644
--- a/icons/sigma.json
+++ b/icons/sigma.json
@@ -9,13 +9,13 @@
     "sum",
     "calculate",
     "formula",
-    "maths",
+    "math",
     "enumeration",
     "enumerate"
   ],
   "categories": [
     "text",
-    "maths",
+    "math",
     "science"
   ]
 }
diff --git a/icons/signature.json b/icons/signature.json
index 42a24974b..a6ceba748 100644
--- a/icons/signature.json
+++ b/icons/signature.json
@@ -27,7 +27,6 @@
     "unique"
   ],
   "categories": [
-    "text",
-    "layout"
+    "text"
   ]
 }
diff --git a/icons/slack.json b/icons/slack.json
index ba0e2972c..b7f88759f 100644
--- a/icons/slack.json
+++ b/icons/slack.json
@@ -16,7 +16,6 @@
   "categories": [
     "account",
     "social",
-    "communication",
     "brands",
     "development"
   ]
diff --git a/icons/slash.json b/icons/slash.json
index b3ea3e9d6..62a453e0d 100644
--- a/icons/slash.json
+++ b/icons/slash.json
@@ -11,6 +11,6 @@
   ],
   "categories": [
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/smartphone-nfc.json b/icons/smartphone-nfc.json
index 004fa55bf..720dc023b 100644
--- a/icons/smartphone-nfc.json
+++ b/icons/smartphone-nfc.json
@@ -13,7 +13,7 @@
   ],
   "categories": [
     "communication",
-    "money",
+    "finance",
     "devices"
   ]
 }
diff --git a/icons/sofa.json b/icons/sofa.json
index db59285e4..1caecf57a 100644
--- a/icons/sofa.json
+++ b/icons/sofa.json
@@ -12,6 +12,6 @@
     "couch"
   ],
   "categories": [
-    "furniture"
+    "home"
   ]
 }
diff --git a/icons/sparkles.json b/icons/sparkles.json
index 02b4d6cb4..0aca74b01 100644
--- a/icons/sparkles.json
+++ b/icons/sparkles.json
@@ -14,7 +14,6 @@
     "magic"
   ],
   "categories": [
-    "shapes",
     "cursors",
     "multimedia",
     "gaming",
diff --git a/icons/square-activity.json b/icons/square-activity.json
index 1d6756b26..250aa46bc 100644
--- a/icons/square-activity.json
+++ b/icons/square-activity.json
@@ -34,11 +34,9 @@
   ],
   "categories": [
     "medical",
-    "account",
     "social",
     "science",
-    "multimedia",
-    "shapes"
+    "multimedia"
   ],
   "aliases": [
     "activity-square"
diff --git a/icons/square-arrow-down-left.json b/icons/square-arrow-down-left.json
index 710e0316e..15e8f129e 100644
--- a/icons/square-arrow-down-left.json
+++ b/icons/square-arrow-down-left.json
@@ -15,7 +15,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/square-arrow-down-right.json b/icons/square-arrow-down-right.json
index 9693d36d4..5092f7043 100644
--- a/icons/square-arrow-down-right.json
+++ b/icons/square-arrow-down-right.json
@@ -15,7 +15,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/square-arrow-down.json b/icons/square-arrow-down.json
index 11215ba19..f9a6befcd 100644
--- a/icons/square-arrow-down.json
+++ b/icons/square-arrow-down.json
@@ -16,7 +16,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "gaming"
   ],
   "aliases": [
diff --git a/icons/square-arrow-left.json b/icons/square-arrow-left.json
index d81bd7bd3..b7eb6008f 100644
--- a/icons/square-arrow-left.json
+++ b/icons/square-arrow-left.json
@@ -16,8 +16,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "arrow-left-square"
diff --git a/icons/square-arrow-right.json b/icons/square-arrow-right.json
index f4c151141..41e81dce2 100644
--- a/icons/square-arrow-right.json
+++ b/icons/square-arrow-right.json
@@ -16,8 +16,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "arrow-right-square"
diff --git a/icons/square-arrow-up-left.json b/icons/square-arrow-up-left.json
index 3ff3e525a..24473cb05 100644
--- a/icons/square-arrow-up-left.json
+++ b/icons/square-arrow-up-left.json
@@ -13,8 +13,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "arrow-up-left-square"
diff --git a/icons/square-arrow-up-right.json b/icons/square-arrow-up-right.json
index c8ffd5bc5..deb3db354 100644
--- a/icons/square-arrow-up-right.json
+++ b/icons/square-arrow-up-right.json
@@ -15,7 +15,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "social"
   ],
   "aliases": [
diff --git a/icons/square-arrow-up.json b/icons/square-arrow-up.json
index 9bdbf2466..1e2792df7 100644
--- a/icons/square-arrow-up.json
+++ b/icons/square-arrow-up.json
@@ -14,8 +14,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "arrow-up-square"
diff --git a/icons/square-asterisk.json b/icons/square-asterisk.json
index 1de5c33d9..dad179b51 100644
--- a/icons/square-asterisk.json
+++ b/icons/square-asterisk.json
@@ -17,8 +17,7 @@
   "categories": [
     "text",
     "security",
-    "account",
-    "maths",
+    "math",
     "development"
   ],
   "aliases": [
diff --git a/icons/square-check-big.json b/icons/square-check-big.json
index 35c18708b..e955e8d55 100644
--- a/icons/square-check-big.json
+++ b/icons/square-check-big.json
@@ -14,8 +14,7 @@
     "task"
   ],
   "categories": [
-    "notifications",
-    "shapes"
+    "notifications"
   ],
   "aliases": [
     "check-square"
diff --git a/icons/square-check.json b/icons/square-check.json
index 068386293..4f392e60d 100644
--- a/icons/square-check.json
+++ b/icons/square-check.json
@@ -11,8 +11,7 @@
     "task"
   ],
   "categories": [
-    "notifications",
-    "shapes"
+    "notifications"
   ],
   "aliases": [
     "check-square-2"
diff --git a/icons/square-chevron-down.json b/icons/square-chevron-down.json
index 1a9801f4d..f9ee0c846 100644
--- a/icons/square-chevron-down.json
+++ b/icons/square-chevron-down.json
@@ -11,8 +11,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-down-square"
diff --git a/icons/square-chevron-left.json b/icons/square-chevron-left.json
index bde656017..5c8c67df9 100644
--- a/icons/square-chevron-left.json
+++ b/icons/square-chevron-left.json
@@ -17,8 +17,7 @@
   ],
   "categories": [
     "arrows",
-    "navigation",
-    "shapes"
+    "navigation"
   ],
   "aliases": [
     "chevron-left-square"
diff --git a/icons/square-chevron-right.json b/icons/square-chevron-right.json
index 8c24f39f6..ce12b6d95 100644
--- a/icons/square-chevron-right.json
+++ b/icons/square-chevron-right.json
@@ -23,7 +23,6 @@
   "categories": [
     "arrows",
     "navigation",
-    "shapes",
     "development"
   ],
   "aliases": [
diff --git a/icons/square-chevron-up.json b/icons/square-chevron-up.json
index eaec5402c..4256c7d2a 100644
--- a/icons/square-chevron-up.json
+++ b/icons/square-chevron-up.json
@@ -22,8 +22,7 @@
   "categories": [
     "arrows",
     "navigation",
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "chevron-up-square"
diff --git a/icons/square-dashed-bottom-code.json b/icons/square-dashed-bottom-code.json
index 0a33aeaae..0774d55ba 100644
--- a/icons/square-dashed-bottom-code.json
+++ b/icons/square-dashed-bottom-code.json
@@ -13,7 +13,6 @@
     "coding"
   ],
   "categories": [
-    "shapes",
     "development",
     "files"
   ]
diff --git a/icons/square-dashed-bottom.json b/icons/square-dashed-bottom.json
index 0a33aeaae..0774d55ba 100644
--- a/icons/square-dashed-bottom.json
+++ b/icons/square-dashed-bottom.json
@@ -13,7 +13,6 @@
     "coding"
   ],
   "categories": [
-    "shapes",
     "development",
     "files"
   ]
diff --git a/icons/square-divide.json b/icons/square-divide.json
index 9cb633328..cf56f0b9c 100644
--- a/icons/square-divide.json
+++ b/icons/square-divide.json
@@ -6,13 +6,12 @@
   ],
   "tags": [
     "calculate",
-    "maths",
+    "math",
     "÷",
     "/"
   ],
   "categories": [
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "divide-square"
diff --git a/icons/square-dot.json b/icons/square-dot.json
index 90d09d353..6e4a26b87 100644
--- a/icons/square-dot.json
+++ b/icons/square-dot.json
@@ -11,7 +11,6 @@
     "."
   ],
   "categories": [
-    "shapes",
     "development"
   ],
   "aliases": [
diff --git a/icons/square-equal.json b/icons/square-equal.json
index 3c69e8fac..be4487e0c 100644
--- a/icons/square-equal.json
+++ b/icons/square-equal.json
@@ -9,8 +9,7 @@
     "="
   ],
   "categories": [
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "equal-square"
diff --git a/icons/square-function.json b/icons/square-function.json
index a242d6269..22f7e5685 100644
--- a/icons/square-function.json
+++ b/icons/square-function.json
@@ -8,12 +8,11 @@
     "programming",
     "code",
     "automation",
-    "maths"
+    "math"
   ],
   "categories": [
     "development",
-    "shapes",
-    "maths"
+    "math"
   ],
   "aliases": [
     "function-square"
diff --git a/icons/square-library.json b/icons/square-library.json
index bbb1b897f..1151020d9 100644
--- a/icons/square-library.json
+++ b/icons/square-library.json
@@ -32,7 +32,7 @@
     "text",
     "photography",
     "multimedia",
-    "maps",
+    "navigation",
     "development"
   ],
   "aliases": [
diff --git a/icons/square-m.json b/icons/square-m.json
index e23e86115..712181c20 100644
--- a/icons/square-m.json
+++ b/icons/square-m.json
@@ -12,7 +12,6 @@
   ],
   "categories": [
     "transportation",
-    "maps",
     "navigation"
   ],
   "aliases": [
diff --git a/icons/square-menu.json b/icons/square-menu.json
index b50a1979c..f56001a7f 100644
--- a/icons/square-menu.json
+++ b/icons/square-menu.json
@@ -12,8 +12,7 @@
     "panel"
   ],
   "categories": [
-    "layout",
-    "account"
+    "layout"
   ],
   "aliases": [
     "menu-square"
diff --git a/icons/square-minus.json b/icons/square-minus.json
index a226800e7..12019d527 100644
--- a/icons/square-minus.json
+++ b/icons/square-minus.json
@@ -29,12 +29,11 @@
     "downgrade"
   ],
   "categories": [
-    "maths",
+    "math",
     "development",
     "text",
     "tools",
-    "devices",
-    "shapes"
+    "devices"
   ],
   "aliases": [
     "minus-square"
diff --git a/icons/square-parking-off.json b/icons/square-parking-off.json
index 6102ff09d..51ce90230 100644
--- a/icons/square-parking-off.json
+++ b/icons/square-parking-off.json
@@ -12,7 +12,7 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "parking-square-off"
diff --git a/icons/square-parking.json b/icons/square-parking.json
index ccd37286f..aa256c4b7 100644
--- a/icons/square-parking.json
+++ b/icons/square-parking.json
@@ -11,7 +11,7 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "parking-square"
diff --git a/icons/square-percent.json b/icons/square-percent.json
index b03fa56d2..89b44e6fe 100644
--- a/icons/square-percent.json
+++ b/icons/square-percent.json
@@ -14,12 +14,10 @@
     "price tag"
   ],
   "categories": [
-    "account",
     "social",
-    "money",
+    "finance",
     "shopping",
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "percent-square"
diff --git a/icons/square-pi.json b/icons/square-pi.json
index ff1ae9d99..6c4410cf1 100644
--- a/icons/square-pi.json
+++ b/icons/square-pi.json
@@ -15,8 +15,7 @@
   ],
   "categories": [
     "development",
-    "maths",
-    "shapes"
+    "math"
   ],
   "aliases": [
     "pi-square"
diff --git a/icons/square-plus.json b/icons/square-plus.json
index e728b23df..a5345ae58 100644
--- a/icons/square-plus.json
+++ b/icons/square-plus.json
@@ -26,11 +26,10 @@
     "+"
   ],
   "categories": [
-    "maths",
+    "math",
     "tools",
     "development",
-    "text",
-    "shapes"
+    "text"
   ],
   "aliases": [
     "plus-square"
diff --git a/icons/square-radical.json b/icons/square-radical.json
index 7e2b4dfae..16cec7028 100644
--- a/icons/square-radical.json
+++ b/icons/square-radical.json
@@ -6,7 +6,7 @@
   "tags": [
     "calculate",
     "formula",
-    "maths",
+    "math",
     "operator",
     "root",
     "square",
@@ -14,7 +14,6 @@
   ],
   "categories": [
     "development",
-    "maths",
-    "shapes"
+    "math"
   ]
 }
diff --git a/icons/square-sigma.json b/icons/square-sigma.json
index dde206ba3..bc20c349d 100644
--- a/icons/square-sigma.json
+++ b/icons/square-sigma.json
@@ -7,13 +7,13 @@
     "sum",
     "calculate",
     "formula",
-    "maths",
+    "math",
     "enumeration",
     "enumerate"
   ],
   "categories": [
     "text",
-    "maths"
+    "math"
   ],
   "aliases": [
     "sigma-square"
diff --git a/icons/square-slash.json b/icons/square-slash.json
index af9cf8165..9c7593356 100644
--- a/icons/square-slash.json
+++ b/icons/square-slash.json
@@ -15,9 +15,8 @@
     "/"
   ],
   "categories": [
-    "shapes",
     "development",
-    "maths"
+    "math"
   ],
   "aliases": [
     "slash-square"
diff --git a/icons/square-terminal.json b/icons/square-terminal.json
index 4a294a9b5..41c5ae4e3 100644
--- a/icons/square-terminal.json
+++ b/icons/square-terminal.json
@@ -11,8 +11,7 @@
     "shell"
   ],
   "categories": [
-    "development",
-    "shapes"
+    "development"
   ],
   "aliases": [
     "terminal-square"
diff --git a/icons/square-user-round.json b/icons/square-user-round.json
index 8604fccac..4f94c9ed8 100644
--- a/icons/square-user-round.json
+++ b/icons/square-user-round.json
@@ -9,8 +9,7 @@
     "contact"
   ],
   "categories": [
-    "account",
-    "shapes"
+    "account"
   ],
   "aliases": [
     {
diff --git a/icons/square-user.json b/icons/square-user.json
index 18379762a..8e79ed789 100644
--- a/icons/square-user.json
+++ b/icons/square-user.json
@@ -9,8 +9,7 @@
     "contact"
   ],
   "categories": [
-    "account",
-    "shapes"
+    "account"
   ],
   "aliases": [
     "user-square"
diff --git a/icons/square-x.json b/icons/square-x.json
index 822c1baff..189e61f88 100644
--- a/icons/square-x.json
+++ b/icons/square-x.json
@@ -11,13 +11,12 @@
     "remove",
     "times",
     "clear",
-    "maths",
+    "math",
     "multiply",
     "multiplication"
   ],
   "categories": [
-    "maths",
-    "shapes",
+    "math",
     "notifications"
   ],
   "aliases": [
diff --git a/icons/stamp.json b/icons/stamp.json
index 2cbd6a409..4dfdb8541 100644
--- a/icons/stamp.json
+++ b/icons/stamp.json
@@ -13,7 +13,6 @@
   "categories": [
     "design",
     "cursors",
-    "tools",
-    "maps"
+    "tools"
   ]
 }
diff --git a/icons/sticker.json b/icons/sticker.json
index 80cbc1c93..74ce225fc 100644
--- a/icons/sticker.json
+++ b/icons/sticker.json
@@ -13,7 +13,6 @@
     "feedback"
   ],
   "categories": [
-    "communication",
     "social"
   ]
 }
diff --git a/icons/sticky-note.json b/icons/sticky-note.json
index c35cf51ed..3d21eb664 100644
--- a/icons/sticky-note.json
+++ b/icons/sticky-note.json
@@ -24,7 +24,6 @@
     "office"
   ],
   "categories": [
-    "communication",
     "text",
     "social"
   ]
diff --git a/icons/store.json b/icons/store.json
index f5e97bae0..6aef51b22 100644
--- a/icons/store.json
+++ b/icons/store.json
@@ -12,6 +12,7 @@
   ],
   "categories": [
     "buildings",
-    "maps"
+    "navigation",
+    "shopping"
   ]
 }
diff --git a/icons/swatch-book.json b/icons/swatch-book.json
index 7bb49deeb..144a9b2c7 100644
--- a/icons/swatch-book.json
+++ b/icons/swatch-book.json
@@ -23,7 +23,6 @@
   "categories": [
     "design",
     "home",
-    "furniture",
     "photography"
   ]
 }
diff --git a/icons/swiss-franc.json b/icons/swiss-franc.json
index 18aa12075..7cea7dd72 100644
--- a/icons/swiss-franc.json
+++ b/icons/swiss-franc.json
@@ -10,7 +10,6 @@
     "payment"
   ],
   "categories": [
-    "currency",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/tally-1.json b/icons/tally-1.json
index d59bc882d..5eea34ff4 100644
--- a/icons/tally-1.json
+++ b/icons/tally-1.json
@@ -17,7 +17,7 @@
     "sentence"
   ],
   "categories": [
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/tally-2.json b/icons/tally-2.json
index 135f18a35..810ce2fe4 100644
--- a/icons/tally-2.json
+++ b/icons/tally-2.json
@@ -18,7 +18,7 @@
     "sentence"
   ],
   "categories": [
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/tally-3.json b/icons/tally-3.json
index 693b74703..6de14f461 100644
--- a/icons/tally-3.json
+++ b/icons/tally-3.json
@@ -18,7 +18,7 @@
     "sentence"
   ],
   "categories": [
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/tally-4.json b/icons/tally-4.json
index 2d7f80a72..3b14982ec 100644
--- a/icons/tally-4.json
+++ b/icons/tally-4.json
@@ -17,7 +17,7 @@
     "sentence"
   ],
   "categories": [
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/tally-5.json b/icons/tally-5.json
index 357c6a5e5..b9ad779cc 100644
--- a/icons/tally-5.json
+++ b/icons/tally-5.json
@@ -19,7 +19,7 @@
     "/"
   ],
   "categories": [
-    "maths",
+    "math",
     "gaming"
   ]
 }
diff --git a/icons/tangent.json b/icons/tangent.json
index 4cc2bb9f7..8aa2c739d 100644
--- a/icons/tangent.json
+++ b/icons/tangent.json
@@ -14,7 +14,7 @@
   ],
   "categories": [
     "shapes",
-    "maths",
+    "math",
     "design",
     "tools"
   ]
diff --git a/icons/ticket-check.json b/icons/ticket-check.json
index bceb113d4..02319ddd0 100644
--- a/icons/ticket-check.json
+++ b/icons/ticket-check.json
@@ -21,7 +21,6 @@
     "used"
   ],
   "categories": [
-    "account",
     "transportation"
   ]
 }
diff --git a/icons/ticket-minus.json b/icons/ticket-minus.json
index e3f65e94f..292724db2 100644
--- a/icons/ticket-minus.json
+++ b/icons/ticket-minus.json
@@ -18,7 +18,6 @@
     "-"
   ],
   "categories": [
-    "account",
     "transportation"
   ]
 }
diff --git a/icons/ticket-percent.json b/icons/ticket-percent.json
index 006c4fd8d..6c4dc6efe 100644
--- a/icons/ticket-percent.json
+++ b/icons/ticket-percent.json
@@ -18,7 +18,6 @@
     "%"
   ],
   "categories": [
-    "account",
     "transportation",
     "shopping"
   ]
diff --git a/icons/ticket-plus.json b/icons/ticket-plus.json
index aea248551..3d31b9b19 100644
--- a/icons/ticket-plus.json
+++ b/icons/ticket-plus.json
@@ -16,7 +16,6 @@
     "+"
   ],
   "categories": [
-    "account",
     "transportation"
   ]
 }
diff --git a/icons/ticket-slash.json b/icons/ticket-slash.json
index e3bdc8174..cf7f60690 100644
--- a/icons/ticket-slash.json
+++ b/icons/ticket-slash.json
@@ -33,7 +33,6 @@
     "error"
   ],
   "categories": [
-    "account",
     "transportation"
   ]
 }
diff --git a/icons/ticket-x.json b/icons/ticket-x.json
index c2c42c7b7..60b0f2aca 100644
--- a/icons/ticket-x.json
+++ b/icons/ticket-x.json
@@ -30,7 +30,6 @@
     "x"
   ],
   "categories": [
-    "account",
     "transportation"
   ]
 }
diff --git a/icons/train-front-tunnel.json b/icons/train-front-tunnel.json
index 8904bd31e..9423f1d23 100644
--- a/icons/train-front-tunnel.json
+++ b/icons/train-front-tunnel.json
@@ -16,6 +16,6 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/train-track.json b/icons/train-track.json
index ec2489ba8..38671febf 100644
--- a/icons/train-track.json
+++ b/icons/train-track.json
@@ -9,6 +9,6 @@
   ],
   "categories": [
     "transportation",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/triangle-right.json b/icons/triangle-right.json
index 7a070e024..a7cee9659 100644
--- a/icons/triangle-right.json
+++ b/icons/triangle-right.json
@@ -17,6 +17,6 @@
   ],
   "categories": [
     "shapes",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/university.json b/icons/university.json
index 57c37261e..0fcc892a2 100644
--- a/icons/university.json
+++ b/icons/university.json
@@ -11,7 +11,7 @@
   ],
   "categories": [
     "buildings",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     {
diff --git a/icons/utensils-crossed.json b/icons/utensils-crossed.json
index d6f647524..f4679e676 100644
--- a/icons/utensils-crossed.json
+++ b/icons/utensils-crossed.json
@@ -20,7 +20,7 @@
   "categories": [
     "food-beverage",
     "travel",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "fork-knife-crossed"
diff --git a/icons/utensils.json b/icons/utensils.json
index 488a50878..49aafb6c1 100644
--- a/icons/utensils.json
+++ b/icons/utensils.json
@@ -21,7 +21,7 @@
   "categories": [
     "food-beverage",
     "travel",
-    "maps"
+    "navigation"
   ],
   "aliases": [
     "fork-knife"
diff --git a/icons/variable.json b/icons/variable.json
index 251854c72..58ba3daaa 100644
--- a/icons/variable.json
+++ b/icons/variable.json
@@ -21,6 +21,6 @@
   ],
   "categories": [
     "development",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/volleyball.json b/icons/volleyball.json
index 4487daddf..5ec7c6ef4 100644
--- a/icons/volleyball.json
+++ b/icons/volleyball.json
@@ -31,7 +31,6 @@
   "categories": [
     "sports",
     "gaming",
-    "travel",
-    "home"
+    "travel"
   ]
 }
diff --git a/icons/wallet-cards.json b/icons/wallet-cards.json
index 0adffc2df..1d65d7d26 100644
--- a/icons/wallet-cards.json
+++ b/icons/wallet-cards.json
@@ -17,6 +17,6 @@
   ],
   "categories": [
     "account",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/wallet-minimal.json b/icons/wallet-minimal.json
index f1d8ba3c6..d5a52abee 100644
--- a/icons/wallet-minimal.json
+++ b/icons/wallet-minimal.json
@@ -9,7 +9,7 @@
   ],
   "categories": [
     "account",
-    "money"
+    "finance"
   ],
   "aliases": [
     {
diff --git a/icons/wallet.json b/icons/wallet.json
index cd432296d..a179765af 100644
--- a/icons/wallet.json
+++ b/icons/wallet.json
@@ -12,6 +12,6 @@
   ],
   "categories": [
     "account",
-    "money"
+    "finance"
   ]
 }
diff --git a/icons/warehouse.json b/icons/warehouse.json
index e6ea2fc31..b9edd3243 100644
--- a/icons/warehouse.json
+++ b/icons/warehouse.json
@@ -10,6 +10,6 @@
   ],
   "categories": [
     "buildings",
-    "maps"
+    "navigation"
   ]
 }
diff --git a/icons/waves.json b/icons/waves.json
index 34028c059..f886df10c 100644
--- a/icons/waves.json
+++ b/icons/waves.json
@@ -14,7 +14,7 @@
   ],
   "categories": [
     "weather",
-    "maps",
+    "navigation",
     "multimedia",
     "sustainability"
   ]
diff --git a/icons/waypoints.json b/icons/waypoints.json
index bd33a7ad7..911c51b9d 100644
--- a/icons/waypoints.json
+++ b/icons/waypoints.json
@@ -23,7 +23,6 @@
   "categories": [
     "security",
     "account",
-    "maps",
     "navigation",
     "development",
     "social"
diff --git a/icons/weight.json b/icons/weight.json
index 4b1315101..02fe4eab6 100644
--- a/icons/weight.json
+++ b/icons/weight.json
@@ -15,6 +15,6 @@
     "balance"
   ],
   "categories": [
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/wrench.json b/icons/wrench.json
index 276d9e773..baced677e 100644
--- a/icons/wrench.json
+++ b/icons/wrench.json
@@ -17,7 +17,6 @@
   "categories": [
     "account",
     "development",
-    "tools",
-    "home"
+    "tools"
   ]
 }
diff --git a/icons/x.json b/icons/x.json
index 28cf2b38d..e2f376c30 100644
--- a/icons/x.json
+++ b/icons/x.json
@@ -11,12 +11,12 @@
     "remove",
     "times",
     "clear",
-    "maths",
+    "math",
     "multiply",
     "multiplication"
   ],
   "categories": [
     "notifications",
-    "maths"
+    "math"
   ]
 }
diff --git a/icons/youtube.json b/icons/youtube.json
index 0b3237812..048092ef3 100644
--- a/icons/youtube.json
+++ b/icons/youtube.json
@@ -17,10 +17,8 @@
     "play"
   ],
   "categories": [
-    "account",
     "multimedia",
     "social",
-    "text",
     "brands"
   ]
 }