diff --git a/packages/desktop/components/popup/popups/AddProposalPopup.svelte b/packages/desktop/components/popup/popups/AddProposalPopup.svelte
index 2f10ce7abb..a84a47a64d 100644
--- a/packages/desktop/components/popup/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popup/popups/AddProposalPopup.svelte
@@ -10,8 +10,10 @@
     import { truncateString } from '@core/utils/string'
     import type { IAuth } from '@iota/sdk/out/types'
     import { closePopup, openPopup, PopupId } from '@desktop/auxiliary/popup'
-    import { Checkbox, NodeInput, Text, TextInput, TextType } from '@ui'
-    import { Button } from '@bloomwalletio/ui'
+    import { NodeInput } from '@ui'
+    import { Checkbox, TextInput } from '@bloomwalletio/ui'
+    import PopupTemplate from '../PopupTemplate.svelte'
+    import { IError } from '@core/error'
 
     export let initialEventId: string
     export let initialNodeUrl: string
@@ -41,15 +43,16 @@
                 nodeInput?.validate(),
             ])
             await registerParticipationWrapper()
-            updateActiveAccountPersistedData($selectedAccount.index, {
-                removedProposalIds: $selectedAccount.removedProposalIds?.filter((id) => id !== inputtedEventId),
+            updateActiveAccountPersistedData($selectedAccount?.index, {
+                removedProposalIds: $selectedAccount?.removedProposalIds?.filter((id) => id !== inputtedEventId),
             })
             isBusy = false
         } catch (err) {
             isBusy = false
-            const isAuthenticationError = err?.error?.match(/(username)|(password)|(jwt)/g)?.length > 0
-            const isEventError = err?.error?.match(/(the requested data)|(was not found)/)?.length > 0
-            const isNodeError = err?.error?.match(/(failed to lookup address information)|(dns error)/)?.length > 0
+            const error = err as IError
+            const isAuthenticationError = error?.error?.match(/(username)|(password)|(jwt)/g)
+            const isEventError = error?.error?.match(/(the requested data)|(was not found)/)
+            const isNodeError = error?.error?.match(/(failed to lookup address information)|(dns error)/)
             if (isAuthenticationError) {
                 openNodeAuthRequiredPopup()
             } else if (isEventError) {
@@ -65,7 +68,7 @@
                     text: localize('error.node.dns'),
                 })
             } else if (!nodeInputError && !eventIdError) {
-                handleError(err)
+                handleError(error)
             }
         }
     }
@@ -82,7 +85,7 @@
             node: { url: nodeUrl, auth },
             eventsToRegister: isRegisteringAllProposals ? [] : [eventId],
         }
