diff --git a/src/assets/arrow-down.svg b/src/assets/mini-arrow-down.svg
similarity index 100%
rename from src/assets/arrow-down.svg
rename to src/assets/mini-arrow-down.svg
diff --git a/src/components/CountrySelector.vue b/src/components/CountrySelector.vue
index 76c286fcf..7b2fd83c8 100644
--- a/src/components/CountrySelector.vue
+++ b/src/components/CountrySelector.vue
@@ -4,7 +4,7 @@
             <slot name="trigger">
                 <div class="flex-row">
                     <CountryFlag :code="currentCountryCode || 'all'" />
-                    <img src="../assets/arrow-down.svg" alt="open"/>
+                    <img src="../assets/mini-arrow-down.svg" alt="open"/>
                 </div>
             </slot>
         </button>
diff --git a/src/components/icons/ArrowDownIcon.vue b/src/components/icons/ArrowDownIcon.vue
new file mode 100644
index 000000000..95b984464
--- /dev/null
+++ b/src/components/icons/ArrowDownIcon.vue
@@ -0,0 +1,6 @@
+<template functional>
+    <svg class="nq-icon arrow-down-icon" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 11"
+        stroke="#fff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+        <path d="m8 6.696-3.5 3.5-3.5-3.5M4.45 9.154v-7.6"/>
+    </svg>
+</template>
diff --git a/src/components/layouts/Settings.vue b/src/components/layouts/Settings.vue
index dac2488f5..dfa6e370b 100644
--- a/src/components/layouts/Settings.vue
+++ b/src/components/layouts/Settings.vue
@@ -626,7 +626,7 @@ select {
     }
 
     background-color: transparent;
-    background-image: url('../../assets/arrow-down.svg');
+    background-image: url('../../assets/mini-arrow-down.svg');
     background-size: 1.25rem;
     background-repeat: no-repeat;
     background-position-x: calc(100% - 1.75rem);
diff --git a/src/components/modals/BuyOptionsModal.vue b/src/components/modals/BuyOptionsModal.vue
index 9741192bd..c86ca4a69 100644
--- a/src/components/modals/BuyOptionsModal.vue
+++ b/src/components/modals/BuyOptionsModal.vue
@@ -12,7 +12,7 @@
                         <CircleSpinner v-else/>
                         <span v-if="country">{{ country.name }}</span>
                         <span v-else>{{ $t('Loading...') }}</span>
-                        <img src="../../assets/arrow-down.svg" alt="open"/>
+                        <img src="../../assets/mini-arrow-down.svg" alt="open"/>
                     </div>
                 </CountrySelector>
             </header>
diff --git a/src/components/modals/HistoryExportModal.vue b/src/components/modals/HistoryExportModal.vue
index 87e013202..7d468920b 100644
--- a/src/components/modals/HistoryExportModal.vue
+++ b/src/components/modals/HistoryExportModal.vue
@@ -193,7 +193,7 @@ select {
     }
 
     background-color: transparent;
-    background-image: url('../../assets/arrow-down.svg');
+    background-image: url('../../assets/mini-arrow-down.svg');
     background-size: 1.25rem;
     background-repeat: no-repeat;
     background-position-x: calc(100% - 1.75rem);
diff --git a/src/components/staking/AmountSlider.vue b/src/components/staking/AmountSlider.vue
index 424d6d701..dbed3693b 100644
--- a/src/components/staking/AmountSlider.vue
+++ b/src/components/staking/AmountSlider.vue
@@ -62,7 +62,6 @@
 <script lang="ts">
 import { Ref, defineComponent, ref, computed, onMounted, onBeforeUnmount } from '@vue/composition-api';
 import { useAddressStore } from '../../stores/Address';
-import { MIN_STAKE } from '../../lib/Constants';
 
 import VerticalLineIcon from '../icons/Staking/VerticalLineIcon.vue';
 import AnimatedLeafIcon from '../icons/Staking/AnimatedLeafIcon.vue';
