diff --git a/icons/arrow-down-0-1.json b/icons/arrow-down-0-1.json
new file mode 100644
index 000000000..8a4c28128
--- /dev/null
+++ b/icons/arrow-down-0-1.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "ascending",
+    "numerical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-down-0-1.svg b/icons/arrow-down-0-1.svg
new file mode 100644
index 000000000..f5ca3823b
--- /dev/null
+++ b/icons/arrow-down-0-1.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <rect x="15" y="4" width="4" height="6" ry="2" />
+  <path d="M17 20v-6h-2" />
+  <path d="M15 20h4" />
+</svg>
diff --git a/icons/arrow-down-1-0.json b/icons/arrow-down-1-0.json
new file mode 100644
index 000000000..5025e1d68
--- /dev/null
+++ b/icons/arrow-down-1-0.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "descending",
+    "numerical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-down-1-0.svg b/icons/arrow-down-1-0.svg
new file mode 100644
index 000000000..8412499b5
--- /dev/null
+++ b/icons/arrow-down-1-0.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <path d="M17 10V4h-2" />
+  <path d="M15 10h4" />
+  <rect x="15" y="14" width="4" height="6" ry="2" />
+</svg>
diff --git a/icons/arrow-down-a-z.json b/icons/arrow-down-a-z.json
new file mode 100644
index 000000000..928c26497
--- /dev/null
+++ b/icons/arrow-down-a-z.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "ascending",
+    "alphabetical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-down-a-z.svg b/icons/arrow-down-a-z.svg
new file mode 100644
index 000000000..c7ceebe8c
--- /dev/null
+++ b/icons/arrow-down-a-z.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <path d="M20 8h-5" />
+  <path d="M15 10V6.5a2.5 2.5 0 0 1 5 0V10" />
+  <path d="M15 14h5l-5 6h5" />
+</svg>
diff --git a/icons/sort-asc.json b/icons/arrow-down-narrow-wide.json
similarity index 51%
rename from icons/sort-asc.json
rename to icons/arrow-down-narrow-wide.json
index 71db4d289..9adb8bdf8 100644
--- a/icons/sort-asc.json
+++ b/icons/arrow-down-narrow-wide.json
@@ -1,10 +1,14 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "filter"
+    "arrow",
+    "filter",
+    "sort",
+    "ascending"
   ],
   "categories": [
     "text",
-    "layout"
+    "layout",
+    "arrows"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/sort-desc.svg b/icons/arrow-down-narrow-wide.svg
similarity index 62%
rename from icons/sort-desc.svg
rename to icons/arrow-down-narrow-wide.svg
index 59528b734..e44ddddbb 100644
--- a/icons/sort-desc.svg
+++ b/icons/arrow-down-narrow-wide.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M11 5h10" />
-  <path d="M11 9h7" />
-  <path d="M11 13h4" />
-  <path d="m3 17 3 3 3-3" />
-  <path d="M6 18V4" />
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <path d="M11 4h4" />
+  <path d="M11 8h7" />
+  <path d="M11 12h10" />
 </svg>
diff --git a/icons/arrow-down-up.json b/icons/arrow-down-up.json
new file mode 100644
index 000000000..18cf127d6
--- /dev/null
+++ b/icons/arrow-down-up.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "bidirectional",
+    "direction",
+    "swap",
+    "switch",
+    "network",
+    "mobile data",
+    "internet",
+    "sort",
+    "reorder",
+    "move"
+  ],
+  "categories": [
+    "arrows"
+  ]
+}
diff --git a/icons/sort-asc.svg b/icons/arrow-down-up.svg
similarity index 62%
rename from icons/sort-asc.svg
rename to icons/arrow-down-up.svg
index c924fb0a0..84d919e72 100644
--- a/icons/sort-asc.svg
+++ b/icons/arrow-down-up.svg
@@ -9,9 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M11 11h4" />
-  <path d="M11 15h7" />
-  <path d="M11 19h10" />
-  <path d="M9 7 6 4 3 7" />
-  <path d="M6 6v14" />
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <path d="m21 8-4-4-4 4" />
+  <path d="M17 4v16" />
 </svg>
