diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
index 63a84129a8d..878f7d717c1 100644
--- a/CHANGELOG-Nns-Dapp-unreleased.md
+++ b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -15,11 +15,9 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
-* Add feature flag `ENABLE_HIDE_ZERO_BALANCE`.
-
 #### Changed
 
-* Adjusted table colors in dark theme.
+* Always omit the account parameter in the URL when navigating to a main account.
 
 #### Deprecated
 
@@ -27,8 +25,6 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Fixed
 
-* Min ckBTC withdrawal amount was unknown when withdrawing directly from My Tokens.
-* Fix menu width in collapsed state.
 * Make token table rows always clickable. A few edge cases were missing.
 
 #### Security
diff --git a/CHANGELOG-Nns-Dapp.md b/CHANGELOG-Nns-Dapp.md
index 6a578c0074c..a29387e0fb2 100644
--- a/CHANGELOG-Nns-Dapp.md
+++ b/CHANGELOG-Nns-Dapp.md
@@ -11,6 +11,25 @@ The NNS Dapp is released through proposals in the Network Nervous System. Theref
 Unreleased changes are added to `CHANGELOG-Nns-Dapp-unreleased.md` and moved
 here after a successful release.
 
+## Proposal 128768
+
+### Application
+
+#### Added
+
+* Add feature flag `ENABLE_HIDE_ZERO_BALANCE`.
+
+#### Changed
+
+* Adjusted table colors in dark theme.
+
+#### Fixed
+
+* Min ckBTC withdrawal amount was unknown when withdrawing directly from My Tokens.
+* Fix menu width in collapsed state.
+
+### Operations
+
 ## Proposal 128350
 
 ### Application