@@ -155,7 +154,7 @@ export default defineComponent({
 
         function updateInputWidth(value?: string) {
             inputAmountWidth.value = estimateTextWidth(
-                value || $stakedNIMAmount.value?.value || (MIN_STAKE / 1e5).toString(),
+                value || $stakedNIMAmount.value?.value || '0',
                 9,
             ) + 69;
         }
@@ -166,12 +165,11 @@ export default defineComponent({
             const newValue = $stakedNIMAmount.value?.value
                 ? Math.min(
                     maxValue,
-                    parseInt($stakedNIMAmount.value?.value, 10),
+                    parseFloat($stakedNIMAmount.value?.value),
                 ) : false;
 
-            // TODO: Should we take decimals into account? like 10000.0123 NIM instead of 1000?
-            if (newValue) {
-                $stakedNIMAmount.value!.value = Math.floor(newValue).toString();
+            if (newValue !== false) {
+                $stakedNIMAmount.value!.value = newValue.toString();
             }
         }
 
@@ -199,10 +197,6 @@ export default defineComponent({
         const $stakedNIMAmount = ref<HTMLInputElement>(null);
         const $dotIndicator = ref<HTMLElement>(null);
 
-        const minimumStakePercent = computed(() => availableAmount.value < MIN_STAKE
-            ? Infinity // Makes it impossible to move the mouse above half the `minimumStakePercent`
-            : (MIN_STAKE / availableAmount.value) * 100);
-
         const atClick = (e: MouseEvent | TouchEvent) => {
             e.preventDefault();
 
@@ -225,7 +219,7 @@ export default defineComponent({
         const updateAmount = async (e: MouseEvent | TouchEvent | { target: HTMLInputElement }) => {
             const target = e.target as HTMLInputElement;
 
-            let valueNim = (parseInt(target.value.replace(/[^\d.]/g, ''), 10) || 0) * 1e5;
+            const valueNim = (parseFloat(target.value.replace(/[^\d.]/g, '')) || 0) * 1e5;
 
             if (!firstRender && valueNim > currentAmount.value) {
                 window.clearTimeout(timeoutID);
@@ -233,8 +227,6 @@ export default defineComponent({
                 await context.root.$nextTick();
             }
 
-            // Ensure the entered amount does not fall below the minimum stake or already staked amount
-            valueNim = Math.max(valueNim, MIN_STAKE, alreadyStakedAmount.value);
             const amount = Math.max(
                 0,
                 Math.min(availableAmount.value, valueNim),
@@ -291,31 +283,24 @@ export default defineComponent({
             context.emit('amount-chosen', 0);
         };
 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const onMove = (e: MouseEvent | TouchEvent, execute = false, skipSignals = false) => {
-            // if (execute !== true) return;
             const position = extractEventPosition(e);
             if (!position || !pivotPoint) return;
 
             position.x += $container.value?.closest('.small-page')?.scrollLeft || 0;
 
-            let percent = Math.min(100, Math.max(0,
+            const percent = Math.min(100, Math.max(0,
                 (100 * (position.x - pivotPoint.x - sliderBox.x)) / (sliderBox.width - knobBox.width),
             ));
-            // Ensure the slider does not go below the minimum stake percentage
-            percent = Math.max(minimumStakePercent.value, alreadyStakedPercentage.value, percent);
 
             const offsetX = getPointAtPercent(percent);
             let newAmount;
 
             if (percent === 100) {
-                // Set the current amount to the full available amount with decimals
                 newAmount = availableAmount.value;
             } else {
-                // Calculate new amount from slider's position, ensuring it's not below minimum prestake
                 newAmount = Math.floor(((percent / 100) * availableAmount.value) / 1e5) * 1e5;
-                // Prevent reducing below MIN_STAKE or already staked amount
-                newAmount = Math.max(newAmount, MIN_STAKE, alreadyStakedAmount.value);
+                newAmount = Math.max(newAmount, 0);
             }
 
             currentAmount.value = newAmount;
diff --git a/src/components/staking/StakingGraphPage.vue b/src/components/staking/StakingGraphPage.vue
index ef3c1d020..45e1846a0 100644
--- a/src/components/staking/StakingGraphPage.vue
+++ b/src/components/staking/StakingGraphPage.vue
@@ -122,7 +122,7 @@ export default defineComponent({
         }
 
         async function performStaking() {
-            if (newStake.value < MIN_STAKE) return;
+            if (isStakeBelowMinimum.value) return;
 
             const validatorLabelOrAddress = 'label' in activeValidator.value!
                 ? activeValidator.value.label
@@ -279,7 +279,7 @@ export default defineComponent({
             }
         }
 
-        const isStakeBelowMinimum = computed(() => newStake.value < MIN_STAKE);
+        const isStakeBelowMinimum = computed(() => newStake.value < MIN_STAKE && newStake.value > 0);
 
         return {
             // NOW,
diff --git a/src/components/staking/StakingInfoPage.vue b/src/components/staking/StakingInfoPage.vue
index 4b67f345c..103dca526 100644
--- a/src/components/staking/StakingInfoPage.vue
+++ b/src/components/staking/StakingInfoPage.vue
@@ -69,43 +69,46 @@
                             </button>
                             <span>{{ $t('You can\'t adjust your stake while you\'re unstaking') }}</span>
                         </Tooltip>
-                        <button class="nq-button-pill red" @click="deactivateAll"
-                            :disabled="!stake.activeBalance || consensus !== 'established'">
-                            {{ $t('Deactivate All') }}
-                        </button>
                     </div>
                 </div>
                 <div v-if="stake && stake.inactiveBalance && hasUnstakableStake"
                     class="unstaking row flex-row nq-light-blue"
                 >
-                    <Amount :amount="stake.inactiveBalance"/>&nbsp;{{ $t('available to unstake') }}
-                    <div class="flex-grow"></div>
-                    <button
-                        class="nq-button-pill light-blue"
-                        @click="() => unstakeAll()"
-                        :disabled="(stake.activeBalance > 0 && stake.activeBalance < MIN_STAKE)
-                            || consensus !== 'established'"
-                    >
-                        {{ $t('Unstake All') }}
+                    <span class="nq-button-pill">
+                        <Amount :amount="stake.inactiveBalance"/>
+                    </span>
+                    <button class="nq-button-pill light-blue" @click="() => unstakeAll()">
+                        Pay out <ArrowRightSmallIcon />
                     </button>
+                    <div class="flex-grow"></div>
+                    <!-- <p>{{ $t('Auto-payout failed, please pay out manually.') }}</p> -->
                 </div>
                 <div v-else-if="stake && stake.inactiveBalance" class="unstaking row flex-row nq-light-blue">
-                    <CircleSpinner/> {{ $t('Deactivating') }}&nbsp;<Amount :amount="stake.inactiveBalance"/>
+                    <span class="nq-button-s unstaking-amount">
+                        <ArrowDownIcon />
+                        <Amount :amount="stake.inactiveBalance"/>
+                    </span>
+                    <button class="nq-button-s unstaking-progress">
+                        {{ inactiveReleaseTime }} <!-- <span>Cancel</span> -->
+                        <!-- TODO: Add cancel function -->
+                    </button>
                     <div class="flex-grow"></div>
-                    <span class="inactive-release-timer">{{ inactiveReleaseTime }}</span>
                 </div>
                 <div v-if="stake && stake.retiredBalance"
                     class="unstaking row flex-row nq-light-blue"
                 >
-                    <Amount :amount="stake.retiredBalance"/>&nbsp;{{ $t('available to unstake') }}
-                    <div class="flex-grow"></div>
-                    <button
-                        class="nq-button-pill light-blue"
+                    <span class="nq-button-pill">
+                        <Amount :amount="stake.retiredBalance"/>
+                    </span>
+                    <button class="nq-button-pill light-blue"
                         @click="() => unstakeAll(true)"
                         :disabled="consensus !== 'established'"
                     >
-                        {{ $t('Unstake All') }}
+                        Pay out <ArrowRightSmallIcon />
                     </button>
+                    <div class="flex-grow"></div>
+                    <!-- <p>{{ $t('Auto-payout failed, please pay out manually.') }}</p> -->
+                    <!-- TODO: Setup watch tower for auto payout -->
                 </div>
             </div>
 
@@ -160,7 +163,7 @@ import {
     PageBody,
     Tooltip,
     Identicon,
-    CircleSpinner,
+    ArrowRightSmallIcon,
 } from '@nimiq/vue-components';
 import { captureException } from '@sentry/vue';
 
@@ -181,6 +184,7 @@ import { sendStaking } from '../../hub';
 import { useNetworkStore } from '../../stores/Network';
 import { useConfig } from '../../composables/useConfig';
 import { getNetworkClient } from '../../network';
+import ArrowDownIcon from '../icons/ArrowDownIcon.vue';
 
 export default defineComponent({
     setup(props, context) {
@@ -310,72 +314,6 @@ export default defineComponent({
             }
         }
 
-        async function deactivateAll() {
-            context.emit('statusChange', {
-                type: StatusChangeType.DEACTIVATING,
-                state: State.LOADING,
-                title: context.root.$t('Sending Staking Transaction') as string,
-            });
-
-            const validatorLabelOrAddress = 'label' in validator.value!
-                ? validator.value.label : validator.value!.address;
-
-            try {
-                const { Address, TransactionBuilder } = await import('@nimiq/core');
-                const client = await getNetworkClient();
-
-                const transaction = TransactionBuilder.newSetActiveStake(
-                    Address.fromUserFriendlyAddress(activeAddress.value!),
-                    BigInt(0),
-                    BigInt(0),
-                    useNetworkStore().state.height,
-                    await client.getNetworkId(),
-                );
-                const txs = await sendStaking({
-                    transaction: transaction.serialize(),
-                }).catch((error) => {
-                    throw new Error(error.data);
-                });
-
-                if (!txs) {
-                    context.emit('statusChange', {
-                        type: StatusChangeType.NONE,
-                    });
-                    return;
-                }
-
-                if (txs.some((tx) => tx.executionResult === false)) {
-                    throw new Error('The transaction did not succeed');
-                }
-
-                context.emit('statusChange', {
-                    state: State.SUCCESS,
-                    title: context.root.$t(
-                        'Successfully deactivated {amount} NIM from your stake with {validator}',
-                        {
-                            amount: Math.abs(stake.value!.activeBalance / 1e5),
-                            validator: validatorLabelOrAddress,
-                        },
-                    ),
-                });
-
-                context.emit('statusChange', {
-                    type: StatusChangeType.NONE,
-                    timeout: SUCCESS_REDIRECT_DELAY,
-                });
-            } catch (error: any) {
-                if (config.reportToSentry) captureException(error);
-                else console.error(error); // eslint-disable-line no-console
-
-                // Show error screen
-                context.emit('statusChange', {
-                    state: State.WARNING,
-                    title: context.root.$t('Something went wrong') as string,
-                    message: `${error.message} - ${error.data}`,
-                });
-            }
-        }
-
         return {
             // NOW,
             // MONTH,
@@ -388,7 +326,6 @@ export default defineComponent({
             hasUnstakableStake,
             isStakeDeactivating,
             unstakeAll,
-            deactivateAll,
             canSwitchValidator,
             consensus,
             MIN_STAKE,
@@ -405,8 +342,9 @@ export default defineComponent({
         ValidatorTrustScore,
         ValidatorRewardBubble,
         Identicon,
-        CircleSpinner,
         ShortAddress,
+        ArrowDownIcon,
+        ArrowRightSmallIcon,
     },
 });
 </script>
@@ -475,7 +413,7 @@ export default defineComponent({
     }
 
     .adjust-stake {
-        margin-right: 2rem;
+        // margin-right: 2rem;
         ::v-deep .tooltip-box {
             width: 25.75rem;
         }
@@ -495,21 +433,62 @@ export default defineComponent({
     }
 
     .unstaking {
+        flex-wrap: wrap;
         align-items: center;
         font-size: var(--body-size);
         font-weight: 600;
         margin-top: 2rem;
 
-        ::v-deep .circle-spinner {
-            margin-right: 1rem;
-        }
+        .nq-button-s,
+        .nq-button-pill {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            color: white;
 
-        .inactive-release-timer {
-            box-shadow: 0 0 0 1.5px nimiq-light-blue(0.4);
-            border-radius: 5rem;
-            line-height: 1;
-            padding: 0.25rem 0.75rem;
-            font-size: var(--small-size);
+            &:first-child {
+                z-index: 2;
+                box-shadow: 0px 0px 0px 3px white;
+                cursor: default;
+
+                .nq-icon {
+                    margin-right: 0.75rem;
+                }
+            }
+
+            &:nth-child(2) {
+                padding-left: 2rem;
+                margin-left: -0.4rem;
+
+                --left-radius: 0px;
+                border-top-left-radius: var(--left-radius);
+                border-bottom-left-radius: var(--left-radius);
+
+                .nq-icon {
+                    margin-left: 0.75rem;
+                }
+            }
+
+            &.unstaking-amount { background-color: #797B91 }
+
+            &.unstaking-progress {
+                color: nimiq-blue(0.6);
+
+                pointer-events: none;
+                cursor: default;
+
+                span {
+                    color: nimiq-blue(1);
+                    margin-left: 1rem;
+                }
+            }
+        }
+        p {
+            color: nimiq-blue(0.6);
+            font-size: 1.5rem;
+            margin: 0;
+            margin-top: 1rem;
+            width: 100%;
         }
     }
 
diff --git a/src/components/swap/SwapModal.vue b/src/components/swap/SwapModal.vue
index 039073a2f..2c9f59ea7 100644
--- a/src/components/swap/SwapModal.vue
+++ b/src/components/swap/SwapModal.vue
@@ -2307,7 +2307,7 @@ export default defineComponent({
         }
 
         background-color: nimiq-blue(0.06);
-        background-image: url('../../assets/arrow-down.svg');
+        background-image: url('../../assets/mini-arrow-down.svg');
         background-size: 1.25rem;
         background-repeat: no-repeat;
         background-position-x: calc(100% - 1.75rem);
diff --git a/src/i18n/en.po b/src/i18n/en.po
index ee18227aa..98c391183 100644
--- a/src/i18n/en.po
+++ b/src/i18n/en.po
@@ -375,11 +375,6 @@ msgstr ""
 msgid "Automatic mode uses {behavior}."
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:100
-#: src/components/staking/StakingInfoPage.vue:81
-msgid "available to unstake"
-msgstr ""
-
 #: src/components/swap/SwapAnimation.vue:294
 msgid "Awaiting swap secret"
 msgstr ""
@@ -825,18 +820,10 @@ msgstr ""
 msgid "Credit Card"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:74
-msgid "Deactivate All"
-msgstr ""
-
 #: src/lib/StakingUtils.ts:55
 msgid "Deactivate validator"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:93
-msgid "Deactivating"
-msgstr ""
-
 #: src/lib/StakingUtils.ts:28
 msgid "Delete validator"
 msgstr ""
@@ -1298,7 +1285,7 @@ msgstr ""
 msgid "In case of any issues, like exceeded limits or insufficient amounts, the automatic refunds will only work for individual IBAN addresses."
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:204
+#: src/components/staking/StakingInfoPage.vue:208
 msgid "Inactive validator"
 msgstr ""
 
@@ -2040,7 +2027,6 @@ msgstr ""
 
 #: src/components/staking/StakingGraphPage.vue:139
 #: src/components/staking/StakingGraphPage.vue:221
-#: src/components/staking/StakingInfoPage.vue:317
 msgid "Sending Staking Transaction"
 msgstr ""
 
@@ -2050,7 +2036,7 @@ msgstr ""
 msgid "Sending Transaction"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:242
+#: src/components/staking/StakingInfoPage.vue:246
 msgid "Sending Unstaking Transaction"
 msgstr ""
 
@@ -2196,8 +2182,7 @@ msgstr ""
 #: src/components/modals/SendModal.vue:826
 #: src/components/modals/UsdcSendModal.vue:646
 #: src/components/staking/StakingGraphPage.vue:276
-#: src/components/staking/StakingInfoPage.vue:307
-#: src/components/staking/StakingInfoPage.vue:373
+#: src/components/staking/StakingInfoPage.vue:311
 #: src/components/staking/StakingValidatorPage.vue:154
 msgid "Something went wrong"
 msgstr ""
@@ -2281,7 +2266,6 @@ msgid "Successfully changed validator to {validator}"
 msgstr ""
 
 #: src/components/staking/StakingGraphPage.vue:250
-#: src/components/staking/StakingInfoPage.vue:353
 msgid "Successfully deactivated {amount} NIM from your stake with {validator}"
 msgstr ""
 
@@ -2289,7 +2273,7 @@ msgstr ""
 msgid "Successfully staked {amount} NIM with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:292
+#: src/components/staking/StakingInfoPage.vue:296
 msgid "Successfully unstaked {amount} NIM"
 msgstr ""
 
@@ -2378,7 +2362,7 @@ msgstr ""
 msgid "Switch validator"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:142
+#: src/components/staking/StakingInfoPage.vue:145
 msgid "Switch Validator"
 msgstr ""
 
@@ -2660,7 +2644,7 @@ msgstr ""
 msgid "Unlock at any time. Your NIM will be available within hours."
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:203
+#: src/components/staking/StakingInfoPage.vue:207
 #: src/components/staking/ValidatorListItem.vue:53
 msgid "Unregistered validator"
 msgstr ""
@@ -2669,11 +2653,6 @@ msgstr ""
 msgid "Unstake"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:107
-#: src/components/staking/StakingInfoPage.vue:89
-msgid "Unstake All"
-msgstr ""
-
 #: src/swap-kyc-handler.ts:148
 #: src/swap-kyc-handler.ts:157
 msgid "Unsupported currency"
@@ -2725,7 +2704,7 @@ msgstr ""
 msgid "Use the slider to lock your NIM and earn rewards."
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:116
+#: src/components/staking/StakingInfoPage.vue:119
 msgid "Validator"
 msgstr ""