diff --git a/icons/arrow-down-wide-narrow.json b/icons/arrow-down-wide-narrow.json
new file mode 100644
index 000000000..7d2df0723
--- /dev/null
+++ b/icons/arrow-down-wide-narrow.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "descending"
+  ],
+  "aliases": [
+    "sort-desc"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-down-wide-narrow.svg b/icons/arrow-down-wide-narrow.svg
new file mode 100644
index 000000000..4b9401b54
--- /dev/null
+++ b/icons/arrow-down-wide-narrow.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 20V4" />
+  <path d="M11 4h10" />
+  <path d="M11 8h7" />
+  <path d="M11 12h4" />
+</svg>
diff --git a/icons/arrow-down-z-a.json b/icons/arrow-down-z-a.json
new file mode 100644
index 000000000..8baf637f9
--- /dev/null
+++ b/icons/arrow-down-z-a.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "descending",
+    "alphabetical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-down-z-a.svg b/icons/arrow-down-z-a.svg
new file mode 100644
index 000000000..105f2f52c
--- /dev/null
+++ b/icons/arrow-down-z-a.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 16 4 4 4-4" />
+  <path d="M7 4v16" />
+  <path d="M15 4h5l-5 6h5" />
+  <path d="M15 20v-3.5a2.5 2.5 0 0 1 5 0V20" />
+  <path d="M20 18h-5" />
+</svg>
diff --git a/icons/arrow-left-right.svg b/icons/arrow-left-right.svg
index 27f3d3e6d..acf2cb39a 100644
--- a/icons/arrow-left-right.svg
+++ b/icons/arrow-left-right.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <polyline points="17 11 21 7 17 3" />
-  <line x1="21" x2="9" y1="7" y2="7" />
-  <polyline points="7 21 3 17 7 13" />
-  <line x1="15" x2="3" y1="17" y2="17" />
+  <path d="M8 3 4 7l4 4" />
+  <path d="M4 7h16" />
+  <path d="m16 21 4-4-4-4" />
+  <path d="M20 17H4" />
 </svg>
diff --git a/icons/arrow-right-left.json b/icons/arrow-right-left.json
new file mode 100644
index 000000000..89f8ef7e3
--- /dev/null
+++ b/icons/arrow-right-left.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "bidirectional",
+    "direction",
+    "swap",
+    "switch",
+    "transaction",
+    "reorder",
+    "move"
+  ],
+  "categories": [
+    "arrows"
+  ]
+}
\ No newline at end of file
diff --git a/icons/arrow-right-left.svg b/icons/arrow-right-left.svg
new file mode 100644
index 000000000..150693cb1
--- /dev/null
+++ b/icons/arrow-right-left.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m16 3 4 4-4 4" />
+  <path d="M20 7H4" />
+  <path d="m8 21-4-4 4-4" />
+  <path d="M4 17h16" />
+</svg>
diff --git a/icons/arrow-up-0-1.json b/icons/arrow-up-0-1.json
new file mode 100644
index 000000000..8a4c28128
--- /dev/null
+++ b/icons/arrow-up-0-1.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "ascending",
+    "numerical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-up-0-1.svg b/icons/arrow-up-0-1.svg
new file mode 100644
index 000000000..1f72ed036
--- /dev/null
+++ b/icons/arrow-up-0-1.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <rect x="15" y="4" width="4" height="6" ry="2" />
+  <path d="M17 20v-6h-2" />
+  <path d="M15 20h4" />
+</svg>
diff --git a/icons/arrow-up-1-0.json b/icons/arrow-up-1-0.json
new file mode 100644
index 000000000..5025e1d68
--- /dev/null
+++ b/icons/arrow-up-1-0.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "descending",
+    "numerical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-up-1-0.svg b/icons/arrow-up-1-0.svg
new file mode 100644
index 000000000..9f2ecf458
--- /dev/null
+++ b/icons/arrow-up-1-0.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <path d="M17 10V4h-2" />
+  <path d="M15 10h4" />
+  <rect x="15" y="14" width="4" height="6" ry="2" />
+</svg>
diff --git a/icons/arrow-up-a-z.json b/icons/arrow-up-a-z.json
new file mode 100644
index 000000000..928c26497
--- /dev/null
+++ b/icons/arrow-up-a-z.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "ascending",
+    "alphabetical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-up-a-z.svg b/icons/arrow-up-a-z.svg
new file mode 100644
index 000000000..f3930171c
--- /dev/null
+++ b/icons/arrow-up-a-z.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <path d="M20 8h-5" />
+  <path d="M15 10V6.5a2.5 2.5 0 0 1 5 0V10" />
+  <path d="M15 14h5l-5 6h5" />
+</svg>
diff --git a/icons/arrow-up-down.json b/icons/arrow-up-down.json
index 1f45c07d5..18cf127d6 100644
--- a/icons/arrow-up-down.json
+++ b/icons/arrow-up-down.json
@@ -8,10 +8,11 @@
     "network",
     "mobile data",
     "internet",
