diff --git a/icons/columns-2.json b/icons/columns-2.json
new file mode 100644
index 00000000000..5e9cf7f3143
--- /dev/null
+++ b/icons/columns-2.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "zenoamaro",
+    "ericfennis",
+    "csandman",
+    "mittalyashu"
+  ],
+  "tags": [
+    "lines",
+    "list",
+    "queue",
+    "preview",
+    "panel",
+    "parallel",
+    "series",
+    "split",
+    "vertical",
+    "horizontal",
+    "half",
+    "center",
+    "middle",
+    "even",
+    "sidebar",
+    "drawer",
+    "gutter",
+    "fold",
+    "reflow",
+    "typography",
+    "pagination",
+    "pages"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "text"
+  ],
+  "aliases": [
+    "columns"
+  ]
+}
\ No newline at end of file
diff --git a/icons/columns.svg b/icons/columns-2.svg
similarity index 67%
rename from icons/columns.svg
rename to icons/columns-2.svg
index 1af2a996f22..79d8f66f72d 100644
--- a/icons/columns.svg
+++ b/icons/columns-2.svg
@@ -9,6 +9,6 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
-  <line x1="12" x2="12" y1="3" y2="21" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M12 3v18" />
 </svg>
diff --git a/icons/columns-3.json b/icons/columns-3.json
new file mode 100644
index 00000000000..c56bb68be6c
--- /dev/null
+++ b/icons/columns-3.json
@@ -0,0 +1,39 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "lines",
+    "list",
+    "queue",
+    "preview",
+    "parallel",
+    "series",
+    "split",
+    "vertical",
+    "horizontal",
+    "thirds",
+    "triple",
+    "center",
+    "middle",
+    "alignment",
+    "even",
+    "sidebars",
+    "drawers",
+    "gutters",
+    "fold",
+    "reflow",
+    "typography",
+    "pagination",
+    "pages"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "text"
+  ],
+  "aliases": [
+    "panels-left-right"
+  ]
+}
\ No newline at end of file
diff --git a/icons/rows.svg b/icons/columns-3.svg
similarity index 67%
rename from icons/rows.svg
rename to icons/columns-3.svg
index f188d57f175..1ad5c6137d2 100644
--- a/icons/rows.svg
+++ b/icons/columns-3.svg
@@ -9,6 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
-  <line x1="3" x2="21" y1="12" y2="12" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M9 3v18" />
+  <path d="M15 3v18" />
 </svg>
diff --git a/icons/columns-4.json b/icons/columns-4.json
new file mode 100644
index 00000000000..bff867a0073
--- /dev/null
+++ b/icons/columns-4.json
@@ -0,0 +1,50 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "lines",
+    "list",
+    "queue",
+    "preview",
+    "parallel",
+    "series",
+    "split",
+    "vertical",
+    "horizontal",
+    "thirds",
+    "triple",
+    "center",
+    "middle",
+    "alignment",
+    "even",
+    "sidebars",
+    "drawers",
+    "gutters",
+    "fold",
+    "reflow",
+    "typography",
+    "pagination",
+    "pages",
+    "prison",
+    "jail",
+    "bars",
+    "sentence",
+    "police",
+    "cops",
+    "cell",
+    "crime",
+    "criminal",
+    "justice",
+    "law",
+    "enforcement",
+    "grill"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "text",
+    "security"
+  ]
+}
\ No newline at end of file
diff --git a/icons/columns-4.svg b/icons/columns-4.svg
new file mode 100644
index 00000000000..9de309c993b
--- /dev/null
+++ b/icons/columns-4.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"
+>
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M7.5 3v18" />
+  <path d="M12 3v18" />
+  <path d="M16.5 3v18" />
+</svg>
diff --git a/icons/columns.json b/icons/columns.json
deleted file mode 100644
index 2bb2c6b9a39..00000000000
--- a/icons/columns.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "zenoamaro",
-    "ericfennis",
-    "csandman",
-    "mittalyashu"
-  ],
-  "tags": [
-    "split",
-    "parallel",
-    "vertical",
-    "horizontal"
-  ],
-  "categories": [
-    "layout",
-    "design",
-    "text"
-  ]
-}
\ No newline at end of file
diff --git a/icons/rows-2.json b/icons/rows-2.json
new file mode 100644
index 00000000000..f9739df3321
--- /dev/null
+++ b/icons/rows-2.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "lines",
+    "list",
+    "queue",
+    "preview",
+    "panel",
+    "paragraphs",
+    "parallel",
+    "series",
+    "split",
+    "vertical",
+    "horizontal",
+    "half",
+    "center",
+    "middle",
+    "even",
+    "drawer"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "text"
+  ],
+  "aliases": [
+    "rows"
+  ]
+}
\ No newline at end of file
diff --git a/icons/rows-2.svg b/icons/rows-2.svg
new file mode 100644
index 00000000000..f31fbb55b42
--- /dev/null
+++ b/icons/rows-2.svg
@@ -0,0 +1,14 @@
+<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"
+>
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 12h18" />
+</svg>
diff --git a/icons/rows-3.json b/icons/rows-3.json
new file mode 100644
index 00000000000..b4ce2633a0c
--- /dev/null
+++ b/icons/rows-3.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "lines",
+    "list",
+    "queue",
+    "preview",
+    "paragraphs",
+    "parallel",
+    "series",
+    "split",
+    "vertical",
+    "horizontal",
+    "half",
+    "center",
+    "middle",
+    "even",
+    "drawers"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "text"
+  ],
+  "aliases": [
+    "panels-top-bottom"
+  ]
+}
\ No newline at end of file
diff --git a/icons/rows-3.svg b/icons/rows-3.svg
new file mode 100644
index 00000000000..638a8b4fe38
--- /dev/null
+++ b/icons/rows-3.svg
@@ -0,0 +1,15 @@
+<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"
+>
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M21 9H3" />
+  <path d="M21 15H3" />
+</svg>
diff --git a/icons/rows.json b/icons/rows-4.json
similarity index 62%
rename from icons/rows.json
rename to icons/rows-4.json
index 472603bf675..ac31e5e2ab2 100644
--- a/icons/rows.json
+++ b/icons/rows-4.json
@@ -4,13 +4,22 @@
     "danielbayley"
   ],
   "tags": [
-    "split",
     "lines",
+    "list",
     "queue",
+    "preview",
+    "paragraphs",
+    "parallel",
     "series",
-    "list",
+    "split",
     "vertical",
-    "horizontal"
+    "horizontal",
+    "half",
+    "center",
+    "middle",
+    "even",
+    "drawers",
+    "grill"
   ],
   "categories": [
     "layout",
diff --git a/icons/rows-4.svg b/icons/rows-4.svg
new file mode 100644
index 00000000000..b8f4310c3fa
--- /dev/null
+++ b/icons/rows-4.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"
+>
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M21 7.5H3" />
+  <path d="M21 12H3" />
+  <path d="M21 16.5H3" />
+</svg>