diff --git a/categories/files.json b/categories/files.json
index 8814fb2ba..4d1fa3ad9 100644
--- a/categories/files.json
+++ b/categories/files.json
@@ -1,5 +1,5 @@
 {
   "$schema": "../category.schema.json",
   "title": "File icons",
-  "icon": "layout"
+  "icon": "panels-top-left"
 }
\ No newline at end of file
diff --git a/categories/layout.json b/categories/layout.json
index 3d03c8d1f..034ea4be9 100644
--- a/categories/layout.json
+++ b/categories/layout.json
@@ -1,5 +1,5 @@
 {
   "$schema": "../category.schema.json",
   "title": "Layout",
-  "icon": "layout"
+  "icon": "panels-top-left"
 }
\ No newline at end of file
diff --git a/icons/panel-bottom-close.json b/icons/panel-bottom-close.json
index f06e2064d..9b403190a 100644
--- a/icons/panel-bottom-close.json
+++ b/icons/panel-bottom-close.json
@@ -7,7 +7,9 @@
   "tags": [
     "drawer",
     "dock",
-    "hide"
+    "hide",
+    "chevron",
+    "down"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-bottom-close.svg b/icons/panel-bottom-close.svg
index 5530485ec..c079486be 100644
--- a/icons/panel-bottom-close.svg
+++ b/icons/panel-bottom-close.svg
@@ -9,7 +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="15" y2="15" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 15h18" />
   <path d="m15 8-3 3-3-3" />
 </svg>
diff --git a/icons/panel-bottom-inactive.json b/icons/panel-bottom-dashed.json
similarity index 75%
rename from icons/panel-bottom-inactive.json
rename to icons/panel-bottom-dashed.json
index d105deb04..ce1bed31d 100644
--- a/icons/panel-bottom-inactive.json
+++ b/icons/panel-bottom-dashed.json
@@ -8,10 +8,12 @@
     "drawer",
     "dock",
     "show",
-    "reveal",
-    "dashed"
+    "reveal"
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "panel-bottom-inactive"
   ]
 }
\ No newline at end of file
diff --git a/icons/panel-bottom-inactive.svg b/icons/panel-bottom-dashed.svg
similarity index 100%
rename from icons/panel-bottom-inactive.svg
rename to icons/panel-bottom-dashed.svg
diff --git a/icons/panel-bottom-open.json b/icons/panel-bottom-open.json
index 79f9a27ce..cad505252 100644
--- a/icons/panel-bottom-open.json
+++ b/icons/panel-bottom-open.json
@@ -8,7 +8,9 @@
     "drawer",
     "dock",
     "show",
-    "reveal"
+    "reveal",
+    "chevron",
+    "up"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-bottom-open.svg b/icons/panel-bottom-open.svg
index a968059ae..0a2e58410 100644
--- a/icons/panel-bottom-open.svg
+++ b/icons/panel-bottom-open.svg
@@ -9,7 +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="15" y2="15" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 15h18" />
   <path d="m9 10 3-3 3 3" />
 </svg>
diff --git a/icons/panel-bottom.svg b/icons/panel-bottom.svg
index 98ac4a265..e7cca3d01 100644
--- a/icons/panel-bottom.svg
+++ b/icons/panel-bottom.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="3" x2="21" y1="15" y2="15" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 15h18" />
 </svg>
diff --git a/icons/panel-left-close.json b/icons/panel-left-close.json
index 99d7f064e..2874a0d56 100644
--- a/icons/panel-left-close.json
+++ b/icons/panel-left-close.json
@@ -5,14 +5,18 @@
     "danielbayley",
     "ericfennis"
   ],
-  "aliases": ["sidebar-close"],
   "tags": [
     "primary",
     "drawer",
-    "hide"
+    "hide",
+    "chevron",
+    "<"
   ],
   "categories": [
     "layout",
     "arrows"
+  ],
+   "aliases": [
+    "sidebar-close"
   ]
-}
+}
\ No newline at end of file
diff --git a/icons/panel-left-close.svg b/icons/panel-left-close.svg
index 791480f09..838834d32 100644
--- a/icons/panel-left-close.svg
+++ b/icons/panel-left-close.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
   <path d="M9 3v18" />
   <path d="m16 15-3-3 3-3" />
 </svg>
diff --git a/icons/panel-left-inactive.json b/icons/panel-left-dashed.json
similarity index 77%
rename from icons/panel-left-inactive.json
rename to icons/panel-left-dashed.json
index 00a728001..65c1942d2 100644
--- a/icons/panel-left-inactive.json
+++ b/icons/panel-left-dashed.json
@@ -9,10 +9,12 @@
     "primary",
     "drawer",
     "show",
-    "reveal",
-    "dashed"
+    "reveal"
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "panel-left-inactive"
   ]
 }
