diff --git a/.changeset/add-collapse-all-expand-all-icons.md b/.changeset/add-collapse-all-expand-all-icons.md
new file mode 100644
index 000000000..afad0ff69
--- /dev/null
+++ b/.changeset/add-collapse-all-expand-all-icons.md
@@ -0,0 +1,5 @@
+---
+'@clickhouse/click-ui': patch
+---
+
+Add CollapseAll and ExpandAll icons
diff --git a/src/components/Assets/Icons/Collapse-All.tsx b/src/components/Assets/Icons/Collapse-All.tsx
new file mode 100644
index 000000000..e86892809
--- /dev/null
+++ b/src/components/Assets/Icons/Collapse-All.tsx
@@ -0,0 +1,28 @@
+import type { SVGAssetProps } from '@/types';
+
+const Collapse_All = (props: SVGAssetProps) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={24}
+    height={24}
+    fill="none"
+    viewBox="0 0 24 24"
+    {...props}
+  >
+    <g clipPath="url(#clip-collapse-all)">
+      <path
+        fill="#161517"
+        d="M16.3975 3.09961C17.0891 3.09961 17.6504 3.66093 17.6504 4.35254V6.09961H19.3975C20.0891 6.09961 20.6504 6.66093 20.6504 7.35254V19.3975C20.6504 20.0891 20.0891 20.6504 19.3975 20.6504H7.35254C6.66093 20.6504 6.09961 20.0891 6.09961 19.3975V17.6504H4.35254C3.66093 17.6504 3.09961 17.0891 3.09961 16.3975V4.35254C3.09961 3.66093 3.66093 3.09961 4.35254 3.09961H16.3975ZM17.6504 16.5C17.6504 17.1348 17.1354 17.6504 16.5 17.6504H7.40039V19.3496H19.3496V7.40039H17.6504V16.5ZM4.40039 16.3496H16.3496V4.40039H4.40039V16.3496ZM13.3857 9.72461C13.7447 9.72461 14.0361 10.016 14.0361 10.375C14.0361 10.734 13.7447 11.0254 13.3857 11.0254H7.36328C7.0043 11.0254 6.71289 10.734 6.71289 10.375C6.71289 10.016 7.0043 9.72461 7.36328 9.72461H13.3857Z"
+      />
+    </g>
+    <defs>
+      <clipPath id="clip-collapse-all">
+        <path
+          fill="#fff"
+          d="M0 0H24V24H0z"
+        />
+      </clipPath>
+    </defs>
+  </svg>
+);
+export default Collapse_All;
diff --git a/src/components/Assets/Icons/Expand-All.tsx b/src/components/Assets/Icons/Expand-All.tsx
new file mode 100644
index 000000000..94a79df90
--- /dev/null
+++ b/src/components/Assets/Icons/Expand-All.tsx
@@ -0,0 +1,28 @@
+import type { SVGAssetProps } from '@/types';
+
+const Expand_All = (props: SVGAssetProps) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={24}
+    height={24}
+    fill="none"
+    viewBox="0 0 24 24"
+    {...props}
+  >
+    <g clipPath="url(#clip-expand-all)">
+      <path
+        fill="#161517"
+        d="M16.3975 3.09961C17.0891 3.09961 17.6504 3.66093 17.6504 4.35254V6.09961H19.3975C20.0891 6.09961 20.6504 6.66093 20.6504 7.35254V19.3975C20.6504 20.0891 20.0891 20.6504 19.3975 20.6504H7.35254C6.66093 20.6504 6.09961 20.0891 6.09961 19.3975V17.6504H4.35254C3.66093 17.6504 3.09961 17.0891 3.09961 16.3975V4.35254C3.09961 3.66093 3.66093 3.09961 4.35254 3.09961H16.3975ZM17.6504 16.5C17.6504 17.1348 17.1354 17.6504 16.5 17.6504H7.40039V19.3496H19.3496V7.40039H17.6504V16.5ZM4.40039 16.3496H16.3496V4.40039H4.40039V16.3496ZM10.375 6.71387C10.734 6.71387 11.0254 7.00527 11.0254 7.36426V9.72461H13.3857C13.7447 9.72461 14.0361 10.016 14.0361 10.375C14.0361 10.734 13.7447 11.0254 13.3857 11.0254H11.0254V13.3867C11.0251 13.7455 10.7338 14.0371 10.375 14.0371C10.0162 14.0371 9.72487 13.7455 9.72461 13.3867V11.0254H7.36328C7.0043 11.0254 6.71289 10.734 6.71289 10.375C6.71289 10.016 7.0043 9.72461 7.36328 9.72461H9.72461V7.36426C9.72461 7.00527 10.016 6.71387 10.375 6.71387Z"
+      />
+    </g>
+    <defs>
+      <clipPath id="clip-expand-all">
+        <path
+          fill="#fff"
+          d="M0 0H24V24H0z"
+        />
+      </clipPath>
+    </defs>
+  </svg>
+);
+export default Expand_All;
diff --git a/src/components/Assets/Icons/system/IconsDark.ts b/src/components/Assets/Icons/system/IconsDark.ts
index b9d336804..0ac77d7a2 100644
--- a/src/components/Assets/Icons/system/IconsDark.ts
+++ b/src/components/Assets/Icons/system/IconsDark.ts
@@ -52,6 +52,7 @@ import Cloud from '../Cloud';
 import Cloud_Keys from '../Cloud-Keys';
 import Code from '../Code';
 import Code_In_Square from '../Code-In-Square';
