diff --git a/frontend/components/card/CardLegalDisclaimer.vue b/frontend/components/card/CardLegalDisclaimer.vue
index 882fec8bb..6f37fe334 100644
--- a/frontend/components/card/CardLegalDisclaimer.vue
+++ b/frontend/components/card/CardLegalDisclaimer.vue
@@ -4,7 +4,7 @@
     class="flex flex-col gap-3 px-4 py-2 border rounded-md select-none border-light-section-div dark:border-dark-section-div bg-light-header dark:bg-dark-header active:bg-light-highlight dark:active:bg-dark-highlight hover:cursor-pointer"
   >
     <div class="flex items-center gap-3">
-      <Icon name="IconLegal" class="fill-light-text dark:fill-dark-text" />
+      <Icon name="octicon:law" class="fill-light-text dark:fill-dark-text" />
       <p>{{ $t("components.card-legal-disclaimer.header") }}</p>
       <Icon v-if="isOpen" name="bi:chevron-up" />
       <Icon v-else name="bi:chevron-down" />
diff --git a/frontend/components/icon/IconDiscussion.vue b/frontend/components/icon/IconDiscussion.vue
deleted file mode 100644
index acddd0914..000000000
--- a/frontend/components/icon/IconDiscussion.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <g clip-path="url(#clip0_5143_33228)">
-      <path
-        d="M4.34672 0.0187366C3.66334 0.0953323 3.10554 0.595758 2.90819 1.31406C2.86416 1.47235 2.86416 1.47235 2.85926 2.18214L2.85274 2.89363H2.27048C1.94591 2.89363 1.62297 2.90214 1.54142 2.91235C1.14672 2.96342 0.783014 3.14725 0.504115 3.43661C0.288825 3.66299 0.137143 3.93704 0.0523313 4.25533L0.00829461 4.41704L0.00340164 7.54895C-0.00149132 10.3864 0.00177065 10.6962 0.0262355 10.8511C0.0865821 11.2409 0.257836 11.5728 0.539997 11.8536C0.765073 12.0766 1.02603 12.2281 1.3294 12.3098C1.44193 12.3404 1.52348 12.3472 1.91166 12.3524L2.36507 12.3609L2.36834 13.9966C2.37323 15.6255 2.37323 15.6341 2.40748 15.7124C2.48414 15.886 2.64234 15.9898 2.82991 15.9898C3.03867 15.9898 2.70921 16.2843 6.1718 12.9924L6.83888 12.3575H9.00157L11.1643 12.3592L12.0205 13.1745C12.5783 13.7072 12.9045 14.0068 12.9567 14.0341C13.1459 14.1328 13.4134 14.063 13.5308 13.8843C13.5618 13.8383 13.5928 13.7736 13.6026 13.7396C13.6124 13.6987 13.6189 13.1098 13.6189 12.063V10.4511H13.9989C14.4262 10.4511 14.5959 10.4289 14.8258 10.3455C15.09 10.2485 15.3086 10.1004 15.5125 9.87746C15.7604 9.60512 15.917 9.2715 15.9675 8.91065C15.9806 8.81193 15.9838 7.78384 15.9806 5.14895L15.9757 1.52342L15.9316 1.36172C15.7506 0.682566 15.2711 0.212779 14.5812 0.0408642C14.4654 0.0119281 14.2142 0.0102259 9.46803 0.00682168C6.72308 0.00511955 4.41849 0.0102259 4.34672 0.0187366ZM14.4262 1.01278C14.7019 1.08937 14.9302 1.30555 15.0052 1.56427C15.0379 1.67491 15.0379 1.71406 15.0346 5.2681L15.0297 8.85959L14.9775 8.97533C14.9106 9.12172 14.7606 9.28852 14.6268 9.36172C14.4328 9.46895 14.4409 9.46895 13.5259 9.47576L12.6892 9.48257L12.686 10.9804L12.6811 12.4766L12.4446 12.2536C12.3141 12.1294 12.0107 11.84 11.7677 11.6102C11.5263 11.3787 11.1186 10.9924 10.8625 10.7489C10.6065 10.5055 10.2036 10.1226 9.96874 9.89789L9.53816 9.48938L6.97588 9.48086C4.59464 9.47235 4.40544 9.47065 4.32878 9.44172C4.12817 9.37193 3.97975 9.24257 3.88679 9.06044C3.77751 8.84938 3.78403 9.09959 3.78403 5.23406C3.78403 1.42469 3.78077 1.60512 3.87374 1.41278C3.93082 1.29533 4.05967 1.15406 4.16732 1.08937C4.34672 0.982141 3.95529 0.988949 9.37833 0.988949C13.7722 0.987247 14.3398 0.990651 14.4262 1.01278ZM2.83806 6.22469C2.83806 7.51491 2.84622 8.66214 2.85274 8.77448C2.8772 9.12172 2.96854 9.40938 3.13653 9.6715C3.3404 9.9898 3.61767 10.2179 3.96181 10.3489C4.23745 10.4545 4.14611 10.4511 6.76711 10.4528H9.15814L9.64255 10.9158L10.1269 11.3787L8.28882 11.3872L6.4507 11.3958L4.88169 12.8885C4.01727 13.7107 3.30778 14.383 3.30289 14.383C3.298 14.383 3.29474 13.7089 3.29474 12.8851V11.3872H2.49881C2.00136 11.3872 1.66538 11.3804 1.60503 11.3685C1.35712 11.3226 1.13205 11.1421 1.01788 10.9004L0.954268 10.7677L0.949375 7.66129C0.946113 4.59916 0.946113 4.5515 0.978733 4.45278C1.06354 4.19065 1.27883 3.98299 1.54469 3.9064C1.60177 3.88938 1.78118 3.88427 2.23133 3.88257L2.83806 3.88086V6.22469Z"
-      />
-    </g>
-    <defs>
-      <clipPath id="clip0_5143_33228">
-        <rect width="16" height="16" />
-      </clipPath>
-    </defs>
-  </svg>
-</template>
diff --git a/frontend/components/icon/IconLegal.vue b/frontend/components/icon/IconLegal.vue
deleted file mode 100644
index fb33066b8..000000000
--- a/frontend/components/icon/IconLegal.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M12.8718 3.39635C12.5651 3.32176 12.3069 3.12344 12.1529 2.85725H9.61674C9.44458 3.34434 9.05852 3.7304 8.57143 3.90256V13.7144H13.7143C14.3455 13.7144 14.8571 14.2261 14.8571 14.8572V15.4287H1.14286V14.8572C1.14286 14.2261 1.65453 13.7144 2.28571 13.7144H7.42857V3.90256C6.94148 3.7304 6.55542 3.34434 6.38326 2.85725H3.84711C3.69312 3.12344 3.43485 3.32176 3.12816 3.39635L4.58617 9.71439H5.71429C5.71429 10.0146 5.64038 10.3118 5.4968 10.5891C5.35321 10.8664 5.14276 11.1184 4.87745 11.3306C4.61214 11.5429 4.29717 11.7112 3.95052 11.8261C3.60388 11.941 3.23235 12.0001 2.85714 12.0001C2.48194 12.0001 2.11041 11.941 1.76376 11.8261C1.41712 11.7112 1.10215 11.5429 0.836838 11.3306C0.571527 11.1184 0.361072 10.8664 0.217487 10.5891C0.0739021 10.3118 0 10.0146 0 9.71439H1.12811L2.58612 3.39635C2.08576 3.27466 1.71429 2.82362 1.71429 2.28582C1.71429 1.65464 2.22596 1.14296 2.85714 1.14296C3.28016 1.14296 3.6495 1.37279 3.84711 1.71439H6.38326C6.6186 1.04857 7.25359 0.571533 8 0.571533C8.74641 0.571533 9.3814 1.04857 9.61674 1.71439H12.1529C12.3505 1.37279 12.7198 1.14296 13.1429 1.14296C13.774 1.14296 14.2857 1.65464 14.2857 2.28582C14.2857 2.82362 13.9142 3.27466 13.4139 3.39635L14.8719 9.71439H16C16 10.0146 15.9261 10.3118 15.7825 10.5891C15.6389 10.8664 15.4285 11.1184 15.1632 11.3306C14.8979 11.5429 14.5829 11.7112 14.2362 11.8261C13.8896 11.941 13.5181 12.0001 13.1429 12.0001C12.7677 12.0001 12.3961 11.941 12.0495 11.8261C11.7028 11.7112 11.3879 11.5429 11.1226 11.3306C10.8572 11.1184 10.6468 10.8664 10.5032 10.5891C10.3596 10.3118 10.2857 10.0146 10.2857 9.71439H11.4138L12.8718 3.39635ZM14.5787 9.71439H13.1429H11.7071L13.1429 3.49256L14.5787 9.71439ZM2.85714 9.71439H4.29295L2.85714 3.49256L1.42134 9.71439H2.85714Z"
-    />
-  </svg>
-</template>
diff --git a/frontend/components/sidebar/left/SidebarLeftFooter.vue b/frontend/components/sidebar/left/SidebarLeftFooter.vue
index 94b4d534a..a0421fcbc 100644
--- a/frontend/components/sidebar/left/SidebarLeftFooter.vue
+++ b/frontend/components/sidebar/left/SidebarLeftFooter.vue
@@ -148,7 +148,7 @@
               <SidebarLeftSelector
                 :label="$t('components.sidebar-left-selector.label.legal')"
                 routeURL="/legal"
-                iconURL="IconLegal"
+                iconURL="octicon:law"
                 :selected="false"
                 :active="true"
               />
diff --git a/frontend/components/sidebar/left/SidebarLeftIndex.vue b/frontend/components/sidebar/left/SidebarLeftIndex.vue
index aff2449ff..f98e619ab 100644
--- a/frontend/components/sidebar/left/SidebarLeftIndex.vue
+++ b/frontend/components/sidebar/left/SidebarLeftIndex.vue
@@ -153,7 +153,7 @@ const organizationButtons: SidebarLeftSelectorType[] = [
   {
     label: "components.sidebar-left-selector.label.discussions",
     routeURL: "/",
-    iconURL: "IconDiscussion",
+    iconURL: "octicon:comment-discussion-24",
     selected: false,
     active: false,
   },
@@ -198,7 +198,7 @@ const eventButtons: SidebarLeftSelectorType[] = [
   {
     label: "components.sidebar-left-selector.label.discussions",
     routeURL: "/",
-    iconURL: "IconDiscussion",
+    iconURL: "octicon:comment-discussion-24",
     selected: false,
     active: false,
   },