\ No newline at end of file
diff --git a/icons/panel-left-inactive.svg b/icons/panel-left-dashed.svg
similarity index 100%
rename from icons/panel-left-inactive.svg
rename to icons/panel-left-dashed.svg
diff --git a/icons/panel-left-open.json b/icons/panel-left-open.json
index cafe4476a..09cba5d1a 100644
--- a/icons/panel-left-open.json
+++ b/icons/panel-left-open.json
@@ -5,15 +5,20 @@
     "danielbayley",
     "ericfennis"
   ],
-  "aliases": ["sidebar-open"],
   "tags": [
     "primary",
     "drawer",
     "show",
-    "reveal"
+    "reveal",
+    "chevron",
+    "right",
+    ">"
   ],
   "categories": [
     "layout",
     "arrows"
+  ],
+   "aliases": [
+    "sidebar-open"
   ]
-}
+}
\ No newline at end of file
diff --git a/icons/panel-left-open.svg b/icons/panel-left-open.svg
index 46f21f06a..f7ad0518b 100644
--- a/icons/panel-left-open.svg
+++ b/icons/panel-left-open.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
   <path d="M9 3v18" />
   <path d="m14 9 3 3-3 3" />
 </svg>
diff --git a/icons/panel-left.json b/icons/panel-left.json
index ad3675c37..2af4cd3df 100644
--- a/icons/panel-left.json
+++ b/icons/panel-left.json
@@ -5,12 +5,14 @@
     "danielbayley",
     "ericfennis"
   ],
-  "aliases": ["sidebar"],
   "tags": [
     "primary",
     "drawer"
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "sidebar"
   ]
-}
+}
\ No newline at end of file
diff --git a/icons/panel-left.svg b/icons/panel-left.svg
index fd7498908..60642c396 100644
--- a/icons/panel-left.svg
+++ b/icons/panel-left.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="9" x2="9" y1="3" y2="21" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M9 3v18" />
 </svg>
diff --git a/icons/panel-right-close.json b/icons/panel-right-close.json
index 9cd1b5f84..5e741d93a 100644
--- a/icons/panel-right-close.json
+++ b/icons/panel-right-close.json
@@ -8,7 +8,9 @@
     "sidebar",
     "secondary",
     "drawer",
-    "hide"
+    "hide",
+    "chevron",
+    ">"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-right-close.svg b/icons/panel-right-close.svg
index 0f3e6716b..bcd34cbf1 100644
--- a/icons/panel-right-close.svg
+++ b/icons/panel-right-close.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
-  <line x1="15" x2="15" y1="3" y2="21" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M15 3v18" />
   <path d="m8 9 3 3-3 3" />
 </svg>
diff --git a/icons/panel-right-inactive.json b/icons/panel-right-dashed.json
similarity index 77%
rename from icons/panel-right-inactive.json
rename to icons/panel-right-dashed.json
index 6d11046f4..7b1f4a89e 100644
--- a/icons/panel-right-inactive.json
+++ b/icons/panel-right-dashed.json
@@ -9,10 +9,12 @@
     "secondary",
     "drawer",
     "show",
-    "reveal",
-    "dashed"
+    "reveal"
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "panel-right-inactive"
   ]
 }
\ No newline at end of file
diff --git a/icons/panel-right-inactive.svg b/icons/panel-right-dashed.svg
similarity index 100%
rename from icons/panel-right-inactive.svg
rename to icons/panel-right-dashed.svg
diff --git a/icons/panel-right-open.json b/icons/panel-right-open.json
index 67fb1155f..3cd8ecbe4 100644
--- a/icons/panel-right-open.json
+++ b/icons/panel-right-open.json
@@ -9,7 +9,10 @@
     "secondary",
     "drawer",
     "show",
-    "reveal"
+    "reveal",
+    "chevron",
+    "left",
+    "<"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-right-open.svg b/icons/panel-right-open.svg
index a2ce01b28..613e58973 100644
--- a/icons/panel-right-open.svg
+++ b/icons/panel-right-open.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="18" height="18" x="3" y="3" rx="2" ry="2" />
-  <line x1="15" x2="15" y1="3" y2="21" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M15 3v18" />
   <path d="m10 15-3-3 3-3" />
 </svg>
diff --git a/icons/panel-right.svg b/icons/panel-right.svg
index c1e9cedb0..53ba1e612 100644
--- a/icons/panel-right.svg
+++ b/icons/panel-right.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="15" x2="15" y1="3" y2="21" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M15 3v18" />
 </svg>
diff --git a/icons/panel-top-close.json b/icons/panel-top-close.json
index 65653208d..8035f45f0 100644
--- a/icons/panel-top-close.json
+++ b/icons/panel-top-close.json
@@ -7,7 +7,9 @@
   "tags": [
     "menu bar",
     "drawer",
-    "hide"
+    "hide",
+    "chevron",
+    "up"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-top-close.svg b/icons/panel-top-close.svg
index cc988eb15..d980255e7 100644
--- a/icons/panel-top-close.svg
+++ b/icons/panel-top-close.svg
@@ -9,7 +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="9" y2="9" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 9h18" />
   <path d="m9 16 3-3 3 3" />
 </svg>
diff --git a/icons/panel-top-inactive.json b/icons/panel-top-dashed.json
similarity index 77%
rename from icons/panel-top-inactive.json
rename to icons/panel-top-dashed.json
index 27ffb3286..23626619f 100644
--- a/icons/panel-top-inactive.json
+++ b/icons/panel-top-dashed.json
@@ -8,10 +8,12 @@
     "menu bar",
     "drawer",
     "show",
-    "reveal",
-    "dashed"
+    "reveal"
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "panel-top-inactive"
   ]
 }
