diff --git a/package.json b/package.json
index fdcbb96fe1..7661c60d1c 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "@polkadot/types": "12.4.2",
     "@polkadot/util": "13.0.2",
     "@polkadot/util-crypto": "13.0.2",
+    "@radix-ui/react-checkbox": "^1.1.2",
     "@radix-ui/react-dialog": "1.1.2",
     "@radix-ui/react-dropdown-menu": "2.1.2",
     "@radix-ui/react-popover": "1.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 72b29cd7ae..2640edaa95 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,9 @@ importers:
       '@polkadot/util-crypto':
         specifier: 13.0.2
         version: 13.0.2(@polkadot/util@13.0.2)
+      '@radix-ui/react-checkbox':
+        specifier: ^1.1.2
+        version: 1.1.2(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-dialog':
         specifier: 1.1.2
         version: 1.1.2(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -2212,6 +2215,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-checkbox@1.1.2':
+    resolution: {integrity: sha512-/i0fl686zaJbDQLNKrkCbMyDm6FQMt4jg323k7HuqitoANm9sE23Ql8yOK3Wusk34HSLKDChhMux05FnP6KUkw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-collection@1.1.0':
     resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==}
     peerDependencies:
@@ -11411,7 +11427,7 @@ snapshots:
       '@types/node': 20.5.1
       chalk: 4.1.2
       cosmiconfig: 8.3.6(typescript@5.5.4)
-      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.5.4))(ts-node@10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@18.19.55)(typescript@5.5.4))(typescript@5.5.4)
+      cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.5.4))(ts-node@10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@20.5.1)(typescript@5.5.4))(typescript@5.5.4)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -12704,7 +12720,7 @@ snapshots:
   '@polkadot/x-randomvalues@13.0.2(@polkadot/util@13.0.2)(@polkadot/wasm-util@7.3.2(@polkadot/util@13.0.2))':
     dependencies:
       '@polkadot/util': 13.0.2
-      '@polkadot/wasm-util': 7.3.2(@polkadot/util@12.6.2)
+      '@polkadot/wasm-util': 7.3.2(@polkadot/util@13.0.2)
       '@polkadot/x-global': 13.0.2
       tslib: 2.7.0
 
@@ -12759,6 +12775,22 @@ snapshots:
       '@types/react': 18.0.14
       '@types/react-dom': 18.0.5
 
+  '@radix-ui/react-checkbox@1.1.2(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.14)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.0.14)(react@18.3.1)
+      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.0.14)(react@18.3.1)
+      '@radix-ui/react-use-previous': 1.1.0(@types/react@18.0.14)(react@18.3.1)
+      '@radix-ui/react-use-size': 1.1.0(@types/react@18.0.14)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.0.14
+      '@types/react-dom': 18.0.5
+
   '@radix-ui/react-collection@1.1.0(@types/react-dom@18.0.5)(@types/react@18.0.14)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.0.14)(react@18.3.1)
@@ -15894,11 +15926,11 @@ snapshots:
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.5.4))(ts-node@10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@18.19.55)(typescript@5.5.4))(typescript@5.5.4):
+  cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.5.4))(ts-node@10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@20.5.1)(typescript@5.5.4))(typescript@5.5.4):
     dependencies:
       '@types/node': 20.5.1
       cosmiconfig: 8.3.6(typescript@5.5.4)
-      ts-node: 10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@18.19.55)(typescript@5.5.4)
+      ts-node: 10.9.2(@swc/core@1.7.35(@swc/helpers@0.5.13))(@types/node@20.5.1)(typescript@5.5.4)
       typescript: 5.5.4
 
   cosmiconfig@7.1.0:
diff --git a/src/renderer/entities/governance/index.ts b/src/renderer/entities/governance/index.ts
index fd90a4275c..af09c7c353 100644
--- a/src/renderer/entities/governance/index.ts
+++ b/src/renderer/entities/governance/index.ts
@@ -30,6 +30,7 @@ export {
   getGroupPallet,
   getTrackIds,
   getTreasuryTrackDescription,
+  getTrackTitles,
 } from './lib/tracksService';
 
 export { createSubscriber } from './utils/createSubscriber';
@@ -43,6 +44,7 @@ export type {
   TransactionStandardVote,
 } from './types/voteTransaction';
 export type { Track } from './types/tracks';
