diff --git a/src/components/layout/footer/NetworkStatus.tsx b/src/components/layout/footer/NetworkStatus.tsx
index 04142c9c..1bb07878 100644
--- a/src/components/layout/footer/NetworkStatus.tsx
+++ b/src/components/layout/footer/NetworkStatus.tsx
@@ -14,7 +14,6 @@ const statusConfigs = () => ({
 });
 
 const NetworkStatus = () => {
-    // TODO complete the logic by adding the socket connctions status
     const status = useNetworkStatus();
     const { className, tooltip } = useMemo(() => statusConfigs()[status], [status]);
 
diff --git a/src/components/layout/header/utils/index.js b/src/components/layout/header/utils/index.js
index 63fd1b16..d782615d 100644
--- a/src/components/layout/header/utils/index.js
+++ b/src/components/layout/header/utils/index.js
@@ -122,9 +122,6 @@ export const checkSwitcherType = async account_data => {
     const is_eu = isEu(country);
 
     const { country_code } = isMultiplier(landing_companies);
-    //TODO: check if this is needed
-    //is_multiplier
-    // const is_high_risk_or_eu = is_eu && is_high_risk;
 
     const { financial_company, gaming_company } = landing_companies;
 
@@ -135,8 +132,6 @@ export const checkSwitcherType = async account_data => {
     let is_high_risk = isHighRisk(financial_company, gaming_company, risk_classification);
     const low_risk_no_account = is_low_risk && Object.keys(client_accounts).length === 1;
     const high_risk_no_account = is_high_risk && Object.keys(client_accounts).length === 1;
-    //TODO: check if this is needed
-    // const is_high_risk_or_eu = is_eu && is_high_risk;
 
     if (low_risk_no_account) is_low_risk = false;
     if (high_risk_no_account) is_high_risk = false;
diff --git a/src/components/shared/utils/currency/currency.ts b/src/components/shared/utils/currency/currency.ts
index 853c00f2..2d0afb41 100644
--- a/src/components/shared/utils/currency/currency.ts
+++ b/src/components/shared/utils/currency/currency.ts
@@ -95,7 +95,6 @@ export const formatMoney = (
             minimumFractionDigits: minimumFractionDigits || decimal_places,
             maximumFractionDigits: decimal_places,
         };
-        // TODO: [use-shared-i18n] - Use a getLanguage function to determine number format.
         money = new Intl.NumberFormat('en', options).format(money);
     } else {
         money = addComma(money, decimal_places);
@@ -144,7 +143,6 @@ export const isCryptocurrency = (currency: string) => {
 export const CryptoConfig = (() => {
     let crypto_config: any;
 
-    // TODO: [use-shared-i18n] - Use translate function shared among apps or pass in translated names externally.
     const initCryptoConfig = () =>
         deepFreeze({
             BTC: {
diff --git a/src/components/shared_ui/autocomplete/autocomplete.tsx b/src/components/shared_ui/autocomplete/autocomplete.tsx
index 55ede91e..d06aaf6b 100644
--- a/src/components/shared_ui/autocomplete/autocomplete.tsx
+++ b/src/components/shared_ui/autocomplete/autocomplete.tsx
@@ -377,8 +377,6 @@ const Autocomplete = React.memo((props: TAutocompleteProps) => {
                     width: input_wrapper_ref.current ? `${input_wrapper_ref.current.offsetWidth}px` : '100%',
                     ...(style || {
                         marginTop: dropdown_offset ? `calc(-${dropdown_offset} + 8px)` : '8px', // 4px is the standard margin. In case of error, the list should overlap the error
-                        // TODO confirm placement of dropdown list and positioning of error
-                        // marginTop: form.errors[field.name] ? 'calc(4px - 18px)' : '4px', // 4px is the standard margin. In case of error, the list should overlap the error
                     }),
                 }}
                 is_visible={should_show_list || is_list_visible}
diff --git a/src/components/shared_ui/drawer/drawer.tsx b/src/components/shared_ui/drawer/drawer.tsx
index 478d3856..f42be5e8 100644
--- a/src/components/shared_ui/drawer/drawer.tsx
+++ b/src/components/shared_ui/drawer/drawer.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import { LegacyHandleLessIcon } from '@deriv/quill-icons';
+import { LabelPairedChevronsRightCaptionRegularIcon,LegacyHandleLessIcon } from '@deriv/quill-icons';
 import { useDevice } from '@deriv-com/ui';
 
 type TDrawer = {
@@ -15,17 +15,6 @@ type TDrawer = {
     toggleDrawer?: (prop: boolean) => void;
 };
 
-// TODO: use-from-shared - Use this icon from icons' shared package
-const IconDrawer = ({ className }: { className?: string }) => (
-    <svg className={className} xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'>
-        <path
-            fill='var(--text-less-prominent)'
-            fillRule='nonzero'
-            d='M8.87 2.164l5 5.5a.5.5 0 0 1 0 .672l-5 5.5a.5.5 0 0 1-.74-.672L12.824 8 8.13 2.836a.5.5 0 0 1 .74-.672zm-5 0l5 5.5a.5.5 0 0 1 0 .672l-5 5.5a.5.5 0 0 1-.74-.672L7.824 8 3.13 2.836a.5.5 0 1 1 .74-.672z'
-        />
-    </svg>
-);
-
 const Drawer = ({
     anchor = 'left',
     children,
@@ -75,7 +64,7 @@ const Drawer = ({
                 onClick={toggleDrawer}
             >
                 {isDesktop ? (
-                    <IconDrawer
+                    <LabelPairedChevronsRightCaptionRegularIcon
                         className={classNames('dc-drawer__toggle-icon', {
                             [`dc-drawer__toggle-icon--${anchor}`]: isDesktop,
                         })}
diff --git a/src/components/shared_ui/progress-slider-mobile/progress-slider-mobile.tsx b/src/components/shared_ui/progress-slider-mobile/progress-slider-mobile.tsx
index 49444622..cf47001a 100644
--- a/src/components/shared_ui/progress-slider-mobile/progress-slider-mobile.tsx
+++ b/src/components/shared_ui/progress-slider-mobile/progress-slider-mobile.tsx
@@ -43,7 +43,6 @@ const ProgressSliderMobile = ({
                         <RemainingTime end_time={expiry_time} getCardLabels={getCardLabels} start_time={server_time} />
                     </Text>
                     {is_loading || percentage < 1 ? (
-                        // TODO: Change this behavior in mobile
                         <div className='dc-progress-slider-mobile__infinite-loader'>
                             <div className='dc-progress-slider-mobile__infinite-loader--indeterminate' />
                         </div>
diff --git a/src/components/shared_ui/tabs/tabs.tsx b/src/components/shared_ui/tabs/tabs.tsx
index 7d75d5f8..95dc49cc 100644
--- a/src/components/shared_ui/tabs/tabs.tsx
+++ b/src/components/shared_ui/tabs/tabs.tsx
@@ -5,7 +5,6 @@ import ThemedScrollbars from '../themed-scrollbars/themed-scrollbars';
 import Tab from './tab';
 import './tabs.scss';
 
-// TODO: Remove this declaration after changing label to data-label in Tabs component
 declare module 'react' {
     interface HTMLAttributes<T> extends React.AriaAttributes, React.DOMAttributes<T> {
         label?: React.ReactNode;