\ No newline at end of file
diff --git a/icons/panel-top-inactive.svg b/icons/panel-top-dashed.svg
similarity index 100%
rename from icons/panel-top-inactive.svg
rename to icons/panel-top-dashed.svg
diff --git a/icons/panel-top-open.json b/icons/panel-top-open.json
index ab3d9feca..2dc5b62b2 100644
--- a/icons/panel-top-open.json
+++ b/icons/panel-top-open.json
@@ -8,7 +8,9 @@
     "menu bar",
     "drawer",
     "show",
-    "reveal"
+    "reveal",
+    "chevron",
+    "down"
   ],
   "categories": [
     "layout",
diff --git a/icons/panel-top-open.svg b/icons/panel-top-open.svg
index 88b2516f3..12f8260a7 100644
--- a/icons/panel-top-open.svg
+++ b/icons/panel-top-open.svg
@@ -9,7 +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="9" y2="9" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 9h18" />
   <path d="m15 14-3 3-3-3" />
 </svg>
diff --git a/icons/panel-top.json b/icons/panel-top.json
index ed3d443be..f5566a18a 100644
--- a/icons/panel-top.json
+++ b/icons/panel-top.json
@@ -6,7 +6,6 @@
   ],
   "tags": [
     "drawer",
-    "menu bar",
     "browser",
     "webpage"
   ],
diff --git a/icons/panel-top.svg b/icons/panel-top.svg
index dc12ab7cc..13b64ec79 100644
--- a/icons/panel-top.svg
+++ b/icons/panel-top.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="3" x2="21" y1="9" y2="9" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M3 9h18" />
 </svg>
diff --git a/icons/layout.json b/icons/panels-left-bottom.json
similarity index 60%
rename from icons/layout.json
rename to icons/panels-left-bottom.json
index 1bef42e6e..6840b77e7 100644
--- a/icons/layout.json
+++ b/icons/panels-left-bottom.json
@@ -1,15 +1,14 @@
 {
   "$schema": "../icon.schema.json",
   "contributors": [
-    "colebemis",
-    "ericfennis"
+    "danielbayley"
   ],
   "tags": [
-    "window",
-    "webpage"
+    "drawers",
+    "sidebar",
+    "primary"
   ],
   "categories": [
-    "design",
     "layout"
   ]
 }
\ No newline at end of file
diff --git a/icons/layout.svg b/icons/panels-left-bottom.svg
similarity index 59%
rename from icons/layout.svg
rename to icons/panels-left-bottom.svg
index 2f3dc07a0..1938805ee 100644
--- a/icons/layout.svg
+++ b/icons/panels-left-bottom.svg
@@ -9,7 +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="9" y2="9" />
-  <line x1="9" x2="9" y1="21" y2="9" />
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <path d="M9 3v18" />
+  <path d="M9 15h12" />
 </svg>
diff --git a/icons/panels-right-bottom.json b/icons/panels-right-bottom.json
new file mode 100644
index 000000000..ba0ebac57
--- /dev/null
+++ b/icons/panels-right-bottom.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "drawers",
+    "sidebar",
+    "secondary"
+  ],
+  "categories": [
+    "layout"
+  ]
+}
\ No newline at end of file
diff --git a/icons/panels-right-bottom.svg b/icons/panels-right-bottom.svg
new file mode 100644
index 000000000..d38addd4b
--- /dev/null
+++ b/icons/panels-right-bottom.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="M3 15h12" />
+  <path d="M15 3v18" />
+</svg>
diff --git a/icons/panels-top-left.json b/icons/panels-top-left.json
new file mode 100644
index 000000000..078b425be
--- /dev/null
+++ b/icons/panels-top-left.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "colebemis",
+    "ericfennis"
+  ],
+  "tags": [
+    "menu bar",
+    "sidebar",
+    "primary",
+    "drawers",
+    "window",
+    "webpage",
+    "projects",
+    "overview"
+  ],
+  "categories": [
+    "layout",
+    "design",
+    "development",
+    "charts"
+  ],
+  "aliases": [
+    "layout"
+  ]
+}
\ No newline at end of file
diff --git a/icons/panels-top-left.svg b/icons/panels-top-left.svg
new file mode 100644
index 000000000..574e4dea5
--- /dev/null
+++ b/icons/panels-top-left.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="M3 9h18" />
+  <path d="M9 21V9" />
+</svg>