+    "sort",
     "reorder",
     "move"
   ],
   "categories": [
     "arrows"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/arrow-up-down.svg b/icons/arrow-up-down.svg
index 56a13f29f..c8d7f2fe0 100644
--- a/icons/arrow-up-down.svg
+++ b/icons/arrow-up-down.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <polyline points="11 17 7 21 3 17" />
-  <line x1="7" x2="7" y1="21" y2="9" />
-  <polyline points="21 7 17 3 13 7" />
-  <line x1="17" x2="17" y1="15" y2="3" />
+  <path d="m21 16-4 4-4-4" />
+  <path d="M17 20V4" />
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
 </svg>
diff --git a/icons/arrow-up-narrow-wide.json b/icons/arrow-up-narrow-wide.json
new file mode 100644
index 000000000..06c9c0261
--- /dev/null
+++ b/icons/arrow-up-narrow-wide.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "ascending"
+  ],
+  "aliases": [
+    "sort-asc"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-up-narrow-wide.svg b/icons/arrow-up-narrow-wide.svg
new file mode 100644
index 000000000..de565b936
--- /dev/null
+++ b/icons/arrow-up-narrow-wide.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <path d="M11 12h4" />
+  <path d="M11 16h7" />
+  <path d="M11 20h10" />
+</svg>
diff --git a/icons/sort-desc.json b/icons/arrow-up-wide-narrow.json
similarity index 51%
rename from icons/sort-desc.json
rename to icons/arrow-up-wide-narrow.json
index 71db4d289..5ffafdf59 100644
--- a/icons/sort-desc.json
+++ b/icons/arrow-up-wide-narrow.json
@@ -1,10 +1,14 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "filter"
+    "arrow",
+    "filter",
+    "sort",
+    "descending"
   ],
   "categories": [
     "text",
-    "layout"
+    "layout",
+    "arrows"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/arrow-up-wide-narrow.svg b/icons/arrow-up-wide-narrow.svg
new file mode 100644
index 000000000..bc9f70b84
--- /dev/null
+++ b/icons/arrow-up-wide-narrow.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <path d="M11 12h10" />
+  <path d="M11 16h7" />
+  <path d="M11 20h4" />
+</svg>
diff --git a/icons/arrow-up-z-a.json b/icons/arrow-up-z-a.json
new file mode 100644
index 000000000..8baf637f9
--- /dev/null
+++ b/icons/arrow-up-z-a.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../icon.schema.json",
+  "tags": [
+    "arrow",
+    "filter",
+    "sort",
+    "descending",
+    "alphabetical"
+  ],
+  "categories": [
+    "text",
+    "layout",
+    "arrows"
+  ]
+}
diff --git a/icons/arrow-up-z-a.svg b/icons/arrow-up-z-a.svg
new file mode 100644
index 000000000..428693ad2
--- /dev/null
+++ b/icons/arrow-up-z-a.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m3 8 4-4 4 4" />
+  <path d="M7 4v16" />
+  <path d="M15 4h5l-5 6h5" />
+  <path d="M15 20v-3.5a2.5 2.5 0 0 1 5 0V20" />
+  <path d="M20 18h-5" />
+</svg>