diff --git a/icons/firebase.svg b/icons/firebase.svg
index e319737ed0..e5051b920e 100644
--- a/icons/firebase.svg
+++ b/icons/firebase.svg
@@ -1 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#fbc02d" d="m19.389 18.237-6.742 3.74q-.693.36-1.386 0l-6.65-3.74L16.664 6.092 16.988 6c.277 0 .434.12.461.37zM9.553 6.277 5.35 13.248 7.105 2.212c.028-.25.185-.37.462-.37.185 0 .305.056.37.232l1.985 3.648-.37.554M13.71 7.44l-8.82 8.857 6.696-11.36c.092-.185.23-.268.415-.268s.305.083.37.268z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g>
+        <g transform="matrix(0.0360468,0,0,0.0360468,1.10109,1.24302)">
+            <path d="M473.406,214.608C460.939,197.309 432.272,161.741 388.237,108.901C369.122,85.982 352.725,66.528 344.653,56.978C340.202,51.709 336.384,47.201 333.37,43.637L328.566,37.975L325.96,34.904L325.453,34.157L325.227,34.058L314.113,21L300.026,32.298C264.063,61.105 234.607,98.238 214.872,139.624C202.771,164.248 194.869,188.322 190.727,213.115C189.643,218.693 188.713,224.426 187.938,230.174C183.106,229.779 178.19,229.526 173.316,229.413C172.908,229.385 172.499,229.371 171.95,229.357C154.102,228.737 136.352,230.864 119.209,235.696L111.87,237.752L108.095,244.373C90.402,275.406 80.386,310.736 79.132,346.53C77.512,393.016 90.176,438.009 115.758,476.649C140.79,514.444 176.147,543.336 218.013,560.198L223.465,562.395L225.113,562.973L225.183,562.945C246.99,570.861 269.881,575.285 293.222,576.088C295.871,576.186 298.505,576.228 301.139,576.228C330.594,576.228 359.275,570.467 386.491,559.071L386.688,559.155L393.928,555.803C430.638,538.828 462.052,512.148 484.774,478.636C508.144,444.165 521.272,403.835 522.737,362.012C524.484,312.018 507.876,262.432 473.392,214.622L473.406,214.608ZM309.535,369.506C317.128,398.285 315.634,425.937 305.126,451.814C278.868,425.895 259.611,397.397 247.863,367.026C235.284,334.542 227.719,303.636 225.324,275.054C236.439,278.703 246.652,283.52 255.752,289.451C281.925,306.51 300.026,333.444 309.535,369.52L309.535,369.506ZM314.324,508.823C325.481,517.318 337.215,525.277 349.316,532.602C331.496,537.448 313.113,539.575 294.518,538.913C291.645,538.814 288.771,538.645 285.883,538.406C296.476,529.277 305.999,519.374 314.31,508.823L314.324,508.823ZM345.484,360.025C333.539,314.751 310.169,280.52 276.037,258.291C261.062,248.543 244.003,241.147 225.268,236.316C225.536,233.202 225.874,230.103 226.268,227.061C226.606,224.455 226.958,222.06 227.339,219.82C230.424,203.888 235.016,188.125 240.961,172.982C243.243,167.178 245.736,161.417 248.384,155.852L248.483,155.655C252.568,147.386 257.174,139.033 262.598,130.102L264.725,126.594L264.654,126.552C277.248,106.873 292.335,88.926 309.591,73.107L316.254,80.981C331.792,99.393 346.4,116.804 359.684,132.736C389.561,168.573 428.3,215.636 443.246,236.386C472.8,277.35 487.042,319.174 485.591,360.73C484.464,393.002 474.913,424.472 457.953,451.716C441.894,477.537 419.524,499.146 393.168,514.359C378.461,507.02 357.106,494.948 334.426,477.382C352.711,440.939 356.444,401.483 345.498,360.025L345.484,360.025ZM285.911,484.89C269.148,506.612 249.201,520.741 237.566,527.84C235.678,527.15 233.79,526.432 231.931,525.671L230.438,525.079C195.968,510.838 166.893,486.764 146.354,455.435C125.365,423.416 114.969,386.198 116.307,347.798C117.265,320.273 124.125,293.973 136.719,269.617C144.03,267.997 151.482,266.982 158.934,266.602L160.863,266.56C164.625,266.475 168.372,266.475 171.936,266.56C177.176,266.799 182.43,267.349 187.6,268.18C189.29,303.171 197.883,340.924 213.167,380.423C227.888,418.443 252.343,453.561 285.897,484.876L285.911,484.89Z" style="fill:rgb(255,145,0);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0341382,0,0,0.0341382,1.67543,1.81294)">
+            <path d="M473.406,214.608C460.939,197.309 432.272,161.741 388.237,108.901C369.122,85.982 352.725,66.528 344.653,56.978C340.202,51.709 336.384,47.201 333.37,43.637L328.566,37.975L325.96,34.904L325.453,34.157L325.227,34.058L314.113,21L300.026,32.298C264.063,61.105 234.607,98.238 214.872,139.624C202.771,164.248 194.869,188.322 190.727,213.115C189.643,218.693 188.713,224.426 187.938,230.174C183.106,229.779 178.19,229.526 173.316,229.413C172.908,229.385 172.499,229.371 171.95,229.357C154.102,228.737 136.352,230.864 119.209,235.696L111.87,237.752L108.095,244.373C90.402,275.406 80.386,310.736 79.132,346.53C77.512,393.016 90.176,438.009 115.758,476.649C140.79,514.444 176.147,543.336 218.013,560.198L223.465,562.395L225.113,562.973L225.183,562.945C246.99,570.861 269.881,575.285 293.222,576.088C295.871,576.186 298.505,576.228 301.139,576.228C330.594,576.228 359.275,570.467 386.491,559.071L386.688,559.155L393.928,555.803C430.638,538.828 462.052,512.148 484.774,478.636C508.144,444.165 521.272,403.835 522.737,362.012C524.484,312.018 507.876,262.432 473.392,214.622L473.406,214.608ZM309.535,369.506C317.128,398.285 315.634,425.937 305.126,451.814C278.868,425.895 259.611,397.397 247.863,367.026C235.284,334.542 227.719,303.636 225.324,275.054C236.439,278.703 246.652,283.52 255.752,289.451C281.925,306.51 300.026,333.444 309.535,369.52L309.535,369.506ZM314.324,508.823C325.481,517.318 337.215,525.277 349.316,532.602C331.496,537.448 313.113,539.575 294.518,538.913C291.645,538.814 288.771,538.645 285.883,538.406C296.476,529.277 305.999,519.374 314.31,508.823L314.324,508.823ZM345.484,360.025C333.539,314.751 310.169,280.52 276.037,258.291C261.062,248.543 244.003,241.147 225.268,236.316C225.536,233.202 225.874,230.103 226.268,227.061C226.606,224.455 226.958,222.06 227.339,219.82C230.424,203.888 235.016,188.125 240.961,172.982C243.243,167.178 245.736,161.417 248.384,155.852L248.483,155.655C252.568,147.386 257.174,139.033 262.598,130.102L264.725,126.594L264.654,126.552C277.248,106.873 292.335,88.926 309.591,73.107L316.254,80.981C331.792,99.393 346.4,116.804 359.684,132.736C389.561,168.573 428.3,215.636 443.246,236.386C472.8,277.35 487.042,319.174 485.591,360.73C484.464,393.002 474.913,424.472 457.953,451.716C441.894,477.537 419.524,499.146 393.168,514.359C378.461,507.02 357.106,494.948 334.426,477.382C352.711,440.939 356.444,401.483 345.498,360.025L345.484,360.025ZM285.911,484.89C269.148,506.612 249.201,520.741 237.566,527.84C235.678,527.15 233.79,526.432 231.931,525.671L230.438,525.079C195.968,510.838 166.893,486.764 146.354,455.435C125.365,423.416 114.969,386.198 116.307,347.798C117.265,320.273 124.125,293.973 136.719,269.617C144.03,267.997 151.482,266.982 158.934,266.602L160.863,266.56C164.625,266.475 168.372,266.475 171.936,266.56C177.176,266.799 182.43,267.349 187.6,268.18C189.29,303.171 197.883,340.924 213.167,380.423C227.888,418.443 252.343,453.561 285.897,484.876L285.911,484.89Z" style="fill:rgb(255,145,0);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/icons/folder-cloud-functions-open.svg b/icons/folder-cloud-functions-open.svg
new file mode 100644
index 0000000000..215c8da32d
--- /dev/null
+++ b/icons/folder-cloud-functions-open.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+  <path
+    d="M28.967,12L9.442,12C8.583,12 7.815,12.553 7.544,13.368L4,24L4,10L28,10C28,8.903 27.097,8 26,8L15.124,8C14.656,8 14.203,7.836 13.844,7.536L12.556,6.464C12.197,6.164 11.744,6 11.276,6L4,6C2.903,6 2,6.903 2,8L2,24C2,25.097 2.903,26 4,26L26,26L30.805,14.788C30.912,14.539 30.967,14.271 30.967,14C30.967,12.903 30.064,12 28.967,12"
+    style="fill:rgb(33,150,243);fill-rule:nonzero;" />
+  <g transform="matrix(1,0,0,1,0,-2)">
+    <g transform="matrix(1,0,0,1,1.00067,0)">
+      <g transform="matrix(1,0,0,1.03885,2.98203,-0.811491)">
+        <rect x="17.999" y="20.021" width="2.037" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(1,0,0,1.03885,5.32907e-15,-0.789496)">
+        <rect x="17.999" y="20.021" width="2.037" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(1,0,0,1.03885,3.55271e-15,-0.789496)">
+        <rect x="23.997" y="20.021" width="1.996" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+    <g>
+      <rect x="29" y="16" width="3" height="10" style="fill:rgb(187,222,251);" />
+      <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      <g transform="matrix(1,0,0,-1,0,42)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+    <g transform="matrix(1,0,0,1,2,0)">
+      <rect x="12" y="16" width="3" height="10" style="fill:rgb(187,222,251);" />
+      <g transform="matrix(-1,0,0,1,44,-1.77636e-15)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(-1,0,0,-1,44,42)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/folder-cloud-functions.svg b/icons/folder-cloud-functions.svg
new file mode 100644
index 0000000000..1649c5abc1
--- /dev/null
+++ b/icons/folder-cloud-functions.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+  <path
+    d="M13.844,7.536L12.556,6.464C12.197,6.164 11.744,6 11.276,6L4,6C2.903,6 2,6.903 2,8L2,24C2,25.097 2.903,26 4,26L28,26C29.097,26 30,25.097 30,24L30,10C30,8.903 29.097,8 28,8L15.124,8C14.656,8 14.203,7.836 13.844,7.536"
+    style="fill:rgb(33,150,243);fill-rule:nonzero;" />
+  <g transform="matrix(1,0,0,1,0,-2)">
+    <g transform="matrix(1,0,0,1,1.00067,0)">
+      <g transform="matrix(1,0,0,1.03885,2.98203,-0.811491)">
+        <rect x="17.999" y="20.021" width="2.037" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(1,0,0,1.03885,5.32907e-15,-0.789496)">
+        <rect x="17.999" y="20.021" width="2.037" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(1,0,0,1.03885,3.55271e-15,-0.789496)">
+        <rect x="23.997" y="20.021" width="1.996" height="1.922" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+    <g>
+      <rect x="29" y="16" width="3" height="10" style="fill:rgb(187,222,251);" />
+      <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      <g transform="matrix(1,0,0,-1,0,42)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+    <g transform="matrix(1,0,0,1,2,0)">
+      <rect x="12" y="16" width="3" height="10" style="fill:rgb(187,222,251);" />
+      <g transform="matrix(-1,0,0,1,44,-1.77636e-15)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+      <g transform="matrix(-1,0,0,-1,44,42)">
+        <path d="M26,14L28,12L32,16L30,18L26,14Z" style="fill:rgb(187,222,251);" />
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/folder-firebase-open.svg b/icons/folder-firebase-open.svg
index 523e4ff21e..73dd493d57 100644
--- a/icons/folder-firebase-open.svg
+++ b/icons/folder-firebase-open.svg
@@ -1 +1,15 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#fbc02d" d="M28.967 12H9.442a2 2 0 0 0-1.898 1.368L4 24V10h24a2 2 0 0 0-2-2H15.124a2 2 0 0 1-1.28-.464l-1.288-1.072A2 2 0 0 0 11.276 6H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h22l4.805-11.212A2 2 0 0 0 28.967 12"/><path fill="#fff9c4" d="m32 24.526-6.387 3.314a1.43 1.43 0 0 1-1.313 0L18 24.526l11.419-10.76.307-.08c.261 0 .41.106.437.326zM22.68 13.93l-3.98 6.178 1.662-9.778c.026-.22.175-.327.438-.327a.32.32 0 0 1 .35.205l1.882 3.232-.35.491m3.937 1.03-8.356 7.848 6.343-10.066a.42.42 0 0 1 .395-.237.335.335 0 0 1 .35.237Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <path fill="rgb(255,145,0)"
+    d="M28.967 12H9.442a2 2 0 0 0-1.898 1.368L4 24V10h24a2 2 0 0 0-2-2H15.124a2 2 0 0 1-1.28-.464l-1.288-1.072A2 2 0 0 0 11.276 6H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h22l4.805-11.212A2 2 0 0 0 28.967 12" />
+  <g>
+    <path
+      d="M24,28.014C24,28.014 19.416,28.227 17,24C16.34,22.844 15.994,21.195 16,20C16.012,17.736 16.962,16.119 17.038,16C17.155,15.819 19.992,15.133 22,16C24.008,16.867 25.979,19.215 26,22C26.021,24.785 23.725,26.565 23.309,26.881C22.894,27.197 24,28.014 24,28.014ZM22,25.5C24.051,23.854 23.875,23.437 24,22C24.125,20.563 22.993,18.929 22,18C21.007,17.071 19.066,17.35 18.5,17.5C16.082,22.905 22,25.5 22,25.5Z"
+      style="fill:rgb(255,224,178);" />
+    <path
+      d="M24,28.014L26.527,27.073C26.527,27.073 24.539,25.808 23.618,24.905C21.381,22.71 20.021,20.085 20,16C19.979,11.915 24,8 24,8C24,8 32.063,14.276 32,20C31.356,28.183 24,28.014 24,28.014ZM28,24.991C29.044,23.856 29.95,22.949 30,20C30.075,15.619 24,10.5 24,10.5C24,10.5 22.144,12.893 22,16C21.662,23.273 28,24.991 28,24.991Z"
+      style="fill:rgb(255,224,178);" />
+    <path
+      d="M22.34,25.64C22.34,25.64 25.793,25.554 28,24.991C31.451,24.112 26.978,27.182 26.978,27.182L24,28.015L22.687,27.479L22.34,25.64Z"
+      style="fill:rgb(255,224,178);" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/folder-firebase.svg b/icons/folder-firebase.svg
index f937c38137..fa9466e321 100644
--- a/icons/folder-firebase.svg
+++ b/icons/folder-firebase.svg
@@ -1 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#fbc02d" d="m13.844 7.536-1.288-1.072A2 2 0 0 0 11.276 6H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h24a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2H15.124a2 2 0 0 1-1.28-.464"/><path fill="#fff9c4" d="m32 24.526-6.387 3.314a1.43 1.43 0 0 1-1.313 0L18 24.526l11.419-10.76.307-.08c.261 0 .41.106.437.326zM22.68 13.93l-3.98 6.178 1.662-9.778c.026-.22.175-.327.438-.327a.32.32 0 0 1 .35.205l1.882 3.232-.35.491m3.937 1.03-8.356 7.848 6.343-10.066a.42.42 0 0 1 .395-.237.335.335 0 0 1 .35.237Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+  <path
+    d="M13.844,7.536L12.556,6.464C12.197,6.164 11.744,6 11.276,6L4,6C2.903,6 2,6.903 2,8L2,24C2,25.097 2.903,26 4,26L28,26C29.097,26 30,25.097 30,24L30,10C30,8.903 29.097,8 28,8L15.124,8C14.656,8 14.203,7.836 13.844,7.536"
+    style="fill:rgb(255,145,0);fill-rule:nonzero;" />
+  <g>
+    <path
+      d="M24,28.014C24,28.014 19.416,28.227 17,24C16.34,22.844 15.994,21.195 16,20C16.012,17.736 16.962,16.119 17.038,16C17.155,15.819 19.992,15.133 22,16C24.008,16.867 25.979,19.215 26,22C26.021,24.785 23.725,26.565 23.309,26.881C22.894,27.197 24,28.014 24,28.014ZM22,25.5C24.051,23.854 23.875,23.437 24,22C24.125,20.563 22.993,18.929 22,18C21.007,17.071 19.066,17.35 18.5,17.5C16.082,22.905 22,25.5 22,25.5Z"
+      style="fill:rgb(255,224,178);" />
+    <path
+      d="M24,28.014L26.527,27.073C26.527,27.073 24.539,25.808 23.618,24.905C21.381,22.71 20.021,20.085 20,16C19.979,11.915 24,8 24,8C24,8 32.063,14.276 32,20C31.356,28.183 24,28.014 24,28.014ZM28,24.991C29.044,23.856 29.95,22.949 30,20C30.075,15.619 24,10.5 24,10.5C24,10.5 22.144,12.893 22,16C21.662,23.273 28,24.991 28,24.991Z"
+      style="fill:rgb(255,224,178);" />
+    <path
+      d="M22.34,25.64C22.34,25.64 25.793,25.554 28,24.991C31.451,24.112 26.978,27.182 26.978,27.182L24,28.015L22.687,27.479L22.34,25.64Z"
+      style="fill:rgb(255,224,178);" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/folder-firestore-open.svg b/icons/folder-firestore-open.svg
new file mode 100644
index 0000000000..02b2423191
--- /dev/null
+++ b/icons/folder-firestore-open.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+  <path
+    d="M28.967,12L9.442,12C8.583,12 7.815,12.553 7.544,13.368L4,24L4,10L28,10C28,8.903 27.097,8 26,8L15.124,8C14.656,8 14.203,7.836 13.844,7.536L12.556,6.464C12.197,6.164 11.744,6 11.276,6L4,6C2.903,6 2,6.903 2,8L2,24C2,25.097 2.903,26 4,26L26,26L30.805,14.788C30.912,14.539 30.967,14.271 30.967,14C30.967,12.903 30.064,12 28.967,12"
+    style="fill:rgb(33,150,243);fill-rule:nonzero;" />
+  <g>
+    <path d="M24,10L16,14L16,18L24,14L32,18L32,14L24,10Z" style="fill:rgb(187,222,251);" />
+    <path d="M16,20L16,24L24,20L32,24L32,20L24,16L16,20Z" style="fill:rgb(187,222,251);" />
+    <path d="M24,24L27,23L31,25L24,28L24,24Z" style="fill:rgb(187,222,251);" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/icons/folder-firestore.svg b/icons/folder-firestore.svg
new file mode 100644
index 0000000000..41aee08303
--- /dev/null
+++ b/icons/folder-firestore.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/"
+  style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+  <path
+    d="M13.844,7.536L12.556,6.464C12.197,6.164 11.744,6 11.276,6L4,6C2.903,6 2,6.903 2,8L2,24C2,25.097 2.903,26 4,26L28,26C29.097,26 30,25.097 30,24L30,10C30,8.903 29.097,8 28,8L15.124,8C14.656,8 14.203,7.836 13.844,7.536"
+    style="fill:rgb(33,150,243);fill-rule:nonzero;" />
+  <g>
+    <path d="M24,10L16,14L16,18L24,14L32,18L32,14L24,10Z" style="fill:rgb(187,222,251);" />
+    <path d="M16,20L16,24L24,20L32,24L32,20L24,16L16,20Z" style="fill:rgb(187,222,251);" />
+    <path d="M24,24L27,23L31,25L24,28L24,24Z" style="fill:rgb(187,222,251);" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/core/icons/folderIcons.ts b/src/core/icons/folderIcons.ts
index 1be9babc07..6f5ccf4462 100644
--- a/src/core/icons/folderIcons.ts
+++ b/src/core/icons/folderIcons.ts
@@ -926,6 +926,19 @@ export const folderIcons: FolderTheme[] = [
       },
       { name: 'folder-stencil', folderNames: ['stencil'] },
       { name: 'folder-firebase', folderNames: ['firebase'] },
+      {
+        name: 'folder-firestore',
+        folderNames: ['firestore', 'cloud-firestore', 'firebase-firestore'],
+      },
+      {
+        name: 'folder-cloud-functions',
+        folderNames: [
+          'cloud-functions',
+          'cloudfunctions',
+          'firebase-cloud-functions',
+          'firebase-cloudfunctions',
+        ],
+      },
       { name: 'folder-svelte', folderNames: ['svelte', 'svelte-kit'] },
       {
         name: 'folder-update',