diff --git a/Cargo.lock b/Cargo.lock
index 5db8fd62f02..804fda2b47b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4081,7 +4081,7 @@ dependencies = [
 
 [[package]]
 name = "nns-dapp"
-version = "2.0.70"
+version = "2.0.71"
 dependencies = [
  "anyhow",
  "base64 0.21.5",
@@ -4669,7 +4669,7 @@ dependencies = [
 
 [[package]]
 name = "proposals"
-version = "2.0.70"
+version = "2.0.71"
 dependencies = [
  "anyhow",
  "candid 0.8.4",
@@ -5346,7 +5346,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "sns_aggregator"
-version = "2.0.70"
+version = "2.0.71"
 dependencies = [
  "anyhow",
  "base64 0.21.5",
diff --git a/Cargo.toml b/Cargo.toml
index e0e6210fbc4..c9330538c93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "2.0.70"
+version = "2.0.71"
 
 [workspace.dependencies]
 ic-cdk = "0.9.2"
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7cb7fd9cb05..e3e3130a46b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@dfinity/nns-dapp",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@dfinity/nns-dapp",
-      "version": "2.0.70",
+      "version": "2.0.71",
       "license": "SEE LICENSE IN LICENSE.md",
       "dependencies": {
         "@dfinity/agent": "^1.0.1",
@@ -251,9 +251,9 @@
       }
     },
     "node_modules/@dfinity/ckbtc": {
-      "version": "2.2.1-next-2024-03-05.2",
-      "resolved": "https://registry.npmjs.org/@dfinity/ckbtc/-/ckbtc-2.2.1-next-2024-03-05.2.tgz",
-      "integrity": "sha512-uCHwge25jrSgJoIcf6kr7iHpBfvKQVcHSzSAje2kcmMHpeYZ84uxH46WeUUDzY8MurQmOqu8AqBFBOwLEv4Pcw==",
+      "version": "2.3.1-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ckbtc/-/ckbtc-2.3.1-next-2024-03-25.1.tgz",
+      "integrity": "sha512-5qh0DViERwCuaYpFyJYFoFjMAMWU/wdTu3eHF94HWH3Uyc8V7wOJpQTFO7LxBeKNMhBqweQFG0pAAlb6EPPsVA==",
       "dependencies": {
         "@noble/hashes": "^1.3.2",
         "base58-js": "^1.0.5",
@@ -267,9 +267,9 @@
       }
     },
     "node_modules/@dfinity/cmc": {
-      "version": "3.0.2-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/cmc/-/cmc-3.0.2-next-2024-03-05.3.tgz",
-      "integrity": "sha512-yGyTUpBFOpQUe1gtxdpslfBxnAj78fUz66GD01zm+RaAx/Mrl74LpzAumu5bbjLIxrsXFdaM+xucWKR1aW7s8w==",
+      "version": "3.0.3-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/cmc/-/cmc-3.0.3-next-2024-03-25.1.tgz",
+      "integrity": "sha512-KC0Y/cn49cs+Nm4s3OpQJtfmfdUOkvRNApj41I+KseVvVnpp6E8ZTcMFtezhD4gMqm8kyKEm7T6fywFHacDL6Q==",
       "peerDependencies": {
         "@dfinity/agent": "*",
         "@dfinity/candid": "*",
@@ -278,9 +278,9 @@
       }
     },
     "node_modules/@dfinity/gix-components": {
-      "version": "4.1.0-next-2024-03-20.1",
-      "resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-4.1.0-next-2024-03-20.1.tgz",
-      "integrity": "sha512-V78uupNj0vXcK9Pck5fc4QaMCPPjXsh4lPGMrRSjNI/dM9BJqKjOlr46DyAV0oZBN2rY+Z1WtvKps5fHcU0Stg==",
+      "version": "4.1.0-next-2024-03-22.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-4.1.0-next-2024-03-22.1.tgz",
+      "integrity": "sha512-q5LBM0xjE7sBag7WcffwPY595QlO+nT6HAjvDtVmzERLErQw4iq+DcGjNMXYmgPNijb1gLwovYv293k3iL/e+g==",
       "dependencies": {
         "dompurify": "^3.0.8",
         "html5-qrcode": "^2.3.8",
@@ -292,9 +292,9 @@
       }
     },
     "node_modules/@dfinity/ic-management": {
-      "version": "3.0.0-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-3.0.0-next-2024-03-05.tgz",
-      "integrity": "sha512-KB1MH2XfFoPDaqTN4U6tiNGWf5cFjSbUlrLBmmMgMQNbRIXS5LZ8SX0KawGS+Oco/sXucS3ZK0sBzU25hBBuQw==",
+      "version": "3.1.1-next-2024-03-25",
+      "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-3.1.1-next-2024-03-25.tgz",
+      "integrity": "sha512-SX7k/h5j01RQUVUVtU1WYu528gftc48EoswOCwENxDLIV1DyjfAn4/qkY9/gxTKB/OitBMBpqkYdeCHLC2r9qQ==",
       "peerDependencies": {
         "@dfinity/agent": "*",
         "@dfinity/candid": "*",
@@ -318,9 +318,9 @@
       }
     },
     "node_modules/@dfinity/ledger-icp": {
-      "version": "2.2.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icp/-/ledger-icp-2.2.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-TKHcUQ/cpbglnN2mXTu+dZ+6LSGaZjDVotNmkjp9fyj0ZaCJBLEwFizAJYUgAg80dTNHjMRr653kq2AXgb4TIw==",
+      "version": "2.2.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icp/-/ledger-icp-2.2.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-0TxMKLueO4gyHNMbaJDzphFndUZ1tdQRf4meOu/Db1FgzQs3HXX4Ti/zqP9hDhMWwp/nbnuBkl1bUImVIe9KWA==",
       "peerDependencies": {
         "@dfinity/agent": "*",
         "@dfinity/candid": "*",
@@ -330,9 +330,9 @@
       }
     },
     "node_modules/@dfinity/ledger-icrc": {
-      "version": "2.2.0-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icrc/-/ledger-icrc-2.2.0-next-2024-03-05.tgz",
-      "integrity": "sha512-i0rOHLtBpqvstJdcl7Fa5khxDKr4d5Fskp/3B6E8k0sfIHydFLJOEl5E18LRT8IRP9GN43v3a2euBJCDtDK5bQ==",
+      "version": "2.2.1-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icrc/-/ledger-icrc-2.2.1-next-2024-03-25.1.tgz",
+      "integrity": "sha512-AsAzjy0C/mumA3mi0GlJu2HmT7LyZ5MN24oh9oVclqHVBrHi63tO/E0UgfkMBiRmJfZZpHwXW4Hik1L1AEbvqQ==",
       "peerDependencies": {
         "@dfinity/agent": "*",
         "@dfinity/candid": "*",
@@ -341,9 +341,9 @@
       }
     },
     "node_modules/@dfinity/nns": {
-      "version": "4.0.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/nns/-/nns-4.0.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-332Dw9ExcNyyNDe9jRnZipBsFl4AmTam+63jTt2B6yv4CQNFfyTm+yl6Z3r6W9RLasqvpPYPImHLoCG9B1smFg==",
+      "version": "4.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/nns/-/nns-4.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-44d5H983YynMT5WYOkPSjpcI93tuQHY7N5XQt0QI45ZxS28Upl8X0hyQRbk1Zrls4UeM9ezgOCOCdgi74YUD0w==",
       "dependencies": {
         "@noble/hashes": "^1.3.2",
         "randombytes": "^2.1.0"
@@ -358,9 +358,9 @@
       }
     },
     "node_modules/@dfinity/nns-proto": {
-      "version": "1.0.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/nns-proto/-/nns-proto-1.0.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-ONpomyj5wom2nHsa46qB5NrnPyOa22z4p4/R8HtbB8xiD1FBkeKFG5uMjlh35KDhP7cj2mR/dClxuJylyxPb/Q==",
+      "version": "1.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/nns-proto/-/nns-proto-1.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-Qnb5mIEANzEtqVtbcAEawGPOamuafUc+OwfqqxXXf58Oz9QfEc7c716nn1xbSguqEW3z4lGV6FQm/FvG6Ka4cw==",
       "dependencies": {
         "google-protobuf": "^3.21.2"
       }
@@ -374,9 +374,9 @@
       }
     },
     "node_modules/@dfinity/sns": {
-      "version": "3.0.1-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/sns/-/sns-3.0.1-next-2024-03-05.tgz",
-      "integrity": "sha512-/wpV6XA2g0ZBGOFxjllftU16krkbsgVANKJgve8k999p9B9bXvRN4sC0hBnZzh1XP3zv6dP4ACPq5SpEJcKZJw==",
+      "version": "3.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/sns/-/sns-3.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-mljahoI6whwQXm4PacC6fzYP3/9OYAccF9W9x5BffxvRnNdZBT94AQCA3vKsrcUUcRmb+AbCHEVHnz0AI/QaMQ==",
       "dependencies": {
         "@noble/hashes": "^1.3.2"
       },
@@ -389,9 +389,9 @@
       }
     },
     "node_modules/@dfinity/utils": {
-      "version": "2.1.2-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-2.1.2-next-2024-03-05.3.tgz",
-      "integrity": "sha512-ZFnAGsckgepLrRyLncwfL5qkjAnzXFkksm6dgGQ/EqBoESMHnQsyIrySxiEVI+tir7RsB7JIEF/JGddbHaUjPA==",
+      "version": "2.1.3-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-2.1.3-next-2024-03-25.1.tgz",
+      "integrity": "sha512-Brv61FMlvI05alMS6c85dTFcwrb9ORWSiHh49+FfoD0mxeKaDM8LjzC/wO5Xyd58+ORtSRnmypMnt/803Bd1Jw==",
       "peerDependencies": {
         "@dfinity/agent": "*",
         "@dfinity/candid": "*",
@@ -7047,9 +7047,9 @@
       "requires": {}
     },
     "@dfinity/ckbtc": {
-      "version": "2.2.1-next-2024-03-05.2",
-      "resolved": "https://registry.npmjs.org/@dfinity/ckbtc/-/ckbtc-2.2.1-next-2024-03-05.2.tgz",
-      "integrity": "sha512-uCHwge25jrSgJoIcf6kr7iHpBfvKQVcHSzSAje2kcmMHpeYZ84uxH46WeUUDzY8MurQmOqu8AqBFBOwLEv4Pcw==",
+      "version": "2.3.1-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ckbtc/-/ckbtc-2.3.1-next-2024-03-25.1.tgz",
+      "integrity": "sha512-5qh0DViERwCuaYpFyJYFoFjMAMWU/wdTu3eHF94HWH3Uyc8V7wOJpQTFO7LxBeKNMhBqweQFG0pAAlb6EPPsVA==",
       "requires": {
         "@noble/hashes": "^1.3.2",
         "base58-js": "^1.0.5",
@@ -7057,15 +7057,15 @@
       }
     },
     "@dfinity/cmc": {
-      "version": "3.0.2-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/cmc/-/cmc-3.0.2-next-2024-03-05.3.tgz",
-      "integrity": "sha512-yGyTUpBFOpQUe1gtxdpslfBxnAj78fUz66GD01zm+RaAx/Mrl74LpzAumu5bbjLIxrsXFdaM+xucWKR1aW7s8w==",
+      "version": "3.0.3-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/cmc/-/cmc-3.0.3-next-2024-03-25.1.tgz",
+      "integrity": "sha512-KC0Y/cn49cs+Nm4s3OpQJtfmfdUOkvRNApj41I+KseVvVnpp6E8ZTcMFtezhD4gMqm8kyKEm7T6fywFHacDL6Q==",
       "requires": {}
     },
     "@dfinity/gix-components": {
-      "version": "4.1.0-next-2024-03-20.1",
-      "resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-4.1.0-next-2024-03-20.1.tgz",
-      "integrity": "sha512-V78uupNj0vXcK9Pck5fc4QaMCPPjXsh4lPGMrRSjNI/dM9BJqKjOlr46DyAV0oZBN2rY+Z1WtvKps5fHcU0Stg==",
+      "version": "4.1.0-next-2024-03-22.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-4.1.0-next-2024-03-22.1.tgz",
+      "integrity": "sha512-q5LBM0xjE7sBag7WcffwPY595QlO+nT6HAjvDtVmzERLErQw4iq+DcGjNMXYmgPNijb1gLwovYv293k3iL/e+g==",
       "requires": {
         "dompurify": "^3.0.8",
         "html5-qrcode": "^2.3.8",
@@ -7073,9 +7073,9 @@
       }
     },
     "@dfinity/ic-management": {
-      "version": "3.0.0-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-3.0.0-next-2024-03-05.tgz",
-      "integrity": "sha512-KB1MH2XfFoPDaqTN4U6tiNGWf5cFjSbUlrLBmmMgMQNbRIXS5LZ8SX0KawGS+Oco/sXucS3ZK0sBzU25hBBuQw==",
+      "version": "3.1.1-next-2024-03-25",
+      "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-3.1.1-next-2024-03-25.tgz",
+      "integrity": "sha512-SX7k/h5j01RQUVUVtU1WYu528gftc48EoswOCwENxDLIV1DyjfAn4/qkY9/gxTKB/OitBMBpqkYdeCHLC2r9qQ==",
       "requires": {}
     },
     "@dfinity/identity": {
@@ -7089,30 +7089,30 @@
       }
     },
     "@dfinity/ledger-icp": {
-      "version": "2.2.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icp/-/ledger-icp-2.2.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-TKHcUQ/cpbglnN2mXTu+dZ+6LSGaZjDVotNmkjp9fyj0ZaCJBLEwFizAJYUgAg80dTNHjMRr653kq2AXgb4TIw==",
+      "version": "2.2.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icp/-/ledger-icp-2.2.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-0TxMKLueO4gyHNMbaJDzphFndUZ1tdQRf4meOu/Db1FgzQs3HXX4Ti/zqP9hDhMWwp/nbnuBkl1bUImVIe9KWA==",
       "requires": {}
     },
     "@dfinity/ledger-icrc": {
-      "version": "2.2.0-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icrc/-/ledger-icrc-2.2.0-next-2024-03-05.tgz",
-      "integrity": "sha512-i0rOHLtBpqvstJdcl7Fa5khxDKr4d5Fskp/3B6E8k0sfIHydFLJOEl5E18LRT8IRP9GN43v3a2euBJCDtDK5bQ==",
+      "version": "2.2.1-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/ledger-icrc/-/ledger-icrc-2.2.1-next-2024-03-25.1.tgz",
+      "integrity": "sha512-AsAzjy0C/mumA3mi0GlJu2HmT7LyZ5MN24oh9oVclqHVBrHi63tO/E0UgfkMBiRmJfZZpHwXW4Hik1L1AEbvqQ==",
       "requires": {}
     },
     "@dfinity/nns": {
-      "version": "4.0.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/nns/-/nns-4.0.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-332Dw9ExcNyyNDe9jRnZipBsFl4AmTam+63jTt2B6yv4CQNFfyTm+yl6Z3r6W9RLasqvpPYPImHLoCG9B1smFg==",
+      "version": "4.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/nns/-/nns-4.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-44d5H983YynMT5WYOkPSjpcI93tuQHY7N5XQt0QI45ZxS28Upl8X0hyQRbk1Zrls4UeM9ezgOCOCdgi74YUD0w==",
       "requires": {
         "@noble/hashes": "^1.3.2",
         "randombytes": "^2.1.0"
       }
     },
     "@dfinity/nns-proto": {
-      "version": "1.0.1-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/nns-proto/-/nns-proto-1.0.1-next-2024-03-05.3.tgz",
-      "integrity": "sha512-ONpomyj5wom2nHsa46qB5NrnPyOa22z4p4/R8HtbB8xiD1FBkeKFG5uMjlh35KDhP7cj2mR/dClxuJylyxPb/Q==",
+      "version": "1.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/nns-proto/-/nns-proto-1.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-Qnb5mIEANzEtqVtbcAEawGPOamuafUc+OwfqqxXXf58Oz9QfEc7c716nn1xbSguqEW3z4lGV6FQm/FvG6Ka4cw==",
       "requires": {
         "google-protobuf": "^3.21.2"
       }
@@ -7126,17 +7126,17 @@
       }
     },
     "@dfinity/sns": {
-      "version": "3.0.1-next-2024-03-05",
-      "resolved": "https://registry.npmjs.org/@dfinity/sns/-/sns-3.0.1-next-2024-03-05.tgz",
-      "integrity": "sha512-/wpV6XA2g0ZBGOFxjllftU16krkbsgVANKJgve8k999p9B9bXvRN4sC0hBnZzh1XP3zv6dP4ACPq5SpEJcKZJw==",
+      "version": "3.0.2-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/sns/-/sns-3.0.2-next-2024-03-25.1.tgz",
+      "integrity": "sha512-mljahoI6whwQXm4PacC6fzYP3/9OYAccF9W9x5BffxvRnNdZBT94AQCA3vKsrcUUcRmb+AbCHEVHnz0AI/QaMQ==",
       "requires": {
         "@noble/hashes": "^1.3.2"
       }
     },
     "@dfinity/utils": {
-      "version": "2.1.2-next-2024-03-05.3",
-      "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-2.1.2-next-2024-03-05.3.tgz",
-      "integrity": "sha512-ZFnAGsckgepLrRyLncwfL5qkjAnzXFkksm6dgGQ/EqBoESMHnQsyIrySxiEVI+tir7RsB7JIEF/JGddbHaUjPA==",
+      "version": "2.1.3-next-2024-03-25.1",
+      "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-2.1.3-next-2024-03-25.1.tgz",
+      "integrity": "sha512-Brv61FMlvI05alMS6c85dTFcwrb9ORWSiHh49+FfoD0mxeKaDM8LjzC/wO5Xyd58+ORtSRnmypMnt/803Bd1Jw==",
       "requires": {}
     },
     "@esbuild/android-arm": {
diff --git a/frontend/package.json b/frontend/package.json
index 2531aaa2381..56a9ee5821f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dfinity/nns-dapp",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "private": true,
   "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {
diff --git a/frontend/src/lib/components/proposal-detail/NnsProposal.svelte b/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
index f048f57286b..aa1315ca625 100644
--- a/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
+++ b/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
@@ -22,6 +22,8 @@
   import { AppPath } from "$lib/constants/routes.constants";
   import { SplitBlock } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
+  import { actionableProposalsSegmentStore } from "$lib/stores/actionable-proposals-segment.store";
+  import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store";
 
   const { store } = getContext<SelectedProposalContext>(
     SELECTED_PROPOSAL_CONTEXT_KEY
@@ -33,7 +35,10 @@
     : undefined;
 
   let proposalIds: bigint[] | undefined;
-  $: proposalIds = $filteredProposals.proposals?.map(({ id }) => id as bigint);
+  $: proposalIds =
+    $actionableProposalsSegmentStore.selected === "actionable"
+      ? $actionableNnsProposalsStore.proposals?.map(({ id }) => id as bigint)
+      : $filteredProposals.proposals?.map(({ id }) => id as bigint);
 </script>
 
 <TestIdWrapper testId="nns-proposal-component">
diff --git a/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte b/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte
index 399e9e74520..8b0ad3bdd3a 100644
--- a/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte
+++ b/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte
@@ -61,6 +61,7 @@
     on:click={selectNewer}
     class:hidden={isNullish(newerId)}
     data-tid="proposal-nav-newer"
+    data-test-proposal-id={newerId?.toString() ?? ""}
   >
     <IconLeft />
     {$i18n.proposal_detail.newer_short}</button
@@ -72,6 +73,7 @@
     on:click={selectOlder}
     class:hidden={isNullish(olderId)}
     data-tid="proposal-nav-older"
+    data-test-proposal-id={olderId?.toString() ?? ""}
   >
     {$i18n.proposal_detail.older_short}
     <IconRight />
diff --git a/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte b/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
index 5dee6de9f18..ed51fe9a179 100644
--- a/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
+++ b/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { i18n } from "$lib/stores/i18n";
   import type { UserToken } from "$lib/types/tokens-page";
+  import { heightTransition } from "$lib/utils/transition.utils";
   import { nonNullish } from "@dfinity/utils";
   import TokensTableRow from "./TokensTableRow.svelte";
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
@@ -35,8 +36,8 @@
     </div>
   </div>
   <div role="rowgroup">
-    {#each userTokensData as userTokenData}
-      <div class="row-wrapper">
+    {#each userTokensData as userTokenData (userTokenData.rowHref)}
+      <div class="row-wrapper" transition:heightTransition={{ duration: 250 }}>
         <TokensTableRow on:nnsAction {userTokenData} />
       </div>
     {/each}
diff --git a/frontend/src/lib/components/tokens/TokensTable/TokensTableRow.svelte b/frontend/src/lib/components/tokens/TokensTable/TokensTableRow.svelte
index 5c8dac29081..51a2322823c 100644
--- a/frontend/src/lib/components/tokens/TokensTable/TokensTableRow.svelte
+++ b/frontend/src/lib/components/tokens/TokensTable/TokensTableRow.svelte
@@ -4,16 +4,11 @@
     type UserTokenData,
     type UserTokenLoading,
   } from "$lib/types/tokens-page";
-  import {
-    SvelteComponent,
-    createEventDispatcher,
-    type ComponentType,
-  } from "svelte";
+  import type { SvelteComponent, ComponentType } from "svelte";
   import Logo from "../../ui/Logo.svelte";
   import GoToDetailIcon from "./actions/GoToDetailIcon.svelte";
   import ReceiveButton from "./actions/ReceiveButton.svelte";
   import SendButton from "./actions/SendButton.svelte";
-  import { ActionType } from "$lib/types/actions";
   import { UnavailableTokenAmount } from "$lib/utils/token.utils";
   import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import { nonNullish } from "@dfinity/utils";
@@ -23,8 +18,6 @@
 
   export let userTokenData: UserTokenData | UserTokenLoading;
 
-  const dispatcher = createEventDispatcher();
-
   const actionMapper: Record<
     UserTokenAction,
     ComponentType<SvelteComponent<{ userToken: UserTokenData }>>
@@ -37,16 +30,6 @@
   let userToken: UserTokenData | undefined;
   $: userToken = isUserTokenData(userTokenData) ? userTokenData : undefined;
 
-  const handleClick = () => {
-    if (nonNullish(userToken)) {
-      // Actions can only be dispatched with `UserTokenData`
-      dispatcher("nnsAction", {
-        type: ActionType.GoToTokenDetail,
-        data: userToken,
-      });
-    }
-  };
-
   // Should be the same as the area in the classes `rows-count-X`.
   const cellAreaName = (index: number) => `cell-${index}`;
   // This will allow us to have different number of rows depending on the number of columns.
@@ -61,8 +44,6 @@
   href={userTokenData.rowHref}
   role="row"
   tabindex="0"
-  on:keypress={handleClick}
-  on:click={handleClick}
   data-tid="tokens-table-row-component"
   class={mobileTemplateClass(2)}
   data-title={userTokenData.title}
diff --git a/frontend/src/lib/derived/icp-tokens-list-user.derived.ts b/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
index dec3323a562..d90fc8c05e4 100644
--- a/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
+++ b/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
@@ -24,7 +24,7 @@ const convertAccountToUserTokenData = ({
 }): UserToken => {
   const rowHref = buildWalletUrl({
     universe: nnsUniverse.canisterId.toString(),
-    account: account?.identifier,
+    account: account?.type !== "main" ? account?.identifier : undefined,
   });
   if (isNullish(account)) {
     return {
diff --git a/frontend/src/lib/derived/tokens-list-user.derived.ts b/frontend/src/lib/derived/tokens-list-user.derived.ts
index 6c11abffca5..e89aa3dc5f5 100644
--- a/frontend/src/lib/derived/tokens-list-user.derived.ts
+++ b/frontend/src/lib/derived/tokens-list-user.derived.ts
@@ -1,9 +1,4 @@
 import { OWN_CANISTER_ID_TEXT } from "$lib/constants/canister-ids.constants";
-import {
-  authStore,
-  type AuthStore,
-  type AuthStoreData,
-} from "$lib/stores/auth.store";
 import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import {
   UserTokenAction,
@@ -13,8 +8,7 @@ import {
 import { sumAccounts } from "$lib/utils/accounts.utils";
 import { buildAccountsUrl, buildWalletUrl } from "$lib/utils/navigation.utils";
 import { isUniverseNns } from "$lib/utils/universe.utils";
-import { encodeIcrcAccount } from "@dfinity/ledger-icrc";
-import { isNullish, TokenAmountV2 } from "@dfinity/utils";
+import { TokenAmountV2, isNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
 import type { UniversesAccounts } from "./accounts-list.derived";
 import { tokensListBaseStore } from "./tokens-list-base.derived";
@@ -25,23 +19,16 @@ const convertToUserTokenData = ({
   accounts,
   tokensByUniverse,
   baseTokenData,
-  authData,
 }: {
   accounts: UniversesAccounts;
   tokensByUniverse: Record<string, IcrcTokenMetadata>;
   baseTokenData: UserTokenBase;
-  authData: AuthStoreData;
 }): UserToken => {
   const token = tokensByUniverse[baseTokenData.universeId.toText()];
   const rowHref = isUniverseNns(baseTokenData.universeId)
     ? buildAccountsUrl({ universe: baseTokenData.universeId.toText() })
     : buildWalletUrl({
         universe: baseTokenData.universeId.toText(),
-        account: isNullish(authData.identity)
-          ? undefined
-          : encodeIcrcAccount({
-              owner: authData.identity.getPrincipal(),
-            }),
       });
   const accountsList = accounts[baseTokenData.universeId.toText()];
   const mainAccount = accountsList?.find(({ type }) => type === "main");
@@ -86,23 +73,16 @@ export const tokensListUserStore = derived<
     Readable<UserTokenBase[]>,
     Readable<UniversesAccounts>,
     Readable<Record<string, IcrcTokenMetadata>>,
-    AuthStore,
   ],
   UserToken[]
 >(
-  [
-    tokensListBaseStore,
-    universesAccountsStore,
-    tokensByUniverseIdStore,
-    authStore,
-  ],
-  ([tokensList, accounts, tokensByUniverse, authData]) =>
+  [tokensListBaseStore, universesAccountsStore, tokensByUniverseIdStore],
+  ([tokensList, accounts, tokensByUniverse]) =>
     tokensList.map((baseTokenData) =>
       convertToUserTokenData({
         baseTokenData,
         accounts,
         tokensByUniverse,
-        authData,
       })
     )
 );
diff --git a/frontend/src/lib/pages/SnsProposalDetail.svelte b/frontend/src/lib/pages/SnsProposalDetail.svelte
index 8437bbcc35c..372ebf02d11 100644
--- a/frontend/src/lib/pages/SnsProposalDetail.svelte
+++ b/frontend/src/lib/pages/SnsProposalDetail.svelte
@@ -40,6 +40,8 @@
   import type { SnsNervousSystemFunction } from "@dfinity/sns";
   import { createSnsNsFunctionsProjectStore } from "$lib/derived/sns-ns-functions-project.derived";
   import { tick } from "svelte";
+  import { actionableProposalsSegmentStore } from "$lib/stores/actionable-proposals-segment.store";
+  import { actionableSnsProposalsStore } from "$lib/stores/actionable-sns-proposals.store";
 
   export let proposalIdText: string | undefined | null = undefined;
 
@@ -206,7 +208,9 @@
   let proposalIds: bigint[];
   $: proposalIds = nonNullish(universeIdText)
     ? sortSnsProposalsById(
-        $snsFilteredProposalsStore[universeIdText]?.proposals
+        $actionableProposalsSegmentStore.selected === "actionable"
+          ? $actionableSnsProposalsStore[universeIdText]?.proposals
+          : $snsFilteredProposalsStore[universeIdText]?.proposals
       )?.map(snsProposalId) ?? []
     : [];
 
diff --git a/frontend/src/lib/pages/Tokens.svelte b/frontend/src/lib/pages/Tokens.svelte
index 307b81c4280..2e18160dfdd 100644
--- a/frontend/src/lib/pages/Tokens.svelte
+++ b/frontend/src/lib/pages/Tokens.svelte
@@ -7,6 +7,7 @@
   import type { UserToken } from "$lib/types/tokens-page";
   import { ENABLE_HIDE_ZERO_BALANCE } from "$lib/stores/feature-flags.store";
   import { hideZeroBalancesStore } from "$lib/stores/hide-zero-balances.store";
+  import { heightTransition } from "$lib/utils/transition.utils";
   import { IconSettings } from "@dfinity/gix-components";
   import { Popover } from "@dfinity/gix-components";
   import { TokenAmountV2 } from "@dfinity/utils";
@@ -60,7 +61,10 @@
     </div>
     <div slot="last-row">
       {#if shouldHideZeroBalances}
-        <div class="show-all-row">
+        <div
+          class="show-all-row"
+          transition:heightTransition={{ duration: 250 }}
+        >
           {$i18n.tokens.zero_balance_hidden}
           <button
             data-tid="show-all-button"
@@ -84,13 +88,17 @@
 </TestIdWrapper>
 
 <style lang="scss">
-  @use "@dfinity/gix-components/dist/styles/mixins/header";
+  @use "@dfinity/gix-components/dist/styles/mixins/effect";
 
   .settings-button {
     --content-color: var(--text-description);
 
-    @include header.button(--primary-tint);
-    margin: 0;
+    @include effect.ripple-effect(--primary-tint);
+
+    &:focus {
+      background: var(--primary-tint);
+      @include effect.ripple-effect(--primary-tint);
+    }
   }
 
   [slot="last-row"] {
diff --git a/frontend/src/lib/types/actions.ts b/frontend/src/lib/types/actions.ts
index b9e533b91e8..8affbd2e649 100644
--- a/frontend/src/lib/types/actions.ts
+++ b/frontend/src/lib/types/actions.ts
@@ -2,7 +2,6 @@ import type { UserTokenData } from "./tokens-page";
 
 export enum ActionType {
   Send = "send",
-  GoToTokenDetail = "goToTokenDetail",
   Receive = "receive",
 }
 
diff --git a/frontend/src/lib/utils/transition.utils.ts b/frontend/src/lib/utils/transition.utils.ts
new file mode 100644
index 00000000000..7225d7a97c2
--- /dev/null
+++ b/frontend/src/lib/utils/transition.utils.ts
@@ -0,0 +1,20 @@
+export const heightTransition = (
+  element: HTMLElement,
+  {
+    delay,
+    duration,
+  }: {
+    delay?: number;
+    duration?: number;
+  }
+) => {
+  const height = element.offsetHeight;
+  return {
+    delay,
+    duration,
+    css: (t: number) =>
+      `height: ${
+        t * height
+      }px; transform: scale(1, ${t}); transform-origin: top`,
+  };
+};
diff --git a/frontend/src/tests/lib/components/proposal-detail/NnsProposal.spec.ts b/frontend/src/tests/lib/components/proposal-detail/NnsProposal.spec.ts
index 87d4d75ca9a..f0a78af73c3 100644
--- a/frontend/src/tests/lib/components/proposal-detail/NnsProposal.spec.ts
+++ b/frontend/src/tests/lib/components/proposal-detail/NnsProposal.spec.ts
@@ -1,6 +1,8 @@
 import * as proposalsApi from "$lib/api/proposals.api";
 import { AppPath } from "$lib/constants/routes.constants";
 import { filteredProposals } from "$lib/derived/proposals.derived";
+import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store";
+import { actionableProposalsSegmentStore } from "$lib/stores/actionable-proposals-segment.store";
 import { referrerPathStore } from "$lib/stores/routes.store";
 import {
   generateMockProposals,
@@ -42,6 +44,7 @@ describe("Proposal", () => {
     });
 
   beforeEach(() => {
+    actionableProposalsSegmentStore.resetForTesting();
     vi.spyOn(proposalsApi, "queryProposalPayload").mockResolvedValue({});
   });
 
@@ -93,7 +96,28 @@ describe("Proposal", () => {
     const po = ProposalNavigationPo.under(new JestPageObjectElement(container));
 
     expect(await po.getOlderButtonPo().isPresent()).toBe(true);
+    expect(await po.getOlderButtonProposalId()).toEqual("4");
     expect(await po.getNewerButtonPo().isPresent()).toBe(true);
+    expect(await po.getNewerButtonProposalId()).toEqual("6");
+  });
+
+  it("should use actionable proposals for navigation when actionable selected", async () => {
+    actionableProposalsSegmentStore.set("actionable");
+
+    // Keep "all" proposals empty to make the test fail if not using the actionable proposals
+    vi.spyOn(filteredProposals, "subscribe").mockImplementation(
+      createMockProposalsStoreSubscribe([])
+    );
+    // Set proposals with ids: 0, 1, 2
+    actionableNnsProposalsStore.setProposals(generateMockProposals(3));
+
+    const { container } = renderProposalModern(1n);
+    const po = ProposalNavigationPo.under(new JestPageObjectElement(container));
+
+    expect(await po.getOlderButtonPo().isPresent()).toBe(true);
+    expect(await po.getOlderButtonProposalId()).toEqual("0");
+    expect(await po.getNewerButtonPo().isPresent()).toBe(true);
+    expect(await po.getNewerButtonProposalId()).toEqual("2");
   });
 
   it("should not render proposal navigation when on launchpad", async () => {
diff --git a/frontend/src/tests/lib/components/proposal-detail/ProposalNavigation.spec.ts b/frontend/src/tests/lib/components/proposal-detail/ProposalNavigation.spec.ts
index 7b7a2f1057c..c6803b3ceee 100644
--- a/frontend/src/tests/lib/components/proposal-detail/ProposalNavigation.spec.ts
+++ b/frontend/src/tests/lib/components/proposal-detail/ProposalNavigation.spec.ts
@@ -84,6 +84,19 @@ describe("ProposalNavigation", () => {
         expect(await po.getOlderButtonPo().isPresent()).toBe(true);
       });
 
+      it("should render test ids", async () => {
+        const po = renderComponent({
+          title: "Title",
+          currentProposalId: 1n,
+          currentProposalStatus: "open",
+          proposalIds: [2n, 1n, 0n],
+          selectProposal: vi.fn(),
+        });
+
+        expect(await po.getNewerButtonProposalId()).toEqual("2");
+        expect(await po.getOlderButtonProposalId()).toEqual("0");
+      });
+
       it("should enable both buttons", async () => {
         const po = renderComponent({
           title: "Title",
diff --git a/frontend/src/tests/lib/components/tokens/TokensTable.spec.ts b/frontend/src/tests/lib/components/tokens/TokensTable.spec.ts
index 0c9cededf98..c8f440e1560 100644
--- a/frontend/src/tests/lib/components/tokens/TokensTable.spec.ts
+++ b/frontend/src/tests/lib/components/tokens/TokensTable.spec.ts
@@ -12,7 +12,6 @@ import { principal } from "$tests/mocks/sns-projects.mock";
 import {
   createUserToken,
   createUserTokenLoading,
-  userTokenPageMock,
 } from "$tests/mocks/tokens-page.mock";
 import { TokensTablePo } from "$tests/page-objects/TokensTable.page-object";
 import { JestPageObjectElement } from "$tests/page-objects/jest.page-object";
@@ -127,29 +126,19 @@ describe("TokensTable", () => {
     expect(await row2Po.getSubtitle()).toBeNull();
   });
 
-  it("should render href link if rowHref is present", async () => {
+  it("should render href link", async () => {
     const href = "/accounts";
     const token1 = createUserToken({
       universeId: OWN_CANISTER_ID,
       balance: TokenAmount.fromE8s({ amount: 314000000n, token: ICPToken }),
       rowHref: href,
     });
-    const token2 = createUserToken({
-      universeId: principal(0),
-      balance: TokenAmount.fromE8s({
-        amount: 114000000n,
-        token: { name: "Tetris", symbol: "TETRIS", decimals: 8 },
-      }),
-      rowHref: undefined,
-    });
-    const po = renderTable({ userTokensData: [token1, token2] });
+    const po = renderTable({ userTokensData: [token1] });
 
     const rows = await po.getRows();
     const row1Po = rows[0];
-    const row2Po = rows[1];
 
     expect(await row1Po.getHref()).toBe(href);
-    expect(await row2Po.getHref()).toBeNull();
   });
 
   it("should render specific text if balance not available", async () => {
@@ -231,25 +220,6 @@ describe("TokensTable", () => {
     expect(await rowPo.hasSendButton()).toBe(false);
   });
 
-  it("should trigger event when clicking in the row", async () => {
-    const handleAction = vi.fn();
-    const po = renderTable({
-      userTokensData: [userTokenPageMock],
-      onAction: handleAction,
-    });
-
-    const rows = await po.getRows();
-    await rows[0].click();
-
-    expect(handleAction).toHaveBeenCalledTimes(1);
-    expect(handleAction).toHaveBeenCalledWith(
-      createActionEvent({
-        type: ActionType.GoToTokenDetail,
-        data: userTokenPageMock,
-      })
-    );
-  });
-
   it("should trigger event when clicking in Send action", async () => {
     const handleAction = vi.fn();
     const userToken = createUserToken({
diff --git a/frontend/src/tests/lib/derived/icp-tokens-list-user.derived.spec.ts b/frontend/src/tests/lib/derived/icp-tokens-list-user.derived.spec.ts
index 6e8427e6b87..66e870e2750 100644
--- a/frontend/src/tests/lib/derived/icp-tokens-list-user.derived.spec.ts
+++ b/frontend/src/tests/lib/derived/icp-tokens-list-user.derived.spec.ts
@@ -46,7 +46,6 @@ describe("icp-tokens-list-user.derived", () => {
     subtitle: undefined,
     rowHref: buildWalletUrl({
       universe: OWN_CANISTER_ID_TEXT,
-      account: mockMainAccount.identifier,
     }),
     accountIdentifier: mockMainAccount.identifier,
   };
diff --git a/frontend/src/tests/lib/derived/tokens-list-user.derived.spec.ts b/frontend/src/tests/lib/derived/tokens-list-user.derived.spec.ts
index cf43f05cc4a..cec30e7c8da 100644
--- a/frontend/src/tests/lib/derived/tokens-list-user.derived.spec.ts
+++ b/frontend/src/tests/lib/derived/tokens-list-user.derived.spec.ts
@@ -43,15 +43,11 @@ import {
 } from "$tests/utils/accounts.test-utils";
 import { setCkETHCanisters } from "$tests/utils/cketh.test-utils";
 import { resetSnsProjects, setSnsProjects } from "$tests/utils/sns.test-utils";
-import { encodeIcrcAccount } from "@dfinity/ledger-icrc";
 import { SnsSwapLifecycle } from "@dfinity/sns";
 import { TokenAmountV2 } from "@dfinity/utils";
 import { get } from "svelte/store";
 
 describe("tokens-list-user.derived", () => {
-  const identityMainAccountIdentifier = encodeIcrcAccount({
-    owner: mockIdentity.getPrincipal(),
-  });
   const icpUserToken: UserTokenData = createIcpUserToken({
     balance: TokenAmountV2.fromUlps({
       amount: mockMainAccount.balanceUlps,
@@ -92,7 +88,6 @@ describe("tokens-list-user.derived", () => {
   };
   const tetrisHref = buildWalletUrl({
     universe: snsTetris.rootCanisterId.toText(),
-    account: identityMainAccountIdentifier,
   });
   const tetrisTokenLoading: UserTokenLoading = {
     universeId: snsTetris.rootCanisterId,
@@ -119,7 +114,6 @@ describe("tokens-list-user.derived", () => {
   };
   const pacmanHref = buildWalletUrl({
     universe: snsPacman.rootCanisterId.toText(),
-    account: identityMainAccountIdentifier,
   });
   const pacmanTokenLoading: UserTokenLoading = {
     universeId: snsPacman.rootCanisterId,
@@ -146,7 +140,6 @@ describe("tokens-list-user.derived", () => {
   };
   const ckBTCHref = buildWalletUrl({
     universe: ckBTCTokenBase.universeId.toText(),
-    account: identityMainAccountIdentifier,
   });
   const ckBTCTokenLoading: UserTokenLoading = {
     ...ckBTCTokenBase,
@@ -156,7 +149,6 @@ describe("tokens-list-user.derived", () => {
   };
   const ckTESTBTCHref = buildWalletUrl({
     universe: ckTESTBTCTokenBase.universeId.toText(),
-    account: identityMainAccountIdentifier,
   });
   const ckTESTBTCTokenLoading: UserTokenLoading = {
     ...ckTESTBTCTokenBase,
@@ -181,7 +173,6 @@ describe("tokens-list-user.derived", () => {
   };
   const ckETHHref = buildWalletUrl({
     universe: ckETHTokenBase.universeId.toText(),
-    account: identityMainAccountIdentifier,
   });
   const ckETHTokenLoading: UserTokenLoading = {
     ...ckETHTokenBase,
diff --git a/frontend/src/tests/lib/pages/NnsAccounts.spec.ts b/frontend/src/tests/lib/pages/NnsAccounts.spec.ts
index fd48ae03375..6b8046bac8f 100644
--- a/frontend/src/tests/lib/pages/NnsAccounts.spec.ts
+++ b/frontend/src/tests/lib/pages/NnsAccounts.spec.ts
@@ -53,6 +53,7 @@ describe("NnsAccounts", () => {
           amount: 314000000n,
           token: NNS_TOKEN_DATA,
         }),
+        rowHref: "/main",
       });
       const subaccountTokenData = createUserToken({
         title: "Subaccount test",
@@ -60,6 +61,7 @@ describe("NnsAccounts", () => {
           amount: 222000000n,
           token: NNS_TOKEN_DATA,
         }),
+        rowHref: "/subaccount",
       });
       const po = renderComponent([mainTokenData, subaccountTokenData]);
       expect(await po.getTokensTablePo().getRowsData()).toEqual([
@@ -81,6 +83,7 @@ describe("NnsAccounts", () => {
           amount: 314000000n,
           token: NNS_TOKEN_DATA,
         }),
+        rowHref: "/main",
       });
       const subaccountTokenData = createUserToken({
         title: "Subaccount test",
@@ -88,6 +91,7 @@ describe("NnsAccounts", () => {
           amount: 222000000n,
           token: NNS_TOKEN_DATA,
         }),
+        rowHref: "/subaccount",
       });
       const po = renderComponent([mainTokenData, subaccountTokenData]);
       expect(await po.getAddAccountRowTabindex()).toBe("0");
diff --git a/frontend/src/tests/lib/pages/SnsProposalDetail.spec.ts b/frontend/src/tests/lib/pages/SnsProposalDetail.spec.ts
index b7faf24ae92..4d632b6ee08 100644
--- a/frontend/src/tests/lib/pages/SnsProposalDetail.spec.ts
+++ b/frontend/src/tests/lib/pages/SnsProposalDetail.spec.ts
@@ -3,6 +3,8 @@ import { AppPath } from "$lib/constants/routes.constants";
 import { pageStore } from "$lib/derived/page.derived";
 import { snsFilteredProposalsStore } from "$lib/derived/sns/sns-filtered-proposals.derived";
 import SnsProposalDetail from "$lib/pages/SnsProposalDetail.svelte";
+import { actionableProposalsSegmentStore } from "$lib/stores/actionable-proposals-segment.store";
+import { actionableSnsProposalsStore } from "$lib/stores/actionable-sns-proposals.store";
 import { authStore } from "$lib/stores/auth.store";
 import { layoutTitleStore } from "$lib/stores/layout.store";
 import { snsFunctionsStore } from "$lib/stores/sns-functions.store";
@@ -54,6 +56,8 @@ describe("SnsProposalDetail", () => {
   describe("not logged in", () => {
     beforeEach(() => {
       vi.clearAllMocks();
+      actionableProposalsSegmentStore.resetForTesting();
+      actionableSnsProposalsStore.resetForTesting();
       vi.spyOn(console, "error").mockImplementation(() => undefined);
       authStore.setForTesting(undefined);
       snsFunctionsStore.reset();
@@ -276,6 +280,65 @@ describe("SnsProposalDetail", () => {
       expect(await navigationPo.isPresent()).toBe(true);
       expect(await navigationPo.getOlderButtonPo().isPresent()).toBe(true);
       expect(await navigationPo.getNewerButtonPo().isPresent()).toBe(true);
+      expect(await navigationPo.getNewerButtonProposalId()).toBe("3");
+      expect(await navigationPo.getOlderButtonProposalId()).toBe("1");
+      // all buttons should be enabled
+      expect(await navigationPo.getOlderButtonPo().isDisabled()).toBe(false);
+      expect(await navigationPo.getNewerButtonPo().isDisabled()).toBe(false);
+    });
+
+    it("should display proposal navigation for actionable proposal", async () => {
+      actionableProposalsSegmentStore.set("actionable");
+      const actionableProposals = [
+        createSnsProposal({
+          proposalId: 1n,
+          status: SnsProposalDecisionStatus.PROPOSAL_DECISION_STATUS_OPEN,
+        }),
+        createSnsProposal({
+          proposalId: 2n,
+          status: SnsProposalDecisionStatus.PROPOSAL_DECISION_STATUS_OPEN,
+        }),
+        createSnsProposal({
+          proposalId: 3n,
+          status: SnsProposalDecisionStatus.PROPOSAL_DECISION_STATUS_OPEN,
+        }),
+      ];
+      // Keep "all" proposals empty to make the test fail if not using the actionable proposals
+      vi.spyOn(snsFilteredProposalsStore, "subscribe").mockImplementation(
+        buildMockSnsProposalsStoreSubscribe({
+          universeIdText: rootCanisterId.toText(),
+          proposals: [],
+        })
+      );
+      actionableSnsProposalsStore.set({
+        rootCanisterId,
+        includeBallotsByCaller: true,
+        proposals: actionableProposals,
+      });
+
+      fakeSnsGovernanceApi.addProposalWith({
+        identity: new AnonymousIdentity(),
+        rootCanisterId,
+        id: [{ id: 2n }],
+      });
+
+      const { container } = render(SnsProposalDetail, {
+        props: {
+          proposalIdText: "2",
+        },
+      });
+      const po = SnsProposalDetailPo.under(
+        new JestPageObjectElement(container)
+      );
+      await waitFor(async () => expect(await po.isContentLoaded()).toBe(true));
+
+      const navigationPo = po.getProposalNavigationPo();
+      expect(await navigationPo.isPresent()).toBe(true);
+      expect(await navigationPo.getOlderButtonPo().isPresent()).toBe(true);
+      expect(await navigationPo.getNewerButtonPo().isPresent()).toBe(true);
+      // 4 <newer 3 older> 1
+      expect(await navigationPo.getNewerButtonProposalId()).toBe("3");
+      expect(await navigationPo.getOlderButtonProposalId()).toBe("1");
       // all buttons should be enabled
       expect(await navigationPo.getOlderButtonPo().isDisabled()).toBe(false);
       expect(await navigationPo.getNewerButtonPo().isDisabled()).toBe(false);
diff --git a/frontend/src/tests/lib/pages/Tokens.spec.ts b/frontend/src/tests/lib/pages/Tokens.spec.ts
index 22677e87a2a..cddc9f06394 100644
--- a/frontend/src/tests/lib/pages/Tokens.spec.ts
+++ b/frontend/src/tests/lib/pages/Tokens.spec.ts
@@ -12,7 +12,7 @@ import {
 } from "$tests/mocks/tokens-page.mock";
 import { TokensPagePo } from "$tests/page-objects/TokensPage.page-object";
 import { JestPageObjectElement } from "$tests/page-objects/jest.page-object";
-import { runResolvedPromises } from "$tests/utils/timers.test-utils";
+import { advanceTime } from "$tests/utils/timers.test-utils";
 import { TokenAmountV2 } from "@dfinity/utils";
 import { render } from "@testing-library/svelte";
 
@@ -64,6 +64,7 @@ describe("Tokens page", () => {
   beforeEach(() => {
     overrideFeatureFlagsStore.reset();
     hideZeroBalancesStore.resetForTesting();
+    vi.useFakeTimers();
   });
 
   it("should render the tokens table", async () => {
@@ -106,7 +107,10 @@ describe("Tokens page", () => {
       expect(await po.getBackdropPo().isPresent()).toBe(true);
 
       await po.getBackdropPo().click();
-      await runResolvedPromises();
+
+      // Finish transitions
+      await advanceTime();
+
       expect(await po.getHideZeroBalancesTogglePo().isPresent()).toBe(false);
       expect(await po.getBackdropPo().isPresent()).toBe(false);
     });
@@ -122,6 +126,9 @@ describe("Tokens page", () => {
       await po.getSettingsButtonPo().click();
       await po.getHideZeroBalancesTogglePo().getTogglePo().toggle();
 
+      // Finish transitions
+      await advanceTime();
+
       expect(await po.getTokensTable().getTokenNames()).toEqual([
         "Positive balance",
       ]);
@@ -138,6 +145,9 @@ describe("Tokens page", () => {
       await po.getSettingsButtonPo().click();
       await po.getHideZeroBalancesTogglePo().getTogglePo().toggle();
 
+      // Finish transitions
+      await advanceTime();
+
       expect(await po.getTokensTable().getTokenNames()).toEqual([
         "Positive balance",
       ]);
@@ -168,6 +178,9 @@ describe("Tokens page", () => {
       await po.getSettingsButtonPo().click();
       await po.getHideZeroBalancesTogglePo().getTogglePo().toggle();
 
+      // Finish transitions
+      await advanceTime();
+
       expect(await po.getTokensTable().getTokenNames()).toEqual([
         "Positive balance",
       ]);
@@ -175,6 +188,9 @@ describe("Tokens page", () => {
       expect(await po.getShowAllButtonPo().isPresent()).toBe(true);
       await po.getShowAllButtonPo().click();
 
+      // Finish transitions
+      await advanceTime();
+
       expect(await po.getShowAllButtonPo().isPresent()).toBe(false);
       expect(await po.getTokensTable().getTokenNames()).toEqual([
         "Positive balance",
diff --git a/frontend/src/tests/lib/utils/transition.utils.spec.ts b/frontend/src/tests/lib/utils/transition.utils.spec.ts
new file mode 100644
index 00000000000..5f418f821f3
--- /dev/null
+++ b/frontend/src/tests/lib/utils/transition.utils.spec.ts
@@ -0,0 +1,64 @@
+import { heightTransition } from "$lib/utils/transition.utils";
+
+describe("transition.utils", () => {
+  const element = {
+    offsetHeight: 50,
+  } as HTMLElement;
+
+  describe("heightTransition", () => {
+    it("should pass delay and duration unchanged", () => {
+      expect(
+        heightTransition(element, {
+          delay: 100,
+          duration: 200,
+        })
+      ).toMatchObject({
+        delay: 100,
+        duration: 200,
+      });
+
+      expect(
+        heightTransition(element, {
+          duration: 400,
+        })
+      ).toMatchObject({
+        delay: undefined,
+        duration: 400,
+      });
+
+      expect(heightTransition(element, {})).toMatchObject({
+        delay: undefined,
+        duration: undefined,
+      });
+
+      // Expecting undefined does actually fail if the property is not undefined
+      expect(() => {
+        expect(
+          heightTransition(element, {
+            delay: 100,
+            duration: 200,
+          })
+        ).toMatchObject({
+          delay: undefined,
+          duration: undefined,
+        });
+      }).toThrow();
+    });
+
+    it("should return css function", () => {
+      const { css } = heightTransition(element, {});
+      expect(css(0)).toBe(
+        "height: 0px; transform: scale(1, 0); transform-origin: top"
+      );
+      expect(css(0.2)).toBe(
+        "height: 10px; transform: scale(1, 0.2); transform-origin: top"
+      );
+      expect(css(0.5)).toBe(
+        "height: 25px; transform: scale(1, 0.5); transform-origin: top"
+      );
+      expect(css(1)).toBe(
+        "height: 50px; transform: scale(1, 1); transform-origin: top"
+      );
+    });
+  });
+});
diff --git a/frontend/src/tests/mocks/tokens-page.mock.ts b/frontend/src/tests/mocks/tokens-page.mock.ts
index 0b8ec595fec..456a48d8d19 100644
--- a/frontend/src/tests/mocks/tokens-page.mock.ts
+++ b/frontend/src/tests/mocks/tokens-page.mock.ts
@@ -19,7 +19,7 @@ import {
   type UserTokenLoading,
 } from "$lib/types/tokens-page";
 import { UnavailableTokenAmount } from "$lib/utils/token.utils";
-import { TokenAmountV2 } from "@dfinity/utils";
+import { TokenAmountV2, isNullish, nonNullish } from "@dfinity/utils";
 import { mockCkBTCToken } from "./ckbtc-accounts.mock";
 import { mockSnsToken, principal } from "./sns-projects.mock";
 
@@ -133,6 +133,9 @@ export const userTokensPageMock: UserTokenData[] = [
 export const createUserToken = (params: Partial<UserTokenData> = {}) => ({
   ...userTokenPageMock,
   ...params,
+  ...(isNullish(params.rowHref) && nonNullish(params.universeId)
+    ? { rowHref: `/wallet/?u=${params.universeId.toText()}` }
+    : {}),
 });
 
 export const createIcpUserToken = (params: Partial<UserTokenData> = {}) => ({
diff --git a/frontend/src/tests/page-objects/ProposalNavigation.page-object.ts b/frontend/src/tests/page-objects/ProposalNavigation.page-object.ts
index e881740863f..341c5caaa71 100644
--- a/frontend/src/tests/page-objects/ProposalNavigation.page-object.ts
+++ b/frontend/src/tests/page-objects/ProposalNavigation.page-object.ts
@@ -43,6 +43,18 @@ export class ProposalNavigationPo extends BasePageObject {
     return this.root.byTestId("title").getText();
   }
 
+  async getNewerButtonProposalId(): Promise<string> {
+    return (await this.getNewerButtonPo().getElement()).getAttribute(
+      "data-test-proposal-id"
+    );
+  }
+
+  async getOlderButtonProposalId(): Promise<string> {
+    return (await this.getOlderButtonPo().getElement()).getAttribute(
+      "data-test-proposal-id"
+    );
+  }
+
   async isNewerButtonHidden(): Promise<boolean> {
     return ProposalNavigationPo.isButtonHidden(this.getNewerButtonPo());
   }
diff --git a/rs/sns_aggregator/src/types/ic_sns_governance.rs b/rs/sns_aggregator/src/types/ic_sns_governance.rs
index 6a10fc34351..60d4916922e 100644
--- a/rs/sns_aggregator/src/types/ic_sns_governance.rs
+++ b/rs/sns_aggregator/src/types/ic_sns_governance.rs
@@ -1,5 +1,5 @@
 //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_governance --out ic_sns_governance.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug`
-//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-02-28_23-01+p2p-hotfix/rs/sns/governance/canister/governance.did>
+//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-03-14_23-01-p2p/rs/sns/governance/canister/governance.did>
 #![allow(clippy::all)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
diff --git a/rs/sns_aggregator/src/types/ic_sns_ledger.rs b/rs/sns_aggregator/src/types/ic_sns_ledger.rs
index 0ccaab346b2..effddc2133b 100644
--- a/rs/sns_aggregator/src/types/ic_sns_ledger.rs
+++ b/rs/sns_aggregator/src/types/ic_sns_ledger.rs
@@ -1,5 +1,5 @@
 //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_ledger --out ic_sns_ledger.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug`
-//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-02-28_23-01+p2p-hotfix/rs/rosetta-api/icrc1/ledger/ledger.did>
+//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-03-14_23-01-p2p/rs/rosetta-api/icrc1/ledger/ledger.did>
 #![allow(clippy::all)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
diff --git a/rs/sns_aggregator/src/types/ic_sns_root.rs b/rs/sns_aggregator/src/types/ic_sns_root.rs
index f8803531259..3e5fac2cb9c 100644
--- a/rs/sns_aggregator/src/types/ic_sns_root.rs
+++ b/rs/sns_aggregator/src/types/ic_sns_root.rs
@@ -1,5 +1,5 @@
 //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_root --out ic_sns_root.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug`
-//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-02-28_23-01+p2p-hotfix/rs/sns/root/canister/root.did>
+//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-03-14_23-01-p2p/rs/sns/root/canister/root.did>
 #![allow(clippy::all)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
diff --git a/rs/sns_aggregator/src/types/ic_sns_swap.rs b/rs/sns_aggregator/src/types/ic_sns_swap.rs
index ead2785747e..be1f8b8b2bb 100644
--- a/rs/sns_aggregator/src/types/ic_sns_swap.rs
+++ b/rs/sns_aggregator/src/types/ic_sns_swap.rs
@@ -1,5 +1,5 @@
 //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_swap --out ic_sns_swap.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug`
-//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-02-28_23-01+p2p-hotfix/rs/sns/swap/canister/swap.did>
+//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-03-14_23-01-p2p/rs/sns/swap/canister/swap.did>
 #![allow(clippy::all)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
diff --git a/rs/sns_aggregator/src/types/ic_sns_wasm.rs b/rs/sns_aggregator/src/types/ic_sns_wasm.rs
index 5adc5eba040..8d21cf11820 100644
--- a/rs/sns_aggregator/src/types/ic_sns_wasm.rs
+++ b/rs/sns_aggregator/src/types/ic_sns_wasm.rs
@@ -1,5 +1,5 @@
 //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_wasm --out ic_sns_wasm.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug`
-//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-02-28_23-01+p2p-hotfix/rs/nns/sns-wasm/canister/sns-wasm.did>
+//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: <https://raw.githubusercontent.com/dfinity/ic/release-2024-03-14_23-01-p2p/rs/nns/sns-wasm/canister/sns-wasm.did>
 #![allow(clippy::all)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]