+import Collapse_All from '../Collapse-All';
 import Connect from '../Connect';
 import Connect_Alt from '../Connect-Alt';
 import Console from '../Console';
@@ -76,6 +77,7 @@ import Download_In_Circle from '../Download-In-Circle';
 import Email from '../Email';
 import Empty from '../Empty';
 import Enter from '../Enter';
+import Expand_All from '../Expand-All';
 import Eye from '../Eye';
 import Eye_Closed from '../Eye-Closed';
 import Filter from '../Filter';
@@ -225,6 +227,7 @@ const IconsDark: Record<IconName, ComponentType<SVGAssetProps>> = {
   'cloud-keys': Cloud_Keys,
   code: Code,
   'code-in-square': Code_In_Square,
+  'collapse-all': Collapse_All,
   connect: Connect,
   'connect-alt': Connect_Alt,
   console: Console,
@@ -249,6 +252,7 @@ const IconsDark: Record<IconName, ComponentType<SVGAssetProps>> = {
   email: Email,
   empty: Empty,
   enter: Enter,
+  'expand-all': Expand_All,
   eye: Eye,
   'eye-closed': Eye_Closed,
   filter: Filter,
diff --git a/src/components/Assets/Icons/system/IconsLight.ts b/src/components/Assets/Icons/system/IconsLight.ts
index e277e49ed..55c424ec0 100644
--- a/src/components/Assets/Icons/system/IconsLight.ts
+++ b/src/components/Assets/Icons/system/IconsLight.ts
@@ -52,6 +52,7 @@ import Cloud from '../Cloud';
 import Cloud_Keys from '../Cloud-Keys';
 import Code from '../Code';
 import Code_In_Square from '../Code-In-Square';
+import Collapse_All from '../Collapse-All';
 import Connect from '../Connect';
 import Connect_Alt from '../Connect-Alt';
 import Console from '../Console';
@@ -76,6 +77,7 @@ import Download_In_Circle from '../Download-In-Circle';
 import Email from '../Email';
 import Empty from '../Empty';
 import Enter from '../Enter';
+import Expand_All from '../Expand-All';
 import Eye from '../Eye';
 import Eye_Closed from '../Eye-Closed';
 import Filter from '../Filter';
@@ -225,6 +227,7 @@ const IconsLight: Record<IconName, ComponentType<SVGAssetProps>> = {
   'cloud-keys': Cloud_Keys,
   code: Code,
   'code-in-square': Code_In_Square,
+  'collapse-all': Collapse_All,
   connect: Connect,
   'connect-alt': Connect_Alt,
   console: Console,
@@ -249,6 +252,7 @@ const IconsLight: Record<IconName, ComponentType<SVGAssetProps>> = {
   email: Email,
   empty: Empty,
   enter: Enter,
+  'expand-all': Expand_All,
   eye: Eye,
   'eye-closed': Eye_Closed,
   filter: Filter,
diff --git a/src/components/Assets/Icons/system/types.ts b/src/components/Assets/Icons/system/types.ts
index a41659710..0832c2ba7 100644
--- a/src/components/Assets/Icons/system/types.ts
+++ b/src/components/Assets/Icons/system/types.ts
@@ -50,6 +50,7 @@ export type IconName =
   | 'cloud-keys'
   | 'code'
   | 'code-in-square'
+  | 'collapse-all'
   | 'connect'
   | 'connect-alt'
   | 'console'
@@ -74,6 +75,7 @@ export type IconName =
   | 'email'
   | 'empty'
   | 'enter'
+  | 'expand-all'
   | 'eye'
   | 'eye-closed'
   | 'filter'