+export type { VotesToRemove } from './types/tracks';
 export type { VoteHistoryRecord } from './model/voteHistory';
 
 export {
diff --git a/src/renderer/entities/governance/lib/tracksService.ts b/src/renderer/entities/governance/lib/tracksService.ts
index e05e98ff13..73b9353a64 100644
--- a/src/renderer/entities/governance/lib/tracksService.ts
+++ b/src/renderer/entities/governance/lib/tracksService.ts
@@ -34,3 +34,15 @@ export const getGroupPallet = (
 
   return tracksGroupId.length !== 0 && tracksGroupId.every((t) => tracksIds.includes(t)) ? 'primary' : 'secondary';
 };
+
+export const getTrackTitles = (trackIds: string[], allTracks: Track[], t: TFunction): string => {
+  const titles = allTracks.reduce<string[]>((titles, { id, value }) => {
+    if (trackIds.includes(id)) {
+      titles.push(t(value));
+    }
+
+    return titles;
+  }, []);
+
+  return titles.join(', ');
+};
diff --git a/src/renderer/entities/governance/types/tracks.ts b/src/renderer/entities/governance/types/tracks.ts
index 0d0d458104..1e22c542e9 100644
--- a/src/renderer/entities/governance/types/tracks.ts
+++ b/src/renderer/entities/governance/types/tracks.ts
@@ -1,5 +1,13 @@
+import { type Address, type ReferendumId } from '@/shared/core';
+
 export type Track = {
   id: string;
   value: string;
   description: string;
 };
+
+export type VotesToRemove = {
+  referendum: ReferendumId;
+  track: string;
+  voter: Address;
+};
diff --git a/src/renderer/features/governance/components/AccountsMultiSelector/AccountsMultiSelector.tsx b/src/renderer/features/governance/components/AccountsMultiSelector/AccountsMultiSelector.tsx
index 392dc57cd7..5659582ff2 100644
--- a/src/renderer/features/governance/components/AccountsMultiSelector/AccountsMultiSelector.tsx
+++ b/src/renderer/features/governance/components/AccountsMultiSelector/AccountsMultiSelector.tsx
@@ -3,7 +3,7 @@ import { Fragment, type ReactNode, useId } from 'react';
 
 import { useI18n } from '@/shared/i18n';
 import { cnTw } from '@/shared/lib/utils';
-import { CaptionText, Checkbox, FootnoteText, Icon, LabelText } from '@/shared/ui';
+import { CaptionText, FootnoteText, Icon, LabelText } from '@/shared/ui';
 import {
   OptionStyle,
   OptionStyleTheme,
@@ -14,6 +14,7 @@ import {
 } from '@/shared/ui/Dropdowns/common/constants';
 import { type DropdownResult, type Position, type Theme } from '@/shared/ui/Dropdowns/common/types';
 import { CommonInputStyles, CommonInputStylesTheme } from '@/shared/ui/Inputs/common/styles';
+import { Checkbox } from '@/shared/ui-kit';
 
 type DropdownOption<T = any> = {
   id: string;
@@ -147,7 +148,7 @@ export const AccountsMultiSelector = ({
                 <Checkbox
                   checked={optionsFlat.every((option) => selectedIds.includes(option.id))}
                   semiChecked={optionsFlat.some((option) => selectedIds.includes(option.id))}
-                  onChange={(event) => toggleAll(event.target.checked)}
+                  onChange={(checked) => toggleAll(checked)}
                 >
                   <FootnoteText className="text-body text-text-secondary">{t('balances.allAccounts')}</FootnoteText>
                 </Checkbox>
@@ -171,16 +172,15 @@ export const AccountsMultiSelector = ({
                   >
                     {({ selected }) => (
                       <div className="flex w-full justify-between gap-x-2">
-                        <Checkbox
-                          readOnly
-                          checked={selected}
+                        <div
                           className={cnTw(
                             'pointer-events-none w-full pl-4',
                             selected ? 'text-text-primary' : 'text-text-secondary',
                           )}
                         >
-                          {element}
-                        </Checkbox>
+                          <Checkbox checked={selected}>{element}</Checkbox>
+                        </div>
+
                         {additionalElement}
                       </div>
                     )}
@@ -242,18 +242,19 @@ const Group = ({ group, selectedIds, selectedOptions, theme, onChange }: PropsGr
           OptionStyleTheme[theme](false, isChecked),
         )}
       >
-        <Checkbox
-          className="w-full p-2 pl-6"
-          checked={isChecked}
-          semiChecked={list.some(({ id }) => selectedIds.includes(id))}
-          onChange={(event) => toggleGroup(event.target.checked)}
-        >
-          <div className="flex h-5 w-7.5 items-center justify-center rounded-2lg bg-input-background-disabled">
-            <CaptionText className="text-text-secondary">{list.length}</CaptionText>
-          </div>
-          <FootnoteText className="flex-1 text-text-tertiary">{groupName}</FootnoteText>
-          <FootnoteText className="text-text-secondary">{groupValue}</FootnoteText>
-        </Checkbox>
+        <div className="w-full p-2 pl-6">
+          <Checkbox
+            checked={isChecked}
+            semiChecked={list.some(({ id }) => selectedIds.includes(id))}
+            onChange={(checked) => toggleGroup(checked)}
+          >
+            <div className="flex h-5 w-7.5 items-center justify-center rounded-2lg bg-input-background-disabled">
+              <CaptionText className="text-text-secondary">{list.length}</CaptionText>
+            </div>
+            <FootnoteText className="flex-1 text-text-tertiary">{groupName}</FootnoteText>
+            <FootnoteText className="text-text-secondary">{groupValue}</FootnoteText>
+          </Checkbox>
+        </div>
       </div>
       <ul>
         {list.map(({ id, value, additionalElement, element }) => (
@@ -264,16 +265,14 @@ const Group = ({ group, selectedIds, selectedOptions, theme, onChange }: PropsGr
           >
             {({ selected }) => (
               <div className="flex w-full items-center justify-between gap-x-4">
-                <Checkbox
-                  readOnly
-                  checked={selected}
+                <div
                   className={cnTw(
                     'pointer-events-none w-full pl-8',
                     selected ? 'text-text-primary' : 'text-text-secondary',
                   )}
                 >
-                  {element}
-                </Checkbox>
+                  <Checkbox checked={selected}>{element}</Checkbox>
+                </div>
                 {additionalElement}
               </div>
             )}
diff --git a/src/renderer/features/staking/Validators/ui/Validators.tsx b/src/renderer/features/staking/Validators/ui/Validators.tsx
index 60999b8f0e..13851284c8 100644
--- a/src/renderer/features/staking/Validators/ui/Validators.tsx
+++ b/src/renderer/features/staking/Validators/ui/Validators.tsx
@@ -4,7 +4,8 @@ import { memo } from 'react';
 import { type Validator } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { cnTw } from '@/shared/lib/utils';
-import { BodyText, Button, Checkbox, Icon, Loader, SearchInput, Shimmering, SmallTitleText } from '@/shared/ui';
+import { BodyText, Button, Icon, Loader, SearchInput, Shimmering, SmallTitleText } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { ValidatorsTable } from '@/entities/staking';
 import { validatorsModel } from '../model/validators-model';
 
diff --git a/src/renderer/features/wallets/KeyConstructor/ui/KeyForm.tsx b/src/renderer/features/wallets/KeyConstructor/ui/KeyForm.tsx
index 107c415564..48d602e047 100644
--- a/src/renderer/features/wallets/KeyConstructor/ui/KeyForm.tsx
+++ b/src/renderer/features/wallets/KeyConstructor/ui/KeyForm.tsx
@@ -4,7 +4,8 @@ import { type FormEvent, useEffect, useMemo, useRef } from 'react';
 
 import { KeyType } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
-import { Button, Checkbox, FootnoteText, Input, InputHint, Select } from '@/shared/ui';
+import { Button, FootnoteText, Input, InputHint, Select } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { ChainTitle } from '@/entities/chain';
 import { networkModel } from '@/entities/network';
 import { constructorModel } from '../model/constructor-model';
@@ -112,7 +113,7 @@ export const KeyForm = () => {
           <Checkbox
             disabled={!isKeyTypeSharded}
             checked={isSharded?.value}
-            onChange={({ target }) => isSharded?.onChange(target.checked)}
+            onChange={(checked) => isSharded?.onChange(checked)}
           >
             {t('dynamicDerivations.constructor.shardedLabel')}
           </Checkbox>
diff --git a/src/renderer/features/wallets/ShardSelectorModal/ui/SelectableShard.tsx b/src/renderer/features/wallets/ShardSelectorModal/ui/SelectableShard.tsx
index 16d5ea4c4c..f464d83e3d 100644
--- a/src/renderer/features/wallets/ShardSelectorModal/ui/SelectableShard.tsx
+++ b/src/renderer/features/wallets/ShardSelectorModal/ui/SelectableShard.tsx
@@ -1,7 +1,8 @@
 import { type BaseAccount, type ChainAccount, type Explorer, type ShardAccount, type Wallet } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { cnTw, toAddress } from '@/shared/lib/utils';
-import { BodyText, Checkbox, HelpText, IconButton, Identicon, Truncate } from '@/shared/ui';
+import { BodyText, HelpText, IconButton, Identicon, Truncate } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { ExplorersPopover, accountUtils, walletUtils } from '@/entities/wallet';
 
 type Props = {
@@ -60,7 +61,7 @@ export const SelectableShard = ({
         'focus-within:bg-action-background-hover hover:bg-action-background-hover',
       )}
     >
-      <Checkbox checked={checked} semiChecked={semiChecked} onChange={(event) => onChange(event.target.checked)} />
+      <Checkbox checked={checked} semiChecked={semiChecked} onChange={(checked) => onChange(checked)} />
       <ExplorersPopover
         button={content}
         address={account.accountId}
diff --git a/src/renderer/features/wallets/ShardSelectorModal/ui/ShardedGroup.tsx b/src/renderer/features/wallets/ShardSelectorModal/ui/ShardedGroup.tsx
index 770fa2bcba..7bfe508ba4 100644
--- a/src/renderer/features/wallets/ShardSelectorModal/ui/ShardedGroup.tsx
+++ b/src/renderer/features/wallets/ShardSelectorModal/ui/ShardedGroup.tsx
@@ -1,8 +1,8 @@
 import { useUnit } from 'effector-react';
-import { type ChangeEvent } from 'react';
 
 import { type Chain, type ID, type ShardAccount } from '@/shared/core';
-import { Accordion, CaptionText, Checkbox, FootnoteText } from '@/shared/ui';
+import { Accordion, CaptionText, FootnoteText } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { selectorUtils } from '../lib/selector-utils';
 import { shardsModel } from '../model/shards-model';
 
@@ -18,12 +18,12 @@ export const ShardedGroup = ({ rootId, accounts, chain }: Props) => {
 
   const shardedGroup = selectedStructure[rootId][chain.chainId].sharded[accounts[0].groupId];
 
-  const toggleSharded = (event: ChangeEvent<HTMLInputElement>) => {
+  const toggleSharded = (checked: boolean) => {
     shardsModel.events.shardedToggled({
       root: rootId,
       chainId: chain.chainId,
       groupId: accounts[0].groupId,
-      value: event.target.checked,
+      value: checked,
     });
   };
 
@@ -40,17 +40,18 @@ export const ShardedGroup = ({ rootId, accounts, chain }: Props) => {
   return (
     <Accordion className="ml-6 w-auto rounded">
       <div className="flex rounded hover:bg-action-background-hover">
-        <Checkbox
-          className="w-full p-2"
-          checked={selectorUtils.isChecked(shardedGroup)}
-          semiChecked={selectorUtils.isSemiChecked(shardedGroup)}
-          onChange={toggleSharded}
-        >
-          <div className="flex h-5 w-7.5 items-center justify-center rounded-2lg bg-input-background-disabled">
-            <CaptionText className="text-text-secondary">{accounts.length}</CaptionText>
-          </div>
-          <FootnoteText className="text-text-tertiary">{accounts[0].name}</FootnoteText>
-        </Checkbox>
+        <div className="w-full p-2">
+          <Checkbox
+            checked={selectorUtils.isChecked(shardedGroup)}
+            semiChecked={selectorUtils.isSemiChecked(shardedGroup)}
+            onChange={toggleSharded}
+          >
+            <div className="flex h-5 w-7.5 items-center justify-center rounded-2lg bg-input-background-disabled">
+              <CaptionText className="text-text-secondary">{accounts.length}</CaptionText>
+            </div>
+            <FootnoteText className="text-text-tertiary">{accounts[0].name}</FootnoteText>
+          </Checkbox>
+        </div>
 
         <Accordion.Button buttonClass="ml-auto w-auto p-2" />
       </div>
diff --git a/src/renderer/features/wallets/ShardSelectorModal/ui/ShardsStructure.tsx b/src/renderer/features/wallets/ShardSelectorModal/ui/ShardsStructure.tsx
index c1aafcce85..479bb58a9e 100644
--- a/src/renderer/features/wallets/ShardSelectorModal/ui/ShardsStructure.tsx
+++ b/src/renderer/features/wallets/ShardSelectorModal/ui/ShardsStructure.tsx
@@ -3,7 +3,8 @@ import { useUnit } from 'effector-react';
 import { type AccountId, type ChainId, type ID } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { RootExplorers } from '@/shared/lib/utils';
-import { Accordion, Checkbox, FootnoteText } from '@/shared/ui';
+import { Accordion, FootnoteText } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { ChainTitle } from '@/entities/chain';
 import { networkModel } from '@/entities/network';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
@@ -38,7 +39,7 @@ export const ShardsStructure = () => {
           <Checkbox
             checked={isAllChecked}
             semiChecked={isAllSemiChecked}
-            onChange={(event) => shardsModel.events.allToggled(event.target.checked)}
+            onChange={(checked) => shardsModel.events.allToggled(checked)}
           >
             {t('balances.allAccounts')}
           </Checkbox>
@@ -62,18 +63,19 @@ export const ShardsStructure = () => {
               <li key={chainId}>
                 <Accordion isDefaultOpen className="ml-6 w-auto rounded">
                   <div className="flex hover:bg-action-background-hover">
-                    <Checkbox
-                      checked={selectorUtils.isChecked(selectedStructure[root.id][chainId])}
-                      semiChecked={selectorUtils.isSemiChecked(selectedStructure[root.id][chainId])}
-                      className="w-full p-2"
-                      onChange={(value) => toggleChain(root.id, chainId, value.target.checked)}
-                    >
-                      <ChainTitle chain={chains[chainId]} fontClass="text-text-primary" />
-                      <FootnoteText className="text-text-tertiary">
-                        {/* eslint-disable-next-line i18next/no-literal-string */}
-                        {selectedStructure[root.id][chainId].checked} / {selectedStructure[root.id][chainId].total}
-                      </FootnoteText>
-                    </Checkbox>
+                    <div className="w-full p-2">
+                      <Checkbox
+                        checked={selectorUtils.isChecked(selectedStructure[root.id][chainId])}
+                        semiChecked={selectorUtils.isSemiChecked(selectedStructure[root.id][chainId])}
+                        onChange={(checked) => toggleChain(root.id, chainId, checked)}
+                      >
+                        <ChainTitle chain={chains[chainId]} fontClass="text-text-primary" />
+                        <FootnoteText className="text-text-tertiary">
+                          {/* eslint-disable-next-line i18next/no-literal-string */}
+                          {selectedStructure[root.id][chainId].checked} / {selectedStructure[root.id][chainId].total}
+                        </FootnoteText>
+                      </Checkbox>
+                    </div>
                     <Accordion.Button buttonClass="ml-auto w-auto p-2" />
                   </div>
                   <Accordion.Content as="ul">
diff --git a/src/renderer/pages/Basket/ui/Basket.tsx b/src/renderer/pages/Basket/ui/Basket.tsx
index dce829f12c..636070bad2 100644
--- a/src/renderer/pages/Basket/ui/Basket.tsx
+++ b/src/renderer/pages/Basket/ui/Basket.tsx
@@ -2,7 +2,8 @@ import { useUnit } from 'effector-react';
 import { useEffect } from 'react';
 
 import { useI18n } from '@/shared/i18n';
-import { Button, Checkbox, ConfirmModal, FootnoteText, Header, Icon, SmallTitleText } from '@/shared/ui';
+import { Button, ConfirmModal, FootnoteText, Header, Icon, SmallTitleText } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { BasketFilter, basketFilterModel } from '@/features/basket';
 import { basketPageUtils } from '../lib/basket-page-utils';
 import { basketPageModel } from '../model/basket-page-model';
@@ -47,16 +48,17 @@ export const Basket = () => {
         <>
           <div className="mt-4 flex w-full flex-col items-center gap-4">
             <div className="flex w-[736px] items-center justify-between">
-              <Checkbox
-                className="ml-3"
-                checked={basketTxs.length === selectedTxs.length}
-                semiChecked={selectedTxs.length > 0 && basketTxs.length !== selectedTxs.length}
-                onChange={() => basketPageModel.events.allSelected()}
-              >
-                <FootnoteText className="text-text-secondary">
-                  {t('basket.selectedStatus', { count: basketTxs.length, selected: selectedTxs.length })}
-                </FootnoteText>
-              </Checkbox>
+              <div className="ml-3">
+                <Checkbox
+                  checked={basketTxs.length === selectedTxs.length}
+                  semiChecked={selectedTxs.length > 0 && basketTxs.length !== selectedTxs.length}
+                  onChange={() => basketPageModel.events.allSelected()}
+                >
+                  <FootnoteText className="text-text-secondary">
+                    {t('basket.selectedStatus', { count: basketTxs.length, selected: selectedTxs.length })}
+                  </FootnoteText>
+                </Checkbox>
+              </div>
 
               <div className="flex items-center gap-4">
                 <Button variant="text" size="sm" onClick={() => basketPageModel.events.refreshValidationStarted()}>
diff --git a/src/renderer/pages/Staking/ui/NominatorItem.tsx b/src/renderer/pages/Staking/ui/NominatorItem.tsx
index 379a7d5ab8..a35a47d0f6 100644
--- a/src/renderer/pages/Staking/ui/NominatorItem.tsx
+++ b/src/renderer/pages/Staking/ui/NominatorItem.tsx
@@ -4,7 +4,8 @@ import { type ReactNode } from 'react';
 import { type Account, type Address, type Asset, type Explorer } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { cnTw } from '@/shared/lib/utils';
-import { Checkbox, FootnoteText, Icon, IconButton, Plate, Shimmering } from '@/shared/ui';
+import { FootnoteText, Icon, IconButton, Plate, Shimmering } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { AssetFiatBalance } from '@/entities/price';
 import { ExplorersPopover, walletModel, walletUtils } from '@/entities/wallet';
@@ -40,14 +41,15 @@ export const NominatorsItem = ({
   return (
     <Plate className="grid grid-cols-[1fr,104px,104px,20px] items-center gap-x-6">
       {activeWallet && !walletUtils.isWatchOnly(activeWallet) && nominatorsLength > 1 ? (
-        <Checkbox
-          className="w-full"
-          disabled={isStakingLoading}
-          checked={stake.isSelected}
-          onChange={(event) => onToggleNominator(stake.address, event.target?.checked)}
-        >
-          <div className="grid w-full max-w-[207px] grid-cols-[minmax(10px,1fr),auto]">{content}</div>
-        </Checkbox>
+        <div className="w-full">
+          <Checkbox
+            disabled={isStakingLoading}
+            checked={stake.isSelected}
+            onChange={(checked) => onToggleNominator(stake.address, checked)}
+          >
+            <div className="grid w-full max-w-[207px] grid-cols-[minmax(10px,1fr),auto]">{content}</div>
+          </Checkbox>
+        </div>
       ) : (
         <div className="grid max-w-[222px] grid-cols-[minmax(10px,1fr),auto] items-center gap-x-2">{content}</div>
       )}
diff --git a/src/renderer/pages/Staking/ui/ShardedList.tsx b/src/renderer/pages/Staking/ui/ShardedList.tsx
index 242c069637..5a8777072b 100644
--- a/src/renderer/pages/Staking/ui/ShardedList.tsx
+++ b/src/renderer/pages/Staking/ui/ShardedList.tsx
@@ -4,7 +4,8 @@ import { Trans } from 'react-i18next';
 import { type Address, type Asset, type Explorer } from '@/shared/core';
 import { type ShardAccount } from '@/shared/core/types/account';
 import { useI18n } from '@/shared/i18n';
-import { Accordion, Checkbox, FootnoteText, Plate, Shimmering, Tooltip } from '@/shared/ui';
+import { Accordion, FootnoteText, Plate, Shimmering, Tooltip } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { AssetFiatBalance } from '@/entities/price';
 import { useStakingData } from '@/entities/staking';
@@ -69,64 +70,65 @@ export const ShardedList = ({
       <Accordion className="w-auto">
         <div className="flex rounded-md border-b border-divider px-3 py-2 transition-colors hover:bg-action-background-hover">
           <Accordion.Button buttonClass="ml-auto w-auto" iconOpened="shelfDown" iconClosed="shelfRight" />
-          <Checkbox
-            className="w-full p-2"
-            checked={shardsStats.selected === shardsStake.length}
-            semiChecked={shardsStats.selected > 0 && shardsStats.selected < shardsStake.length}
-            onChange={(event) => selectAllShards(event.target?.checked)}
-          >
-            <div className="grid grid-cols-[174px,104px,104px] items-center gap-x-6">
-              <div className="flex items-center gap-x-2">
-                <FootnoteText className="h-5 rounded-full bg-input-background-disabled px-2 py-px text-text-secondary">
-                  {shardsStake.length}
-                </FootnoteText>
-                <FootnoteText className="truncate text-text-secondary first-letter:uppercase">
-                  {shardsStake[0].account.name}
-                </FootnoteText>
-                <Tooltip
-                  offsetPx={-60}
-                  content={
-                    <Trans
-                      t={t}
-                      i18nKey="staking.tooltips.redeemAndUnstake"
-                      values={{ countUnstake: shardsStats.unstaking, countWithdraw: shardsStats.withdraw }}
-                    />
-                  }
-                >
-                  <div className="flex items-center gap-x-1">
-                    {Boolean(shardsStats.unstaking) && <span className="h-1.5 w-1.5 rounded-full bg-icon-accent" />}
-                    {Boolean(shardsStats.withdraw) && <span className="h-1.5 w-1.5 rounded-full bg-icon-positive" />}
-                  </div>
-                </Tooltip>
+          <div className="w-full p-2">
+            <Checkbox
+              checked={shardsStats.selected === shardsStake.length}
+              semiChecked={shardsStats.selected > 0 && shardsStats.selected < shardsStake.length}
+              onChange={(checked) => selectAllShards(checked)}
+            >
+              <div className="grid grid-cols-[174px,104px,104px] items-center gap-x-6">
+                <div className="flex items-center gap-x-2">
+                  <FootnoteText className="h-5 rounded-full bg-input-background-disabled px-2 py-px text-text-secondary">
+                    {shardsStake.length}
+                  </FootnoteText>
+                  <FootnoteText className="truncate text-text-secondary first-letter:uppercase">
+                    {shardsStake[0].account.name}
+                  </FootnoteText>
+                  <Tooltip
+                    offsetPx={-60}
+                    content={
+                      <Trans
+                        t={t}
+                        i18nKey="staking.tooltips.redeemAndUnstake"
+                        values={{ countUnstake: shardsStats.unstaking, countWithdraw: shardsStats.withdraw }}
+                      />
+                    }
+                  >
+                    <div className="flex items-center gap-x-1">
+                      {Boolean(shardsStats.unstaking) && <span className="h-1.5 w-1.5 rounded-full bg-icon-accent" />}
+                      {Boolean(shardsStats.withdraw) && <span className="h-1.5 w-1.5 rounded-full bg-icon-positive" />}
+                    </div>
+                  </Tooltip>
+                </div>
+                <div className="flex flex-col items-end gap-y-0.5 justify-self-end">
+                  {!shardsStake[0]?.totalStake || !asset ? (
+                    <>
+                      <Shimmering width={82} height={15} />
+                      <Shimmering width={56} height={10} />
+                    </>
+                  ) : (
+                    <>
+                      <AssetBalance value={shardsStats.totalStake.toString()} asset={asset} />
+                      <AssetFiatBalance amount={shardsStats.totalStake.toString()} asset={asset} />
+                    </>
+                  )}
+                </div>
+                <div className="flex flex-col items-end gap-y-0.5 justify-self-end">
+                  {!shardsStake[0]?.totalReward || !asset ? (
+                    <>
+                      <Shimmering width={82} height={15} />
+                      <Shimmering width={56} height={10} />
+                    </>
+                  ) : (
+                    <>
+                      <AssetBalance value={shardsStats.totalReward.toString()} asset={asset} />
+                      <AssetFiatBalance amount={shardsStats.totalReward.toString()} asset={asset} />
+                    </>
+                  )}
+                </div>
               </div>
-              <div className="flex flex-col items-end gap-y-0.5 justify-self-end">
-                {!shardsStake[0]?.totalStake || !asset ? (
-                  <>
-                    <Shimmering width={82} height={15} />
-                    <Shimmering width={56} height={10} />
-                  </>
-                ) : (
-                  <>
-                    <AssetBalance value={shardsStats.totalStake.toString()} asset={asset} />
-                    <AssetFiatBalance amount={shardsStats.totalStake.toString()} asset={asset} />
-                  </>
-                )}
-              </div>
-              <div className="flex flex-col items-end gap-y-0.5 justify-self-end">
-                {!shardsStake[0]?.totalReward || !asset ? (
-                  <>
-                    <Shimmering width={82} height={15} />
-                    <Shimmering width={56} height={10} />
-                  </>
-                ) : (
-                  <>
-                    <AssetBalance value={shardsStats.totalReward.toString()} asset={asset} />
-                    <AssetFiatBalance amount={shardsStats.totalReward.toString()} asset={asset} />
-                  </>
-                )}
-              </div>
-            </div>
-          </Checkbox>
+            </Checkbox>
+          </div>
         </div>
 
         <Accordion.Content>
diff --git a/src/renderer/shared/assets/images/chevron/checked.svg b/src/renderer/shared/assets/images/chevron/checked.svg
new file mode 100644
index 0000000000..b13549b5d8
--- /dev/null
+++ b/src/renderer/shared/assets/images/chevron/checked.svg
@@ -0,0 +1,7 @@
+
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Controls">
+<rect id="Rectangle" width="16" height="16" rx="4" />
+<path id="Vector 304 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M13.9571 3.54289C14.3476 3.93342 14.3476 4.56658 13.9571 4.95711L6.45711 12.4571C6.26957 12.6446 6.01522 12.75 5.75 12.75C5.48478 12.75 5.23043 12.6446 5.04289 12.4571L2.04289 9.45711C1.65237 9.06658 1.65237 8.43342 2.04289 8.04289C2.43342 7.65237 3.06658 7.65237 3.45711 8.04289L5.75 10.3358L12.5429 3.54289C12.9334 3.15237 13.5666 3.15237 13.9571 3.54289Z" fill="currentColor"/>
+</g>
+</svg>
diff --git a/src/renderer/shared/assets/images/chevron/semiChecked.svg b/src/renderer/shared/assets/images/chevron/semiChecked.svg
new file mode 100644
index 0000000000..05cd0e6c31
--- /dev/null
+++ b/src/renderer/shared/assets/images/chevron/semiChecked.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Controls">
+<rect id="Rectangle" width="16" height="16" rx="4"/>
+<path id="Line" fill-rule="evenodd" clip-rule="evenodd" d="M1.5 8C1.5 7.44772 1.94772 7 2.5 7H13.5C14.0523 7 14.5 7.44772 14.5 8C14.5 8.55228 14.0523 9 13.5 9H2.5C1.94772 9 1.5 8.55228 1.5 8Z" fill="currentColor"/>
+</g>
+</svg>
diff --git a/src/renderer/shared/i18n/locales/en.json b/src/renderer/shared/i18n/locales/en.json
index 5ab25211f7..2bc2dd84cd 100644
--- a/src/renderer/shared/i18n/locales/en.json
+++ b/src/renderer/shared/i18n/locales/en.json
@@ -511,8 +511,10 @@
       "viewDelegationButton": "View delegations",
       "viewSummary": "View summary",
       "votedAllTime": "Voted for all time",
-      "votedTracksDescription": "You cannot delegate on some tracks because you have existing votes on those tracks. Please remove those votes in order to delegate on those tracks.",
+      "votedTracksDescription": "You cannot delegate on: { tracks } tracks because you have existing votes on those tracks. Please remove those votes in order to delegate on those tracks.",
       "votedTracksTitle": "You cannot delegate on some tracks",
+      "delegatedTracksTitle": "Some tracks are unavailable for delegation",
+      "delegatedTracksDescription": "{ tracks } tracks are unavailable for delegation because they are already delegated to another delegate. Please revoke the current delegation in order to delegate on those tracks.",
       "votesLabel": "Voting power",
       "votesValue": "<votes /> votes",
       "walletTypeRestrictionError": "You can't add a delegation in that wallet type",
diff --git a/src/renderer/shared/ui-kit/Checkbox/Checkbox.css b/src/renderer/shared/ui-kit/Checkbox/Checkbox.css
new file mode 100644
index 0000000000..6b350fd2ac
--- /dev/null
+++ b/src/renderer/shared/ui-kit/Checkbox/Checkbox.css
@@ -0,0 +1,5 @@
+.checkbox::-webkit-outer-spin-button,
+.checkbox::-webkit-inner-spin-button {
+  appearance: none;
+  margin: 0;
+}
diff --git a/src/renderer/shared/ui-kit/Checkbox/Checkbox.stories.tsx b/src/renderer/shared/ui-kit/Checkbox/Checkbox.stories.tsx
new file mode 100644
index 0000000000..4036402b41
--- /dev/null
+++ b/src/renderer/shared/ui-kit/Checkbox/Checkbox.stories.tsx
@@ -0,0 +1,64 @@
+import { type Meta, type StoryObj } from '@storybook/react';
+import { useState } from 'react';
+
+import { Box } from '../Box/Box';
+
+import { Checkbox } from './Checkbox';
+
+const meta: Meta<typeof Checkbox> = {
+  title: 'Design System/kit/Checkbox',
+  component: Checkbox,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Checkbox>;
+
+export const Default: Story = {
+  render(args) {
+    const [checked, onToggle] = useState(false);
+
+    return (
+      <Checkbox {...args} checked={checked} onChange={(checked) => onToggle(checked)}>
+        Checkbox
+      </Checkbox>
+    );
+  },
+};
+
+export const Variants: Story = {
+  render() {
+    return (
+      <Box gap={2}>
+        <Checkbox checked={true}>Checked</Checkbox>
+        <Checkbox semiChecked={true}>Semi checked</Checkbox>
+        <Checkbox disabled={true}>Disabled</Checkbox>
+        <Checkbox disabled={true} checked={true}>
+          Disabled checked
+        </Checkbox>
+      </Box>
+    );
+  },
+};
+export const Position: Story = {
+  render() {
+    return (
+      <Box gap={2}>
+        <Checkbox checked={true} checkboxPosition="center">
+          Checkbox long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long textlong text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text
+        </Checkbox>
+        <Checkbox checked={true} checkboxPosition="top">
+          Checkbox long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long textlong text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text long text long text
+          long text long text long text long text long text long text long text long text long text
+        </Checkbox>
+      </Box>
+    );
+  },
+};
diff --git a/src/renderer/shared/ui-kit/Checkbox/Checkbox.tsx b/src/renderer/shared/ui-kit/Checkbox/Checkbox.tsx
new file mode 100644
index 0000000000..1979e5435b
--- /dev/null
+++ b/src/renderer/shared/ui-kit/Checkbox/Checkbox.tsx
@@ -0,0 +1,60 @@
+import * as CheckboxItem from '@radix-ui/react-checkbox';
+import { type PropsWithChildren } from 'react';
+
+import { cnTw } from '@/shared/lib/utils';
+import './Checkbox.css';
+import { Icon } from '@/shared/ui/Icon/Icon';
+import { LabelText } from '@/shared/ui/Typography';
+
+type Props = {
+  checked?: boolean;
+  semiChecked?: boolean;
+  disabled?: boolean;
+  checkboxPosition?: 'center' | 'top';
+  onChange?: (checked: boolean, semiChecked?: boolean) => void;
+};
+
+export const Checkbox = ({
+  checked,
+  semiChecked,
+  disabled,
+  checkboxPosition = 'center',
+  children,
+  onChange,
+}: PropsWithChildren<Props>) => {
+  const checkedState = checked ? true : semiChecked ? 'indeterminate' : false;
+  const iconColor = disabled ? 'text-filter-border' : 'text-white';
+
+  const handleChange = (checked: boolean | 'indeterminate') => {
+    if (!onChange) return;
+    const semiChecked = checked === 'indeterminate';
+
+    onChange(!semiChecked && checked, semiChecked);
+  };
+
+  return (
+    <LabelText className={cnTw('flex gap-x-2', disabled ? 'text-text-tertiary' : 'text-inherit hover:cursor-pointer')}>
+      <CheckboxItem.Root
+        checked={checkedState}
+        className={cnTw(
+          'relative flex h-4 w-4 shrink-0',
+          'checkbox items-center justify-center rounded border border-filter-border bg-button-text',
+          (checked || semiChecked) && 'border-0 border-icon-accent-default bg-icon-accent',
+          'hover:shadow-card-shadow hover:checked:bg-icon-accent-default',
+          'disabled:border disabled:border-filter-border disabled:bg-main-app-background disabled:checked:bg-main-app-background',
+          !disabled && 'hover:cursor-pointer',
+          checkboxPosition === 'center' && 'self-center',
+          checkboxPosition === 'top' && 'self-top mt-1',
+        )}
+        disabled={disabled}
+        onCheckedChange={handleChange}
+      >
+        <CheckboxItem.Indicator>
+          {checked && <Icon name="checked" size={16} className={iconColor} />}
+          {!checked && semiChecked && <Icon name="semiChecked" size={16} className={iconColor} />}
+        </CheckboxItem.Indicator>
+      </CheckboxItem.Root>
+      {Boolean(children) && children}
+    </LabelText>
+  );
+};
diff --git a/src/renderer/shared/ui-kit/Dropdown/Dropdown.tsx b/src/renderer/shared/ui-kit/Dropdown/Dropdown.tsx
index ca770c55a6..813e9a8175 100644
--- a/src/renderer/shared/ui-kit/Dropdown/Dropdown.tsx
+++ b/src/renderer/shared/ui-kit/Dropdown/Dropdown.tsx
@@ -3,7 +3,7 @@ import { type PropsWithChildren, type ReactNode, createContext, useContext, useM
 
 import { type XOR } from '@/shared/core';
 import { cnTw } from '@/shared/lib/utils';
-import { Checkbox } from '@/shared/ui/Checkbox/Checkbox';
+import { Checkbox } from '../Checkbox/Checkbox';
 import { ScrollArea } from '../ScrollArea/ScrollArea';
 import { Surface } from '../Surface/Surface';
 import { useTheme } from '../Theme/useTheme';
diff --git a/src/renderer/shared/ui-kit/index.ts b/src/renderer/shared/ui-kit/index.ts
index e34ed81025..ebfe076c42 100644
--- a/src/renderer/shared/ui-kit/index.ts
+++ b/src/renderer/shared/ui-kit/index.ts
@@ -13,3 +13,4 @@ export { Slider } from './Slider/Slider';
 export { Label } from './Label/Label';
 export { Modal } from './Modal/Modal';
 export { Box } from './Box/Box';
+export { Checkbox } from './Checkbox/Checkbox';
diff --git a/src/renderer/shared/ui/Checkbox/Checkbox.css b/src/renderer/shared/ui/Checkbox/Checkbox.css
deleted file mode 100644
index e096713ab0..0000000000
--- a/src/renderer/shared/ui/Checkbox/Checkbox.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.checkbox:checked::before {
-  display: block;
-  width: 100%;
-  content: '✓';
-  color: inherit;
-  font-weight: bold;
-  font-size: 14px;
-  line-height: 16px;
-  text-align: center;
-}
-
-input.checkbox.semi-checked::before {
-  display: block;
-  width: 100%;
-  content: '-';
-  color: inherit;
-  font-weight: bold;
-  font-size: 14px;
-  line-height: 16px;
-  text-align: center;
-}
-
-.checkbox::-webkit-outer-spin-button,
-.checkbox::-webkit-inner-spin-button {
-  appearance: none;
-  margin: 0;
-}
diff --git a/src/renderer/shared/ui/Checkbox/Checkbox.stories.tsx b/src/renderer/shared/ui/Checkbox/Checkbox.stories.tsx
deleted file mode 100644
index c6c637517b..0000000000
--- a/src/renderer/shared/ui/Checkbox/Checkbox.stories.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { type Meta, type StoryFn } from '@storybook/react';
-
-import { Checkbox } from './Checkbox';
-
-export default {
-  title: 'Checkbox',
-  component: Checkbox,
-  parameters: { actions: { argTypesRegex: '^on.*' } },
-} as Meta<typeof Checkbox>;
-
-const Template: StoryFn<typeof Checkbox> = (args) => <Checkbox {...args} />;
-
-export const Primary = Template.bind({});
-Primary.args = {
-  children: 'Checkbox',
-};
-
-export const Left = Template.bind({});
-Left.args = {
-  position: 'left',
-  children: 'Checkbox',
-};
-
-export const Disabled = Template.bind({});
-Disabled.args = {
-  children: 'Checkbox',
-  disabled: true,
-};
diff --git a/src/renderer/shared/ui/Checkbox/Checkbox.test.tsx b/src/renderer/shared/ui/Checkbox/Checkbox.test.tsx
deleted file mode 100644
index 55c1ca2346..0000000000
--- a/src/renderer/shared/ui/Checkbox/Checkbox.test.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { render, screen } from '@testing-library/react';
-
-import { Checkbox } from './Checkbox';
-
-describe('ui/Checkbox', () => {
-  test('should render component', () => {
-    render(<Checkbox>test label</Checkbox>);
-
-    const label = screen.getByText('test label');
-    expect(label).toBeInTheDocument();
-  });
-
-  test('should toggle check state', () => {
-    let isChecked = false;
-    const toggleCheck = jest.fn().mockImplementation(() => {
-      isChecked = !isChecked;
-    });
-
-    const { rerender } = render(
-      <Checkbox checked={isChecked} onChange={toggleCheck}>
-        test label
-      </Checkbox>,
-    );
-
-    let input = screen.getByRole('checkbox');
-    expect(input).not.toBeChecked();
-
-    input.click();
-
-    rerender(<Checkbox checked={isChecked}>test label</Checkbox>);
-
-    input = screen.getByRole('checkbox');
-    expect(input).toBeChecked();
-    expect(toggleCheck).toHaveBeenCalled();
-    expect(isChecked).toEqual(true);
-  });
-});
diff --git a/src/renderer/shared/ui/Checkbox/Checkbox.tsx b/src/renderer/shared/ui/Checkbox/Checkbox.tsx
deleted file mode 100644
index a4e493e584..0000000000
--- a/src/renderer/shared/ui/Checkbox/Checkbox.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { type ChangeEvent, type PropsWithChildren } from 'react';
-
-import { cnTw } from '@/shared/lib/utils';
-import { LabelText } from '../Typography';
-import './Checkbox.css';
-
-type Props = {
-  position?: 'right' | 'left';
-  checked?: boolean;
-  semiChecked?: boolean;
-  disabled?: boolean;
-  readOnly?: boolean;
-  className?: string;
-  onChange?: (event: ChangeEvent<HTMLInputElement>, semiChecked?: boolean) => void;
-  tabIndex?: number;
-};
-
-export const Checkbox = ({
-  checked,
-  semiChecked,
-  position = 'right',
-  disabled,
-  readOnly,
-  className = 'text-text-primary',
-  children,
-  onChange,
-  tabIndex,
-}: PropsWithChildren<Props>) => (
-  <LabelText className={cnTw('flex items-center gap-x-2', !disabled && 'hover:cursor-pointer', className)}>
-    {Boolean(children) && position === 'left' && children}
-    <input
-      type="checkbox"
-      name="checkbox"
-      disabled={disabled}
-      readOnly={readOnly}
-      checked={checked}
-      className={cnTw(
-        'checkbox relative h-4 w-4 shrink-0 appearance-none text-white outline-offset-1',
-        'rounded border border-filter-border bg-button-text',
-        'checked:border-0 checked:border-icon-accent-default checked:bg-icon-accent checked:active:border',
-        !checked && semiChecked && 'semi-checked border-0 border-icon-accent-default bg-icon-accent focus:border',
-        'hover:shadow-card-shadow hover:checked:bg-icon-accent-default',
-        'disabled:bg-main-app-background disabled:text-filter-border disabled:checked:bg-main-app-background',
-        !disabled && 'hover:cursor-pointer',
-      )}
-      tabIndex={tabIndex}
-      onChange={onChange}
-    />
-    {Boolean(children) && position === 'right' && children}
-  </LabelText>
-);
diff --git a/src/renderer/shared/ui/Dropdowns/MultiSelect/MultiSelect.tsx b/src/renderer/shared/ui/Dropdowns/MultiSelect/MultiSelect.tsx
index b8f39fe566..a2ab03fd51 100644
--- a/src/renderer/shared/ui/Dropdowns/MultiSelect/MultiSelect.tsx
+++ b/src/renderer/shared/ui/Dropdowns/MultiSelect/MultiSelect.tsx
@@ -2,7 +2,7 @@ import { Listbox, Transition } from '@headlessui/react';
 import { Fragment, useId } from 'react';
 
 import { cnTw } from '@/shared/lib/utils';
-import { Checkbox } from '../../Checkbox/Checkbox';
+import { Checkbox } from '@/shared/ui-kit';
 import { Icon } from '../../Icon/Icon';
 import { CommonInputStyles, CommonInputStylesTheme } from '../../Inputs/common/styles';
 import { CaptionText, FootnoteText, LabelText } from '../../Typography';
@@ -115,16 +115,14 @@ export const MultiSelect = ({
                   className={({ active }) => cnTw(OptionStyle, OptionStyleTheme[theme](active, false))}
                 >
                   {({ selected }) => (
-                    <Checkbox
-                      readOnly
-                      checked={selected}
+                    <div
                       className={cnTw(
                         'pointer-events-none w-full',
                         selected ? 'text-text-primary' : 'text-text-secondary',
                       )}
                     >
-                      {element}
-                    </Checkbox>
+                      <Checkbox checked={selected}>{element}</Checkbox>
+                    </div>
                   )}
                 </Listbox.Option>
               ))}
diff --git a/src/renderer/shared/ui/Icon/data/chevron.tsx b/src/renderer/shared/ui/Icon/data/chevron.tsx
index 05049203dd..5a4dcf3dcd 100644
--- a/src/renderer/shared/ui/Icon/data/chevron.tsx
+++ b/src/renderer/shared/ui/Icon/data/chevron.tsx
@@ -1,8 +1,10 @@
 /* eslint-disable import-x/max-dependencies */
 
+import CheckedImg, { ReactComponent as CheckedSvg } from '@/shared/assets/images/chevron/checked.svg';
 import DownImg, { ReactComponent as DownSvg } from '@/shared/assets/images/chevron/down.svg';
 import LeftImg, { ReactComponent as LeftSvg } from '@/shared/assets/images/chevron/left.svg';
 import RightImg, { ReactComponent as RightSvg } from '@/shared/assets/images/chevron/right.svg';
+import SemiCheckedImg, { ReactComponent as SemiCheckedSvg } from '@/shared/assets/images/chevron/semiChecked.svg';
 import ShelfDownImg, { ReactComponent as ShelfDownSvg } from '@/shared/assets/images/chevron/shelfDown.svg';
 import ShelfRightImg, { ReactComponent as ShelfRightSvg } from '@/shared/assets/images/chevron/shelfRight.svg';
 import UpImg, { ReactComponent as UpSvg } from '@/shared/assets/images/chevron/up.svg';
@@ -14,6 +16,8 @@ const ChevronImages = {
   left: { svg: LeftSvg, img: LeftImg },
   shelfDown: { svg: ShelfDownSvg, img: ShelfDownImg },
   shelfRight: { svg: ShelfRightSvg, img: ShelfRightImg },
+  checked: { svg: CheckedSvg, img: CheckedImg },
+  semiChecked: { svg: SemiCheckedSvg, img: SemiCheckedImg },
 } as const;
 
 export type Chevron = keyof typeof ChevronImages;
diff --git a/src/renderer/shared/ui/Markdown/Markdown.tsx b/src/renderer/shared/ui/Markdown/Markdown.tsx
index 80498cbc7a..06136f7dca 100644
--- a/src/renderer/shared/ui/Markdown/Markdown.tsx
+++ b/src/renderer/shared/ui/Markdown/Markdown.tsx
@@ -1,12 +1,12 @@
-import { useState } from 'react';
+import { type ChangeEvent, useState } from 'react';
 import ReactMarkdown, { type Components, type Options } from 'react-markdown';
 import rehypeRaw from 'rehype-raw';
 import remarkGfm from 'remark-gfm';
 
 import { useI18n } from '@/shared/i18n';
 import { cnTw } from '@/shared/lib/utils';
+import { Checkbox } from '@/shared/ui-kit';
 import { Button } from '../Buttons';
-import { Checkbox } from '../Checkbox/Checkbox';
 import { Icon } from '../Icon/Icon';
 import { InfoLink } from '../InfoLink/InfoLink';
 import { BodyText } from '../Typography';
@@ -67,7 +67,26 @@ const components: Components = {
     <BodyText as="p" className={cnTw('overflow-hidden overflow-ellipsis text-balance', className)} {...props} />
   ),
   hr: () => <hr className="bg-current" />,
-  input: ({ node: _, type, ...props }) => (type === 'checkbox' ? <Checkbox {...props} /> : <input {...props} />),
+  input: ({ node: _, type, ...props }) =>
+    type === 'checkbox' ? (
+      <Checkbox
+        {...props}
+        onChange={(newCheckedState: boolean) => {
+          if (typeof props.onChange === 'function') {
+            // Simulate a ChangeEvent for props.onChange to fit types
+            const event = {
+              target: {
+                checked: newCheckedState,
+              },
+            } as ChangeEvent<HTMLInputElement>;
+
+            props.onChange(event);
+          }
+        }}
+      />
+    ) : (
+      <input {...props} />
+    ),
   img: ({ node: _, className, ...props }) => {
     const { t } = useI18n();
     const [showError, setShowError] = useState(false);
diff --git a/src/renderer/shared/ui/index.ts b/src/renderer/shared/ui/index.ts
index fbff8fa1d9..0e73aaa7fd 100644
--- a/src/renderer/shared/ui/index.ts
+++ b/src/renderer/shared/ui/index.ts
@@ -28,7 +28,6 @@ export { Separator } from './Separator/Separator';
 export { InputHint } from './InputHint/InputHint';
 export { InfoLink } from './InfoLink/InfoLink';
 export { RadioGroup } from './RadioGroup/RadioGroup';
-export { Checkbox } from './Checkbox/Checkbox';
 export { Accordion } from './Accordion/Accordion';
 export { Alert } from './Alert/Alert';
 export { Identicon } from './Identicon/Identicon';
diff --git a/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx b/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx
index 9c547a77b2..2b0ab09554 100644
--- a/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx
+++ b/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx
@@ -5,8 +5,8 @@ import { Trans } from 'react-i18next';
 import { type Account } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { nonNullable, toAddress } from '@/shared/lib/utils';
-import { BodyText, Button, Checkbox, FootnoteText, Icon, IconButton, Tooltip } from '@/shared/ui';
-import { Box, Modal } from '@/shared/ui-kit';
+import { BodyText, Button, FootnoteText, Icon, IconButton, Tooltip } from '@/shared/ui';
+import { Box, Checkbox, Modal } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { allTracks, votingService } from '@/entities/governance';
 import { ContactItem, ExplorersPopover, accountUtils, walletModel } from '@/entities/wallet';
diff --git a/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts b/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts
index a1e9d1a4c5..6fbc7fe97f 100644
--- a/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts
+++ b/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts
@@ -1,17 +1,10 @@
 import { type ApiPromise } from '@polkadot/api';
 import { isArray } from '@polkadot/util';
 import { combine, createEffect, createEvent, createStore, restore, sample } from 'effector';
+import { spread } from 'patronum';
 
 import { type DelegateAccount } from '@/shared/api/governance';
-import {
-  type Account,
-  type Address,
-  type Chain,
-  type ReferendumId,
-  type TrackId,
-  TransactionType,
-  type Wallet,
-} from '@/shared/core';
+import { type Account, type Chain, TransactionType, type Wallet } from '@/shared/core';
 import {
   addUniqueItems,
   formatAmount,
@@ -20,7 +13,14 @@ import {
   transferableAmount,
 } from '@/shared/lib/utils';
 import { balanceModel, balanceUtils } from '@/entities/balance';
-import { adminTracks, fellowshipTracks, governanceTracks, treasuryTracks, votingService } from '@/entities/governance';
+import {
+  type VotesToRemove,
+  adminTracks,
+  fellowshipTracks,
+  governanceTracks,
+  treasuryTracks,
+  votingService,
+} from '@/entities/governance';
 import { transactionBuilder } from '@/entities/transaction';
 import { accountUtils, walletModel, walletUtils } from '@/entities/wallet';
 import { delegationAggregate, networkSelectorModel, tracksAggregate, votingAggregate } from '@/features/governance';
@@ -34,6 +34,10 @@ const accountsChanged = createEvent<Account[]>();
 const $delegate = restore(formInitiated, null);
 
 const $tracks = createStore<number[]>([]).reset(formInitiated);
+const $delegatedTracks = createStore<string[]>([]).reset(formInitiated);
+const $votedTracks = createStore<string[]>([]).reset(formInitiated);
+const $votesToRemove = createStore<VotesToRemove[]>([]).reset(formInitiated);
+
 const $accounts = createStore<Account[]>([]);
 const $isMaxWeightReached = createStore(false);
 
@@ -47,59 +51,6 @@ const $addresses = combine({ accounts: $accounts, network: delegationAggregate.$
   return accounts.map((a) => toAddress(a.accountId, { prefix: network.chain.addressPrefix }));
 });
 
-const $votedTracks = combine(
-  {
-    votes: votingAggregate.$activeWalletVotes,
-    addresses: $addresses,
-  },
-  ({ votes, addresses }) => {
-    const activeTracks = new Set<string>();
-
-    for (const [address, voteList] of Object.entries(votes)) {
-      if (!addresses.includes(address)) continue;
-
-      for (const [track, vote] of Object.entries(voteList)) {
-        if (
-          (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) ||
-          votingService.isDelegating(vote)
-        ) {
-          activeTracks.add(track);
-        }
-      }
-    }
-
-    return [...activeTracks];
-  },
-);
-
-const $votesToRemove = combine(
-  {
-    votes: votingAggregate.$activeWalletVotes,
-    addresses: $addresses,
-  },
-  ({ votes, addresses }) => {
-    const activeVotes: { referendum: ReferendumId; track: TrackId; voter: Address }[] = [];
-
-    for (const [address, voteList] of Object.entries(votes)) {
-      if (!addresses.includes(address)) continue;
-
-      for (const [track, vote] of Object.entries(voteList)) {
-        if (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) {
-          activeVotes.push(
-            ...Object.keys(vote.votes).map((referendum) => ({
-              voter: address,
-              track,
-              referendum,
-            })),
-          );
-        }
-      }
-    }
-
-    return activeVotes;
-  },
-);
-
 const $availableAccounts = combine(
   {
     wallet: walletModel.$activeWallet,
@@ -185,6 +136,53 @@ sample({
   target: $accounts,
 });
 
+sample({
+  clock: [votingAggregate.$activeWalletVotes, $addresses],
+  source: {
+    votes: votingAggregate.$activeWalletVotes,
+    addresses: $addresses,
+  },
+  fn: ({ addresses, votes }) => {
+    const activeTracks = new Set<string>();
+    const delegatedTracks = new Set<string>();
+    const votesToRemove = [];
+
+    for (const [address, voteList] of Object.entries(votes)) {
+      if (!addresses.includes(address)) continue;
+
+      for (const [track, vote] of Object.entries(voteList)) {
+        if (
+          (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) ||
+          votingService.isDelegating(vote)
+        ) {
+          activeTracks.add(track);
+        }
+
+        if (votingService.isDelegating(vote)) {
+          delegatedTracks.add(track);
+        }
+
+        if (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) {
+          for (const referendum of Object.keys(vote.votes)) {
+            votesToRemove.push({ voter: address, track, referendum });
+          }
+        }
+      }
+    }
+
+    return {
+      votedTracks: [...activeTracks],
+      delegatedTracks: [...delegatedTracks],
+      votesToRemove: [...votesToRemove],
+    };
+  },
+  target: spread({
+    votedTracks: $votedTracks,
+    delegatedTracks: $delegatedTracks,
+    votesToRemove: $votesToRemove,
+  }),
+});
+
 sample({
   clock: trackToggled,
   source: $tracks,
@@ -256,6 +254,7 @@ export const selectTracksModel = {
   $availableTracks,
   $votedTracks,
   $votesToRemove,
+  $delegatedTracks,
   $tracksGroup,
   $allTracks: $tracksGroup.map(({ adminTracks, governanceTracks, treasuryTracks, fellowshipTracks }) => {
     return [...adminTracks, ...governanceTracks, ...treasuryTracks, ...fellowshipTracks];
diff --git a/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx b/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx
index 5217e40053..21082265c3 100644
--- a/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx
+++ b/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx
@@ -5,14 +5,15 @@ import { useState } from 'react';
 import { type Account, type Chain } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { toAddress } from '@/shared/lib/utils';
-import { Alert, Button, Checkbox, FootnoteText, Icon, IconButton, SmallTitleText, Tooltip } from '@/shared/ui';
-import { Modal } from '@/shared/ui-kit';
+import { Alert, Button, FootnoteText, Icon, IconButton, SmallTitleText, Tooltip } from '@/shared/ui';
+import { Checkbox, Modal } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { OperationTitle } from '@/entities/chain';
 import {
   getGovernanceTrackDescription,
   getGroupPallet,
   getTrackIds,
+  getTrackTitles,
   getTreasuryTrackDescription,
 } from '@/entities/governance';
 import { AccountAddress, AddressWithName, ExplorersPopover, accountUtils } from '@/entities/wallet';
@@ -34,6 +35,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
   const tracks = useUnit(selectTracksModel.$tracks);
   const accounts = useUnit(selectTracksModel.$accounts);
   const votedTracks = useUnit(selectTracksModel.$votedTracks);
+  const delegatedTracks = useUnit(selectTracksModel.$delegatedTracks);
   const tracksGroup = useUnit(selectTracksModel.$tracksGroup);
   const allTracks = useUnit(selectTracksModel.$allTracks);
   const isMaxWeightReached = useUnit(selectTracksModel.$isMaxWeightReached);
@@ -95,7 +97,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {adminTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -112,7 +114,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {governanceTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -132,7 +134,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {treasuryTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -152,7 +154,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {fellowshipTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -167,19 +169,37 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
               </div>
             </div>
           </div>
-          <div className="px-5">
+          <div className="flex flex-col gap-2 px-5">
             <Alert variant="error" active={isMaxWeightReached} title={t('governance.addDelegation.maxWeightError')}>
               <Alert.Item withDot={false}>{t('governance.addDelegation.maxWeightErrorDescription')} </Alert.Item>
             </Alert>
+
+            <Alert
+              variant="info"
+              active={accounts.length > 0 && delegatedTracks?.length > 0}
+              title={t('governance.addDelegation.delegatedTracksTitle')}
+            >
+              <Alert.Item withDot={false}>
+                {t('governance.addDelegation.delegatedTracksDescription', {
+                  tracks: getTrackTitles(delegatedTracks, allTracks, t),
+                })}
+              </Alert.Item>
+            </Alert>
+
             <Alert
               variant="info"
-              active={
-                // TODO: Add support multishard wallet
-                accounts.length > 0 && votesToRemove?.length > 0
-              }
+              active={accounts.length > 0 && votesToRemove?.length > 0}
               title={t('governance.addDelegation.votedTracksTitle')}
             >
-              <Alert.Item withDot={false}>{t('governance.addDelegation.votedTracksDescription')} </Alert.Item>
+              <Alert.Item withDot={false}>
+                {t('governance.addDelegation.votedTracksDescription', {
+                  tracks: getTrackTitles(
+                    votesToRemove.map(({ track }) => track),
+                    allTracks,
+                    t,
+                  ),
+                })}
+              </Alert.Item>
               <Alert.Item withDot={false}>
                 <Button variant="text" size="sm" className="p-0" onClick={() => setShowRemoveVoteModal(true)}>
                   {t('governance.addDelegation.removeVotesButton')}
diff --git a/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts b/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
index b738df8b36..58dcf31957 100644
--- a/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
+++ b/src/renderer/widgets/EditDelegationModal/model/select-tracks-model.ts
@@ -4,15 +4,7 @@ import { combine, createEffect, createEvent, createStore, sample } from 'effecto
 import { spread } from 'patronum';
 
 import { type DelegateAccount } from '@/shared/api/governance';
-import {
-  type Account,
-  type Address,
-  type Chain,
-  type ReferendumId,
-  type TrackId,
-  TransactionType,
-  type Wallet,
-} from '@/shared/core';
+import { type Account, type Chain, TransactionType, type Wallet } from '@/shared/core';
 import {
   addUniqueItems,
   formatAmount,
@@ -22,7 +14,14 @@ import {
   transferableAmount,
 } from '@/shared/lib/utils';
 import { balanceModel, balanceUtils } from '@/entities/balance';
-import { adminTracks, fellowshipTracks, governanceTracks, treasuryTracks, votingService } from '@/entities/governance';
+import {
+  type VotesToRemove,
+  adminTracks,
+  fellowshipTracks,
+  governanceTracks,
+  treasuryTracks,
+  votingService,
+} from '@/entities/governance';
 import { transactionBuilder } from '@/entities/transaction';
 import { walletModel, walletUtils } from '@/entities/wallet';
 import { delegationAggregate, networkSelectorModel, tracksAggregate, votingAggregate } from '@/features/governance';
@@ -34,6 +33,10 @@ const tracksSelected = createEvent<number[]>();
 const accountsChanged = createEvent<Account[]>();
 
 const $tracks = createStore<number[]>([]).reset(formInitiated);
+const $delegatedTracks = createStore<string[]>([]).reset(formInitiated);
+const $votedTracks = createStore<string[]>([]).reset(formInitiated);
+const $votesToRemove = createStore<VotesToRemove[]>([]).reset(formInitiated);
+
 const $accounts = createStore<Account[]>([]);
 const $availableAccounts = createStore<Account[]>([]);
 const $delegate = createStore<DelegateAccount | null>(null);
@@ -49,60 +52,6 @@ const $addresses = combine({ accounts: $accounts, network: delegationAggregate.$
   return accounts.map((a) => toAddress(a.accountId, { prefix: network.chain.addressPrefix }));
 });
 
-const $votedTracks = combine(
-  {
-    delegate: $delegate,
-    votes: votingAggregate.$activeWalletVotes,
-    addresses: $addresses,
-  },
-  ({ votes, addresses, delegate }) => {
-    const activeTracks = new Set<string>();
-
-    for (const [address, voteList] of Object.entries(votes)) {
-      if (!addresses.includes(address)) continue;
-
-      for (const [track, vote] of Object.entries(voteList)) {
-        if (
-          (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) ||
-          (votingService.isDelegating(vote) && delegate && toAccountId(delegate.accountId) !== toAccountId(vote.target))
-        ) {
-          activeTracks.add(track);
-        }
-      }
-    }
-
-    return [...activeTracks];
-  },
-);
-
-const $votesToRemove = combine(
-  {
-    votes: votingAggregate.$activeWalletVotes,
-    addresses: $addresses,
-  },
-  ({ votes, addresses }) => {
-    const activeVotes: { referendum: ReferendumId; track: TrackId; voter: Address }[] = [];
-
-    for (const [address, voteList] of Object.entries(votes)) {
-      if (!addresses.includes(address)) continue;
-
-      for (const [track, vote] of Object.entries(voteList)) {
-        if (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) {
-          activeVotes.push(
-            ...Object.keys(vote.votes).map((referendum) => ({
-              voter: address,
-              track,
-              referendum,
-            })),
-          );
-        }
-      }
-    }
-
-    return activeVotes;
-  },
-);
-
 const $accountsBalances = combine(
   {
     availableAccounts: $availableAccounts,
@@ -169,6 +118,53 @@ sample({
   }),
 });
 
+sample({
+  clock: [votingAggregate.$activeWalletVotes, $addresses],
+  source: {
+    votes: votingAggregate.$activeWalletVotes,
+    addresses: $addresses,
+    delegate: $delegate,
+  },
+  fn: ({ addresses, votes, delegate }) => {
+    const activeTracks = new Set<string>();
+    const delegatedTracks = new Set<string>();
+    const votesToRemove = [];
+
+    for (const [address, voteList] of Object.entries(votes)) {
+      if (!addresses.includes(address)) continue;
+      for (const [track, vote] of Object.entries(voteList)) {
+        const isNotCurrentDelegate =
+          votingService.isDelegating(vote) && delegate && toAccountId(delegate.accountId) !== toAccountId(vote.target);
+
+        if ((votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) || isNotCurrentDelegate) {
+          activeTracks.add(track);
+        }
+
+        if (isNotCurrentDelegate) {
+          delegatedTracks.add(track);
+        }
+
+        if (votingService.isCasting(vote) && !votingService.isUnlockingDelegation(vote)) {
+          for (const referendum of Object.keys(vote.votes)) {
+            votesToRemove.push({ voter: address, track, referendum });
+          }
+        }
+      }
+    }
+
+    return {
+      votedTracks: [...activeTracks],
+      delegatedTracks: [...delegatedTracks],
+      votesToRemove: [...votesToRemove],
+    };
+  },
+  target: spread({
+    votedTracks: $votedTracks,
+    delegatedTracks: $delegatedTracks,
+    votesToRemove: $votesToRemove,
+  }),
+});
+
 sample({
   clock: $availableAccounts,
   target: $accounts,
@@ -242,8 +238,8 @@ sample({
 
 export const selectTracksModel = {
   $tracks,
-  $availableTracks,
   $votedTracks,
+  $delegatedTracks,
   $votesToRemove,
   $tracksGroup,
   $allTracks: $tracksGroup.map(({ adminTracks, governanceTracks, treasuryTracks, fellowshipTracks }) => {
diff --git a/src/renderer/widgets/EditDelegationModal/ui/SelectTracksForm.tsx b/src/renderer/widgets/EditDelegationModal/ui/SelectTracksForm.tsx
index e927be4512..898506c252 100644
--- a/src/renderer/widgets/EditDelegationModal/ui/SelectTracksForm.tsx
+++ b/src/renderer/widgets/EditDelegationModal/ui/SelectTracksForm.tsx
@@ -5,14 +5,15 @@ import { useState } from 'react';
 import { type Account, type Chain } from '@/shared/core';
 import { useI18n } from '@/shared/i18n';
 import { toAddress } from '@/shared/lib/utils';
-import { Alert, Button, Checkbox, FootnoteText, Icon, IconButton, SmallTitleText, Tooltip } from '@/shared/ui';
-import { Modal } from '@/shared/ui-kit';
+import { Alert, Button, FootnoteText, Icon, IconButton, SmallTitleText, Tooltip } from '@/shared/ui';
+import { Checkbox, Modal } from '@/shared/ui-kit';
 import { AssetBalance } from '@/entities/asset';
 import { OperationTitle } from '@/entities/chain';
 import {
   getGovernanceTrackDescription,
   getGroupPallet,
   getTrackIds,
+  getTrackTitles,
   getTreasuryTrackDescription,
 } from '@/entities/governance';
 import { AccountAddress, AddressWithName, ExplorersPopover, accountUtils } from '@/entities/wallet';
@@ -33,6 +34,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
   const tracks = useUnit(selectTracksModel.$tracks);
   const accounts = useUnit(selectTracksModel.$accounts);
   const votedTracks = useUnit(selectTracksModel.$votedTracks);
+  const delegatedTracks = useUnit(selectTracksModel.$delegatedTracks);
   const tracksGroup = useUnit(selectTracksModel.$tracksGroup);
   const allTracks = useUnit(selectTracksModel.$allTracks);
   const isMaxWeightReached = useUnit(selectTracksModel.$isMaxWeightReached);
@@ -97,7 +99,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {adminTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -114,7 +116,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {governanceTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -134,7 +136,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {treasuryTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -154,7 +156,7 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
                 {fellowshipTracks.map((track) => (
                   <Checkbox
                     key={track.id}
-                    checked={tracks.includes(Number(track.id))}
+                    checked={tracks.includes(Number(track.id)) || votedTracks.includes(track.id)}
                     disabled={votedTracks.includes(track.id) || accounts.length === 0}
                     onChange={() => selectTracksModel.events.trackToggled(Number(track.id))}
                   >
@@ -169,26 +171,42 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
               </div>
             </div>
           </div>
-          <div className="px-5">
+          <div className="flex flex-col gap-2 px-5">
             <Alert variant="error" active={isMaxWeightReached} title={t('governance.addDelegation.maxWeightError')}>
               <Alert.Item withDot={false}>{t('governance.addDelegation.maxWeightErrorDescription')} </Alert.Item>
             </Alert>
 
             <Alert
               variant="info"
-              active={
-                // TODO: Add support multishard wallet
-                accounts.length > 0 && votesToRemove.length > 0
-              }
+              active={accounts.length > 0 && delegatedTracks?.length > 0}
+              title={t('governance.addDelegation.delegatedTracksTitle')}
+            >
+              <Alert.Item withDot={false}>
+                {t('governance.addDelegation.delegatedTracksDescription', {
+                  tracks: getTrackTitles(delegatedTracks, allTracks, t),
+                })}
+              </Alert.Item>
+            </Alert>
+
+            <Alert
+              variant="info"
+              active={accounts.length > 0 && votesToRemove.length > 0}
               title={t('governance.addDelegation.votedTracksTitle')}
             >
-              <Alert.Item withDot={false}>{t('governance.addDelegation.votedTracksDescription')} </Alert.Item>
+              <Alert.Item withDot={false}>
+                {t('governance.addDelegation.votedTracksDescription', {
+                  tracks: getTrackTitles(
+                    votesToRemove.map(({ track }) => track),
+                    allTracks,
+                    t,
+                  ),
+                })}
+              </Alert.Item>
               <Alert.Item withDot={false}>
                 <Button variant="text" size="sm" className="p-0" onClick={() => setShowRemoveVoteModal(true)}>
                   {t('governance.addDelegation.removeVotesButton')}
                 </Button>
               </Alert.Item>
-
               {showRemoveVoteModal && votesToRemove.length > 0 && (
                 <RemoveVotesModal
                   votes={votesToRemove}
diff --git a/src/renderer/widgets/RemovePureProxyModal/ui/Warning.tsx b/src/renderer/widgets/RemovePureProxyModal/ui/Warning.tsx
index e1db73e0c0..b112710a57 100644
--- a/src/renderer/widgets/RemovePureProxyModal/ui/Warning.tsx
+++ b/src/renderer/widgets/RemovePureProxyModal/ui/Warning.tsx
@@ -4,7 +4,8 @@ import { type ClipboardEvent, type FormEvent } from 'react';
 import { Trans } from 'react-i18next';
 
 import { useI18n } from '@/shared/i18n';
-import { Button, Checkbox, FootnoteText, Input } from '@/shared/ui';
+import { Button, FootnoteText, Input } from '@/shared/ui';
+import { Checkbox } from '@/shared/ui-kit';
 import { warningModel } from '../model/warning-model';
 
 type Props = {
@@ -43,28 +44,28 @@ export const Warning = ({ onGoBack }: Props) => {
           <Trans t={t} i18nKey="pureProxyRemove.warning.inputHint" />
         </FootnoteText>
         <div>
-          <Checkbox checked={isCorrectProxy.value} onChange={({ target }) => isCorrectProxy.onChange(target.checked)}>
+          <Checkbox checked={isCorrectProxy.value} onChange={(checked) => isCorrectProxy.onChange(checked)}>
             <FootnoteText>
               <Trans t={t} i18nKey="pureProxyRemove.warning.isCorrectProxyCheckbox" />
             </FootnoteText>
           </Checkbox>
         </div>
         <div>
-          <Checkbox checked={isIrreversible.value} onChange={({ target }) => isIrreversible.onChange(target.checked)}>
+          <Checkbox checked={isIrreversible.value} onChange={(checked) => isIrreversible.onChange(checked)}>
             <FootnoteText>
               <Trans t={t} i18nKey="pureProxyRemove.warning.isIrreversibleCheckbox" />
             </FootnoteText>
           </Checkbox>
         </div>
         <div>
-          <Checkbox checked={isInaccessible.value} onChange={({ target }) => isInaccessible.onChange(target.checked)}>
+          <Checkbox checked={isInaccessible.value} onChange={(checked) => isInaccessible.onChange(checked)}>
             <FootnoteText>
               <Trans t={t} i18nKey="pureProxyRemove.warning.isInaccessibleCheckbox" />
             </FootnoteText>
           </Checkbox>
         </div>
         <div>
-          <Checkbox checked={lossOfFunds.value} onChange={({ target }) => lossOfFunds.onChange(target.checked)}>
+          <Checkbox checked={lossOfFunds.value} onChange={(checked) => lossOfFunds.onChange(checked)}>
             <FootnoteText>
               <Trans t={t} i18nKey="pureProxyRemove.warning.lossOfFundsCheckbox" />
             </FootnoteText>