-        const accounts = isAddingForAllAccounts ? $activeAccounts : [$selectedAccount]
+        const accounts = isAddingForAllAccounts ? $activeAccounts : $selectedAccount ? [$selectedAccount] : []
         await registerProposalsForAccounts(options, accounts)
         showNotification({
             variant: 'success',
@@ -120,29 +123,42 @@
     }
 </script>
 
-<form id="add-proposal" on:submit|preventDefault={onSubmit}>
-    <Text type={TextType.h3} classes="mb-6"
-        >{localize(`popups.${isEditMode ? 'editProposal' : 'addProposal'}.title`)}</Text
-    >
-    <Text fontSize="15">{localize(`popups.${isEditMode ? 'editProposal' : 'addProposal'}.body`)}</Text>
-    <div class="flex flex-col w-full space-y-5 mt-4">
-        <NodeInput bind:this={nodeInput} bind:nodeUrl bind:error={nodeInputError} />
-        {#if !isEditMode}
-            <Checkbox label="Add all proposals on this node" bind:checked={isRegisteringAllProposals} />
-        {/if}
-        <TextInput
-            bind:value={inputtedEventId}
-            bind:error={eventIdError}
-            disabled={isRegisteringAllProposals || isEditMode}
-            placeholder={localize('views.governance.details.proposalInformation.eventId')}
-            label={localize('views.governance.details.proposalInformation.eventId')}
-        />
-        {#if !isEditMode}
-            <Checkbox label={localize('popups.addProposal.addToAllAccounts')} bind:checked={isAddingForAllAccounts} />
-        {/if}
-    </div>
-    <div class="flex w-full space-x-4 mt-6">
-        <Button variant="outlined" width="full" on:click={onCancelClick} text={localize('actions.cancel')} />
-        <Button type="submit" {disabled} busy={isBusy} width="full" text={localize('actions.confirm')} />
-    </div>
-</form>
+<PopupTemplate
+    title={localize(`popups.${isEditMode ? 'editProposal' : 'addProposal'}.title`)}
+    description={localize(`popups.${isEditMode ? 'editProposal' : 'addProposal'}.body`)}
+    busy={isBusy}
+    backButton={{
+        text: localize('actions.cancel'),
+        onClick: onCancelClick,
+    }}
+    continueButton={{
+        type: 'submit',
+        form: 'add-proposal',
+        text: localize('actions.confirm'),
+        disabled,
+    }}
+>
+    <form id="add-proposal" on:submit|preventDefault={onSubmit}>
+        <div class="flex flex-col w-full space-y-4">
+            <NodeInput bind:this={nodeInput} bind:nodeUrl bind:error={nodeInputError} />
+            {#if !isEditMode}
+                <Checkbox
+                    label={localize('popups.addProposal.addAllProposalsOnNode')}
+                    bind:checked={isRegisteringAllProposals}
+                />
+            {/if}
+            <TextInput
+                bind:value={inputtedEventId}
+                bind:error={eventIdError}
+                disabled={isRegisteringAllProposals || isEditMode}
+                label={localize('views.governance.details.proposalInformation.eventId')}
+            />
+            {#if !isEditMode}
+                <Checkbox
+                    label={localize('popups.addProposal.addToAllAccounts')}
+                    bind:checked={isAddingForAllAccounts}
+                />
+            {/if}
+        </div>
+    </form>
+</PopupTemplate>
diff --git a/packages/shared/src/components/inputs/Checkbox.svelte b/packages/shared/src/components/inputs/Checkbox.svelte
deleted file mode 100644
index e56403bbcc..0000000000
--- a/packages/shared/src/components/inputs/Checkbox.svelte
+++ /dev/null
@@ -1,65 +0,0 @@
-<script lang="ts">
-    import { Icon, Text, TextType } from '@ui'
-
-    export let label = undefined
-    export let checked = false
-    export let classes = ''
-    export let disabled = false
-    export let round = false
-    export let small = false
-    export let keepSameColor = false
-    export let onClick: (..._: any[]) => void = () => {}
-
-    $: isSecondaryColor = !keepSameColor && (!checked || disabled)
-</script>
-
-<div class="flex flex-row space-x-4 items-center text-left">
-    <button
-        data-label="checkbox-input"
-        class="cursor-pointer {classes}"
-        type="button"
-        {disabled}
-        on:click={() => {
-            checked = !checked
-            onClick && onClick()
-        }}
-    >
-        <Icon
-            icon={checked ? `checkbox${round ? '-round' : ''}` : `checkbox-unchecked${round ? '-round' : ''}`}
-            width={small ? '16px' : undefined}
-            height={small ? '16px' : undefined}
-            classes={`${checked ? 'active' : ''}`}
-        />
-    </button>
-    {#if label}
-        <Text type={TextType.p} secondary={isSecondaryColor}>{label}</Text>
-    {:else if $$slots.label}
-        <slot name="label" />
-    {/if}
-</div>
-
-<style lang="scss">
-    button {
-        @apply border-gray-500;
-        :global(svg:not(.active) path) {
-            fill: none;
-            @apply text-gray-500;
-            @apply stroke-current;
-        }
-        :global(svg.active path) {
-            @apply text-blue-500;
-            @apply fill-current;
-        }
-        &:hover,
-        &:focus {
-            :global(svg path) {
-                @apply text-blue-500;
-            }
-        }
-
-        &:disabled {
-            @apply pointer-events-none;
-            @apply opacity-50;
-        }
-    }
-</style>
diff --git a/packages/shared/src/components/inputs/NodeInput.svelte b/packages/shared/src/components/inputs/NodeInput.svelte
index cdb8505e06..ca08debc94 100644
--- a/packages/shared/src/components/inputs/NodeInput.svelte
+++ b/packages/shared/src/components/inputs/NodeInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { SelectorInput, IOption, Modal } from '@ui'
+    import { SelectInput, IOption } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { activeProfile } from '@core/profile/stores'
     import { isValidUrl, stripTrailingSlash } from '@core/utils'
@@ -8,12 +8,10 @@
     export let error: string
     export let nodeUrl: string
 
-    let inputElement: HTMLInputElement
-    let modal: Modal
     let nodeOptions: IOption[]
     let selected: IOption = { value: nodeUrl }
 
-    $: clientOptionsNodes = $activeProfile?.clientOptions?.nodes
+    $: clientOptionsNodes = $activeProfile?.clientOptions?.nodes ?? []
     $: clientOptionsNodes, (nodeOptions = getNodeOptionsFromClientOptions())
     $: nodeUrl = stripTrailingSlash(selected?.value?.trim())
 
@@ -24,7 +22,7 @@
             }
             return Promise.resolve()
         } catch (err) {
-            error = err?.message ?? err
+            error = (err as Error)?.message
             return Promise.reject(error)
         }
     }
@@ -40,13 +38,10 @@
     }
 </script>
 
-<SelectorInput
-    labelLocale="views.governance.details.proposalInformation.nodeUrl"
+<SelectInput
+    label={localize('views.governance.details.proposalInformation.nodeUrl')}
     bind:selected
-    bind:inputElement
-    bind:modal
     bind:error
     {disabled}
     options={nodeOptions}
-    {...$$restProps}
 />
diff --git a/packages/shared/src/components/inputs/index.ts b/packages/shared/src/components/inputs/index.ts
index 2236158f03..e16336ac2d 100644
--- a/packages/shared/src/components/inputs/index.ts
+++ b/packages/shared/src/components/inputs/index.ts
@@ -1,7 +1,6 @@
 export { default as AccountInput } from './AccountInput.svelte'
 export { default as AliasInput } from './AliasInput.svelte'
 export { default as AmountInput } from './AmountInput.svelte'
-export { default as Checkbox } from './Checkbox.svelte'
 export { default as ClosableInput } from './ClosableInput.svelte'
 export { default as Dropdown } from './Dropdown.svelte'
 export { default as Dropzone } from './Dropzone.svelte'
diff --git a/packages/shared/src/components/molecules/SelectorInput.svelte b/packages/shared/src/components/molecules/SelectorInput.svelte
deleted file mode 100644
index 827a419471..0000000000
--- a/packages/shared/src/components/molecules/SelectorInput.svelte
+++ /dev/null
@@ -1,130 +0,0 @@
-<script lang="ts">
-    import { localize } from '@core/i18n'
-    import { Modal, TextInput, Text, TextType, FontWeight, IOption } from '@ui'
-    import { fade } from 'svelte/transition'
-    import { truncateString } from '@core/utils'
-
-    export let error: string = ''
-    export let disabled: boolean = false
-    export let labelLocale: string = ''
-    export let modal: Modal = undefined
-    export let inputElement: HTMLInputElement = undefined
-    export let options: IOption[] = []
-    export let selected: IOption = undefined
-    export let maxHeight: string = 'max-h-64'
-    // HTML checks whether this value is absent to determine whether the field is readonly
-    // If the attribute is set to false, HTML interprets it as a readonly field.
-    export let readonly: boolean = null
-    export let overrideShowOptions: boolean = false
-
-    export function validate(): void {
-        /* eslint-disable @typescript-eslint/ban-ts-comment */
-        // @ts-ignore
-        input?.validate()
-    }
-
-    let input: TextInput
-
-    let value: string = selected?.key ?? selected?.value
-    let previousValue: string = value
-    let hasFocus: boolean
-
-    $: filteredOptions = options
-    $: if (previousValue !== value) {
-        selected = { value }
-        previousValue = value
-        setFilteredOptions(value)
-    }
-
-    $: options, resetValue()
-    $: hasFocus && (error = '')
-
-    $: if (hasFocus) {
-        setTimeout(() => modal?.open(), 100)
-    }
-
-    function setFilteredOptions(searchValue?: string): void {
-        const lowerCaseSearchValue = searchValue?.toLowerCase()
-        filteredOptions = lowerCaseSearchValue
-            ? options.filter(
-                  (option) =>
-                      option?.key?.toLowerCase()?.includes(lowerCaseSearchValue) ||
-                      option?.value?.toLowerCase()?.includes(lowerCaseSearchValue)
-              )
-            : options
-    }
-
-    function onClick(option: IOption): void {
-        modal?.close()
-        selected = option
-        value = option?.key ?? option.value
-        previousValue = value
-        setFilteredOptions()
-    }
-
-    function resetValue(): void {
-        value = selected?.key ?? selected?.value
-    }
-</script>
-
-<selector-input class="w-full relative">
-    <TextInput
-        bind:this={input}
-        bind:inputElement
-        bind:value
-        bind:hasFocus
-        {error}
-        {disabled}
-        label={localize(labelLocale)}
-        placeholder={localize(labelLocale)}
-        fontSize="sm"
-        {readonly}
-        {...$$restProps}
-    >
-        <div slot="right">
-            {#if selected?.key && selected?.value}
-                <Text slot="right" type={TextType.pre} fontSize="sm" color="gray-600" whitespace="pre">
-                    {truncateString(selected.displayedValue ?? selected.value, 9, 9)}
-                </Text>
-            {/if}
-        </div>
-    </TextInput>
-
-    {#if filteredOptions.length > 0 && (!readonly || overrideShowOptions)}
-        <Modal
-            bind:this={modal}
-            position={{ left: '0', top: '100%' }}
-            classes="w-full p-4"
-            on:close={() => inputElement.blur()}
-        >
-            <picker-modal class="{maxHeight} flex flex-col space-y-1 scrollable-y" in:fade={{ duration: 100 }}>
-                {#each filteredOptions as option, index}
-                    <button
-                        on:click={() => onClick(option)}
-                        class="w-full flex flex-row flex-1 justify-between items-center p-2 rounded-lg hover:bg-blue-50 dark:hover:bg-gray-800 dark:hover:bg-opacity-20"
-                    >
-                        <div class="flex flex-row gap-3 justify-start items-center flex-1">
-                            <slot {option} {index}>
-                                <!-- Contains Custom Selector -->
-                            </slot>
-                            <Text
-                                type={TextType.p}
-                                fontSize="sm"
-                                fontWeight={FontWeight.medium}
-                                color="gray-800"
-                                classes="truncate"
-                            >
-                                {option.key ?? option.value}
-                            </Text>
-                        </div>
-                        {#if option.value && option.key}
-                            <Text type={TextType.pre} fontSize="sm" color="gray-600" classes="flex-2 text-end">
-                                {truncateString(option.displayedValue ?? option.value, 9, 9)}
-                            </Text>
-                        {/if}
-                    </button>
-                {/each}
-            </picker-modal>
-        </Modal>
-    {/if}
-</selector-input>
diff --git a/packages/shared/src/components/molecules/activity-info/index.js b/packages/shared/src/components/molecules/activity-info/index.ts
similarity index 69%
rename from packages/shared/src/components/molecules/activity-info/index.js
rename to packages/shared/src/components/molecules/activity-info/index.ts
index 8cb3ad5495..bbb6f77324 100644
--- a/packages/shared/src/components/molecules/activity-info/index.js
+++ b/packages/shared/src/components/molecules/activity-info/index.ts
@@ -1,9 +1,9 @@
-export { default as AliasActivityInformation } from './AliasActivityInformation'
-export { default as ConsolidationActivityInformation } from './ConsolidationActivityInformation'
-export { default as FoundryActivityInformation } from './FoundryActivityInformation'
-export { default as GenericActivityInformation } from './GenericActivityInformation'
-export { default as GovernanceActivityInformation } from './GovernanceActivityInformation'
-export { default as TokenActivityInformation } from './TokenActivityInformation'
-export { default as NftActivityInformation } from './NftActivityInformation'
-export { default as NftMetadataInformation } from './NftMetadataInformation'
-export { default as SmartContractActivityInformation } from './SmartContractActivityInformation'
+export { default as AliasActivityInformation } from './AliasActivityInformation.svelte'
+export { default as ConsolidationActivityInformation } from './ConsolidationActivityInformation.svelte'
+export { default as FoundryActivityInformation } from './FoundryActivityInformation.svelte'
+export { default as GenericActivityInformation } from './GenericActivityInformation.svelte'
+export { default as GovernanceActivityInformation } from './GovernanceActivityInformation.svelte'
+export { default as TokenActivityInformation } from './TokenActivityInformation.svelte'
+export { default as NftActivityInformation } from './NftActivityInformation.svelte'
+export { default as NftMetadataInformation } from './NftMetadataInformation.svelte'
+export { default as SmartContractActivityInformation } from './SmartContractActivityInformation.svelte'
diff --git a/packages/shared/src/components/molecules/filter-items/index.js b/packages/shared/src/components/molecules/filter-items/index.ts
similarity index 100%
rename from packages/shared/src/components/molecules/filter-items/index.js
rename to packages/shared/src/components/molecules/filter-items/index.ts
diff --git a/packages/shared/src/components/molecules/index.ts b/packages/shared/src/components/molecules/index.ts
index b879334b2f..8693583434 100644
--- a/packages/shared/src/components/molecules/index.ts
+++ b/packages/shared/src/components/molecules/index.ts
@@ -9,7 +9,6 @@ export { default as NftGallery } from './NftGallery.svelte'
 export { default as NftGalleryItem } from './NftGalleryItem.svelte'
 export { default as NftMedia } from './NftMedia.svelte'
 export { default as NodeAuthTab } from './NodeAuthTab.svelte'
-export { default as SelectorInput } from './SelectorInput.svelte'
 export { default as ShimmerClaimingAccountList } from './ShimmerClaimingAccountList.svelte'
 export { default as TransactionAssetSection } from './TransactionAssetSection.svelte'
 
diff --git a/packages/shared/src/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts b/packages/shared/src/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
index 4a41333650..c9b380e257 100644
--- a/packages/shared/src/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
@@ -4,11 +4,14 @@ import { updateAccountPersistedDataOnActiveProfile } from '@core/profile/stores'
 import { get } from 'svelte/store'
 
 export function updateActiveAccountPersistedData(
-    acccountIndex: number,
+    accountIndex: number | undefined,
     partialAccountPersistedData: Partial<IPersistedAccountData>
 ): void {
-    if (get(selectedAccountIndex) === acccountIndex) {
+    if (accountIndex === undefined) {
+        return
+    }
+    if (get(selectedAccountIndex) === accountIndex) {
         updateSelectedAccount(partialAccountPersistedData)
     }
-    updateAccountPersistedDataOnActiveProfile(acccountIndex, partialAccountPersistedData)
+    updateAccountPersistedDataOnActiveProfile(accountIndex, partialAccountPersistedData)
 }
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
index 1fcf8df979..6e9ba1a4c1 100644
--- a/packages/shared/src/locales/en.json
+++ b/packages/shared/src/locales/en.json
@@ -1171,7 +1171,8 @@
         "addProposal": {
             "title": "Add proposal",
             "body": "Please provide the information listed below to add a proposal.",
-            "addToAllAccounts": "Add the proposal to all accounts"
+            "addToAllAccounts": "Add the proposal to all accounts",
+            "addAllProposalsOnNode": "Add all proposals on this node"
         },
         "editProposal": {
             "title": "Edit proposal",