diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b4cd52ac8e..8d4067c1167 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -138,7 +138,12 @@ jobs:
           eval "$(printf '\n' | /usr/bin/gnome-keyring-daemon --start)"
           cargo test -- --test-threads=1
 
-      - name: Test Windows / macOS
-        if: ${{ matrix.os!='ubuntu-latest' }}
+      - name: Test macOS
+        if: ${{ matrix.os=='macos-latest' }}
         working-directory: ./apps/desktop/desktop_native
         run: cargo test -- --test-threads=1
+
+      - name: Test Windows
+        if: ${{ matrix.os=='windows-latest'}}
+        working-directory: ./apps/desktop/desktop_native/core
+        run: cargo test -- --test-threads=1
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 05525be6ffd..4e6f27bdd2c 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -4308,6 +4308,9 @@
   },
   "enterprisePolicyRequirementsApplied": {
     "message": "Enterprise policy requirements have been applied to this setting"
+  }, 
+  "fileSavedToDevice": {
+    "message": "File saved to device. Manage from your device downloads."
   },
   "showCharacterCount": {
     "message": "Show character count"
diff --git a/apps/browser/src/vault/popup/components/vault/attachments.component.ts b/apps/browser/src/vault/popup/components/vault/attachments.component.ts
index ee6f1ac7d07..75819689b44 100644
--- a/apps/browser/src/vault/popup/components/vault/attachments.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/attachments.component.ts
@@ -14,7 +14,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-attachments",
@@ -38,6 +38,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent implements On
     dialogService: DialogService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       cipherService,
@@ -52,6 +53,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent implements On
       dialogService,
       billingAccountProfileStateService,
       accountService,
+      toastService,
     );
   }
 
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 5345c6e15a3..9194fd7c22a 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1285,6 +1285,9 @@
       }
     }
   },
+  "copySuccessful": {
+    "message": "Copy Successful"
+  },
   "errorRefreshingAccessToken": {
     "message": "Access Token Refresh Error"
   },
@@ -3061,5 +3064,8 @@
   },
   "ssoError": {
     "message": "No free ports could be found for the sso login."
+  },
+  "fileSavedToDevice": {
+    "message": "File saved to device. Manage from your device downloads."
   }
 }
diff --git a/apps/desktop/src/vault/app/vault/attachments.component.ts b/apps/desktop/src/vault/app/vault/attachments.component.ts
index b1ddcbc7e7d..2e25d390872 100644
--- a/apps/desktop/src/vault/app/vault/attachments.component.ts
+++ b/apps/desktop/src/vault/app/vault/attachments.component.ts
@@ -11,7 +11,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-attachments",
@@ -30,6 +30,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
     dialogService: DialogService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       cipherService,
@@ -44,6 +45,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
       dialogService,
       billingAccountProfileStateService,
       accountService,
+      toastService,
     );
   }
 }
diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts
index 68eaae618fd..6c894f4fa85 100644
--- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts
+++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts
@@ -7,9 +7,9 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { ToastService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../shared";
 import { UserKeyRotationModule } from "../key-rotation/user-key-rotation.module";
@@ -31,12 +31,13 @@ export class MigrateFromLegacyEncryptionComponent {
     private accountService: AccountService,
     private keyRotationService: UserKeyRotationService,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
     private cryptoService: CryptoService,
     private messagingService: MessagingService,
     private logService: LogService,
     private syncService: SyncService,
     private toastService: ToastService,
+    private dialogService: DialogService,
+    private folderApiService: FolderApiServiceAbstraction,
   ) {}
 
   submit = async () => {
@@ -69,6 +70,23 @@ export class MigrateFromLegacyEncryptionComponent {
       });
       this.messagingService.send("logout");
     } catch (e) {
+      // If the error is due to missing folders, we can delete all folders and try again
+      if (e.message === "All existing folders must be included in the rotation.") {
+        const deleteFolders = await this.dialogService.openSimpleDialog({
+          type: "warning",
+          title: { key: "encryptionKeyUpdateCannotProceed" },
+          content: { key: "keyUpdateFoldersFailed" },
+          acceptButtonText: { key: "ok" },
+          cancelButtonText: { key: "cancel" },
+        });
+
+        if (deleteFolders) {
+          await this.folderApiService.deleteAll();
+          await this.syncService.fullSync(true, true);
+          await this.submit();
+          return;
+        }
+      }
       this.logService.error(e);
       throw e;
     }
diff --git a/apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts b/apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts
index 9d763886fb4..e0a6f6c53d5 100644
--- a/apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/attachments/emergency-access-attachments.component.ts
@@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "emergency-access-attachments",
@@ -34,6 +34,7 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
     dialogService: DialogService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       cipherService,
@@ -48,6 +49,7 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
       dialogService,
       billingAccountProfileStateService,
       accountService,
+      toastService,
     );
   }
 
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index 14b6864d643..766646003ba 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -7,31 +7,37 @@
       <p>{{ "upgradePlans" | i18n }}</p>
       <div class="tw-mb-3 tw-flex tw-justify-between">
         <span class="tw-text-lg tw-pr-1 tw-font-bold">{{ "selectAPlan" | i18n }}</span>
+        <!-- Discount Badge -->
         <div class="tw-items-center tw-gap-2">
           <span
+            class="tw-mr-1"
             *ngIf="
               this.discountPercentageFromSub > 0
                 ? discountPercentageFromSub
-                : this.discountPercentage && selectedInterval === 1
+                : this.discountPercentage && selectedInterval === planIntervals.Annually
             "
             bitBadge
             variant="success"
             >{{
               "upgradeDiscount"
                 | i18n
-                  : (this.discountPercentageFromSub > 0
-                      ? discountPercentageFromSub
-                      : this.discountPercentage)
+                  : (selectedInterval === planIntervals.Annually
+                      ? discountPercentageFromSub + this.discountPercentage
+                      : this.discountPercentageFromSub)
             }}</span
           >
-
+          <!-- Plan Interval Toggle -->
           <div class="tw-inline-block">
             <bit-toggle-group
               [selected]="selectedInterval"
               (selectedChange)="updateInterval($event)"
             >
               <bit-toggle
-                *ngFor="let planInterval of getPlanIntervals()"
+                *ngFor="
+                  let planInterval of getPlanIntervals();
+                  trackBy: optimizedNgForRender;
+                  let i = index
+                "
                 [value]="planInterval.value"
               >
                 {{ planInterval.name }}
@@ -40,6 +46,7 @@
           </div>
         </div>
       </div>
+      <!-- Plan Selection Cards -->
       <ng-container *ngIf="!loading && !selfHosted && this.passwordManagerPlans">
         <div
           class="tw-grid tw-grid-flow-col tw-gap-4 tw-mb-4"
@@ -53,23 +60,34 @@
           >
             <div class="tw-relative">
               <div
-                *ngIf="selectableProduct === selectedPlan"
-                class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-bold tw-py-1 group-hover:tw-bg-primary-700"
+                *ngIf="selectableProduct.productTier === productTypes.Enterprise"
+                class="tw-bg-secondary-100 tw-text-center !tw-border-0 tw-text-sm tw-font-bold tw-py-1"
+                [ngClass]="{
+                  'tw-bg-primary-700 !tw-text-contrast': selectableProduct === selectedPlan,
+                  'tw-bg-secondary-100': !(selectableProduct === selectedPlan),
+                }"
               >
                 {{ "recommended" | i18n }}
               </div>
               <div
-                class="tw-px-2 tw-py-4"
+                class="tw-px-2 tw-pb-[4px]"
                 [ngClass]="{
                   'tw-py-1': !(selectableProduct === selectedPlan),
                   'tw-py-0': selectableProduct === selectedPlan,
                 }"
               >
-                <h3 class="tw-text-lg tw-font-bold">
+                <h3
+                  class="tw-text-[1.5rem] tw-mt-[6px] tw-font-bold tw-mb-0 tw-leading-[2rem] tw-flex tw-items-center"
+                >
                   <span class="tw-capitalize">{{
                     selectableProduct.nameLocalizationKey | i18n
                   }}</span>
-                  <span bitBadge variant="secondary" *ngIf="selectableProduct === currentPlan">
+                  <span
+                    bitBadge
+                    variant="secondary"
+                    *ngIf="selectableProduct === currentPlan"
+                    class="tw-ml-2 tw-align-middle"
+                  >
                     {{ "current" | i18n }}</span
                   >
                 </h3>
@@ -133,10 +151,13 @@
                 else nonEnterprisePlans
               "
             >
-              <p class="tw-text-xs tw-px-2 tw-font-semibold" *ngIf="organization.useSecretsManager">
+              <p
+                class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                *ngIf="organization.useSecretsManager"
+              >
                 {{ "bitwardenPasswordManager" | i18n }}
               </p>
-              <p class="tw-text-xs tw-px-2">{{ "enterprisePlanUpgradeMessage" | i18n }}</p>
+              <p class="tw-text-xs tw-px-2 tw-mb-1">{{ "enterprisePlanUpgradeMessage" | i18n }}</p>
 
               <ul class="bwi-ul tw-text-xs">
                 <li>
@@ -157,7 +178,10 @@
                 </li>
               </ul>
 
-              <p class="tw-text-xs tw-px-2 tw-font-semibold" *ngIf="organization.useSecretsManager">
+              <p
+                class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
+                *ngIf="organization.useSecretsManager"
+              >
                 {{ "bitwardenSecretsManager" | i18n }}
               </p>
               <ul class="bwi-ul tw-text-xs" *ngIf="organization.useSecretsManager">
@@ -195,25 +219,25 @@
               </ng-container>
               <ng-template #fullFeatureList>
                 <p
-                  class="tw-text-xs tw-px-2 tw-font-semibold"
+                  class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
                   *ngIf="organization.useSecretsManager"
                 >
                   {{ "bitwardenPasswordManager" | i18n }}
                 </p>
                 <p
                   *ngIf="selectableProduct.productTier === productTypes.Teams"
-                  class="tw-text-xs tw-px-2"
+                  class="tw-text-xs tw-px-2 tw-mb-1"
                 >
                   {{ "teamsPlanUpgradeMessage" | i18n }}
                 </p>
                 <p
                   *ngIf="selectableProduct.productTier === productTypes.Families"
-                  class="tw-text-xs tw-px-2"
+                  class="tw-text-xs tw-px-2 tw-mb-1"
                 >
                   {{ "familyPlanUpgradeMessage" | i18n }}
                 </p>
                 <ul
-                  class="bwi-ul tw-text-xs"
+                  class="bwi-ul tw-text-xs tw-mb-1"
                   *ngIf="selectableProduct.productTier == productTypes.Families"
                 >
                   <li>
@@ -247,7 +271,7 @@
                   </li>
                 </ul>
                 <p
-                  class="tw-text-xs tw-px-2 tw-font-semibold"
+                  class="tw-text-xs tw-px-2 tw-font-semibold tw-mb-1"
                   *ngIf="
                     organization.useSecretsManager &&
                     selectableProduct.productTier !== productTypes.Families
@@ -283,16 +307,16 @@
         <bit-callout
           *ngIf="organization.useSecretsManager && !isSecretsManagerTrial()"
           type="info"
-          title="INFO"
+          title="SECRETS MANAGER SUBSCRIPTION"
         >
           {{ "secretsManagerSubInfo" | i18n }}
         </bit-callout>
         <bit-callout
           *ngIf="organization.useSecretsManager && isSecretsManagerTrial()"
           type="info"
-          title="INFO"
+          title="PASSWORD MANAGER SUBSCRIPTION"
         >
-          {{ "secretsManagerWithFreePasswordManagerInfo" | i18n }}
+          {{ "secretsManagerComplimentaryPasswordManager" | i18n }}
         </bit-callout>
         <br />
       </ng-container>
@@ -392,23 +416,37 @@
             <p
               class="tw-mb-0 tw-flex tw-justify-between"
               bitTypography="body2"
-              *ngIf="
-                selectedPlan.PasswordManager.hasAdditionalStorageOption &&
-                !organization.useSecretsManager &&
-                organization.maxStorageGb > 0
-              "
+              *ngIf="selectedPlan.PasswordManager.hasAdditionalStorageOption && storageGb > 0"
             >
               <span>
-                {{ organization.maxStorageGb }}
+                {{ storageGb }}
                 {{ "additionalStorageGbMessage" | i18n }}
                 &times;
                 {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }}
                 /{{ "year" | i18n }}
               </span>
-              <span>{{
-                organization.maxStorageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb
-                  | currency: "$"
-              }}</span>
+              <span>{{ additionalStorageTotal(selectedPlan) | currency: "$" }}</span>
+            </p>
+            <!--Discount PM Annual-->
+            <p
+              class="tw-mb-0 tw-flex tw-justify-between"
+              bitTypography="body2"
+              *ngIf="organization.useSecretsManager && !isSecretsManagerTrial()"
+            >
+              <ng-container *ngIf="selectedInterval == planIntervals.Annually">
+                <span class="tw-text-xs">
+                  {{
+                    "providerDiscount"
+                      | i18n: this.discountPercentageFromSub + this.discountPercentage
+                      | lowercase
+                  }}
+                </span>
+                <span class="tw-line-through tw-text-xs">{{
+                  calculateTotalAppliedDiscount(
+                    passwordManagerSeatTotal(selectedPlan) + additionalStorageTotal(selectedPlan)
+                  ) | currency: "$"
+                }}</span>
+              </ng-container>
             </p>
             <!-- secrets manager summary for annual -->
             <p class="tw-font-semibold tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
@@ -459,18 +497,40 @@
               bitTypography="body2"
               *ngIf="
                 selectedPlan?.SecretsManager?.hasAdditionalServiceAccountOption &&
-                additionalServiceAccount
+                additionalServiceAccount > 0
               "
             >
               <span>
                 {{ additionalServiceAccount }}
-                {{ "additionalStorageGbMessage" | i18n }}
+                {{ "serviceAccounts" | i18n | lowercase }}
                 &times;
                 {{ selectedPlan?.SecretsManager?.additionalPricePerServiceAccount | currency: "$" }}
                 /{{ "month" | i18n }}
               </span>
               <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
             </p>
+            <!--Discount SM annual-->
+            <p
+              class="tw-mb-0 tw-flex tw-justify-between"
+              bitTypography="body2"
+              *ngIf="organization.useSecretsManager && !isSecretsManagerTrial()"
+            >
+              <ng-container *ngIf="selectedInterval == planIntervals.Annually">
+                <span class="tw-text-xs">
+                  {{
+                    "providerDiscount"
+                      | i18n: this.discountPercentageFromSub + this.discountPercentage
+                      | lowercase
+                  }}
+                </span>
+                <span class="tw-line-through tw-text-xs">{{
+                  calculateTotalAppliedDiscount(
+                    additionalServiceAccountTotal(selectedPlan) +
+                      secretsManagerSeatTotal(selectedPlan, sub.smSeats)
+                  ) | currency: "$"
+                }}</span>
+              </ng-container>
+            </p>
           </bit-hint>
           <bit-hint class="col-6" *ngIf="selectedInterval == planIntervals.Monthly">
             <p class="tw-font-semibold tw-mb-1" *ngIf="organization.useSecretsManager">
@@ -512,24 +572,39 @@
             <p
               class="tw-mb-0 tw-flex tw-justify-between"
               bitTypography="body2"
-              *ngIf="
-                selectedPlan.PasswordManager.hasAdditionalStorageOption &&
-                !organization.useSecretsManager &&
-                organization.maxStorageGb > 0
-              "
+              *ngIf="selectedPlan.PasswordManager.hasAdditionalStorageOption && storageGb > 0"
             >
               <span>
-                {{ organization.maxStorageGb }}
+                {{ storageGb }}
                 {{ "additionalStorageGbMessage" | i18n }}
                 &times;
                 {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }}
                 /{{ "month" | i18n }}
               </span>
               <span>{{
-                organization.maxStorageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb
-                  | currency: "$"
+                storageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb | currency: "$"
               }}</span>
             </p>
+            <!--Discount PM Monthly-->
+            <p
+              class="tw-mb-0 tw-flex tw-justify-between"
+              bitTypography="body2"
+              *ngIf="organization.useSecretsManager && !isSecretsManagerTrial()"
+            >
+              <ng-container *ngIf="selectedInterval == planIntervals.Monthly">
+                <span
+                  class="tw-text-xs"
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                >
+                  {{ "providerDiscount" | i18n: this.discountPercentageFromSub | lowercase }}
+                </span>
+                <span
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                  class="tw-line-through tw-text-xs"
+                  >{{ calculateTotalAppliedDiscount(total) | currency: "$" }}</span
+                >
+              </ng-container>
+            </p>
             <!-- secrets manager summary for monthly -->
             <p class="tw-font-semibold tw-mt-3 tw-mb-1" *ngIf="organization.useSecretsManager">
               {{ "secretsManager" | i18n }}
@@ -575,18 +650,41 @@
               bitTypography="body2"
               *ngIf="
                 selectedPlan.SecretsManager.hasAdditionalServiceAccountOption &&
-                additionalServiceAccount
+                additionalServiceAccount > 0
               "
             >
               <span>
                 {{ additionalServiceAccount }}
-                {{ "additionalStorageGbMessage" | i18n }}
+                {{ "serviceAccounts" | i18n | lowercase }}
                 &times;
                 {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
                 /{{ "month" | i18n }}
               </span>
               <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
             </p>
+            <!--Discount SM Monthly-->
+            <p
+              class="tw-mb-0 tw-flex tw-justify-between"
+              bitTypography="body2"
+              *ngIf="organization.useSecretsManager && !isSecretsManagerTrial()"
+            >
+              <ng-container *ngIf="selectedInterval == planIntervals.Monthly">
+                <span
+                  class="tw-text-xs"
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                >
+                  {{ "providerDiscount" | i18n: this.discountPercentageFromSub | lowercase }}
+                </span>
+                <span
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                  class="tw-line-through tw-text-xs"
+                  >{{
+                    additionalServiceAccountTotal(selectedPlan) +
+                      secretsManagerSeatTotal(selectedPlan, sub?.smSeats) | currency: "$"
+                  }}</span
+                >
+              </ng-container>
+            </p>
           </bit-hint>
         </div>
         <!-- SM + Free PM cost summary -->
@@ -641,18 +739,40 @@
               bitTypography="body2"
               *ngIf="
                 selectedPlan.SecretsManager.hasAdditionalServiceAccountOption &&
-                additionalServiceAccount
+                additionalServiceAccount > 0
               "
             >
               <span>
                 {{ additionalServiceAccount }}
-                {{ "additionalStorageGbMessage" | i18n }}
+                {{ "serviceAccounts" | i18n }}
                 &times;
                 {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
                 /{{ "month" | i18n }}
               </span>
               <span>{{ additionalServiceAccountTotal(selectedPlan) | currency: "$" }}</span>
             </p>
+            <!--Discount SM Annual-->
+            <p
+              class="tw-mb-0 tw-flex tw-justify-between"
+              bitTypography="body2"
+              *ngIf="organization.useSecretsManager && isSecretsManagerTrial()"
+            >
+              <ng-container *ngIf="selectedInterval == planIntervals.Annually">
+                <span class="tw-text-xs">
+                  {{
+                    "providerDiscount"
+                      | i18n: this.discountPercentageFromSub + this.discountPercentage
+                      | lowercase
+                  }}
+                </span>
+                <span class="tw-line-through tw-text-xs">{{
+                  calculateTotalAppliedDiscount(
+                    additionalServiceAccountTotal(selectedPlan) +
+                      secretsManagerSeatTotal(selectedPlan, sub.smSeats)
+                  ) | currency: "$"
+                }}</span>
+              </ng-container>
+            </p>
             <!-- password manager summary for annual -->
             <p class="tw-font-semibold tw-mt-3 tw-mb-0" *ngIf="organization.useSecretsManager">
               {{ "passwordManager" | i18n }}
@@ -663,7 +783,7 @@
               *ngIf="selectedPlan.PasswordManager.basePrice"
             >
               <span>
-                {{ organization.seats }}
+                {{ sub?.seats }}
                 {{ "members" | i18n }} &times;
                 {{
                   (selectedPlan.isAnnual
@@ -694,7 +814,7 @@
                 <span *ngIf="selectedPlan.PasswordManager.baseSeats"
                   >{{ "additionalUsers" | i18n }}:</span
                 >
-                {{ organization.seats || 0 }}&nbsp;
+                {{ sub?.seats || 0 }}&nbsp;
                 <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
                 &times;
                 {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
@@ -756,12 +876,12 @@
               bitTypography="body2"
               *ngIf="
                 selectedPlan.SecretsManager.hasAdditionalServiceAccountOption &&
-                additionalServiceAccount
+                additionalServiceAccount > 0
               "
             >
               <span>
                 {{ additionalServiceAccount }}
-                {{ "additionalStorageGbMessage" | i18n }}
+                {{ "serviceAccounts" | i18n }}
                 &times;
                 {{ selectedPlan.SecretsManager.additionalPricePerServiceAccount | currency: "$" }}
                 /{{ "month" | i18n }}
@@ -795,7 +915,7 @@
                 <span *ngIf="selectedPlan.PasswordManager.baseSeats"
                   >{{ "additionalUsers" | i18n }}:</span
                 >
-                {{ organization.seats }}&nbsp;
+                {{ sub?.seats }}&nbsp;
                 <span *ngIf="!selectedPlan.PasswordManager.baseSeats">{{ "members" | i18n }}</span>
                 &times;
                 {{ selectedPlan.PasswordManager.seatPrice | currency: "$" }}
@@ -811,6 +931,46 @@
             </p>
           </bit-hint>
         </div>
+        <!-- discountPercentage to PM Only -->
+        <div
+          *ngIf="totalOpened && discountPercentage && !organization.useSecretsManager"
+          class="row"
+        >
+          <bit-hint class="col-6">
+            <p class="tw-mb-0 tw-flex tw-justify-between" bitTypography="body2">
+              <ng-container
+                *ngIf="
+                  selectedInterval == planIntervals.Annually;
+                  else MonthlyOrAnnuallyWithDiscount
+                "
+              >
+                <span class="tw-text-xs">
+                  {{
+                    "providerDiscount"
+                      | i18n: this.discountPercentageFromSub + this.discountPercentage
+                      | lowercase
+                  }}
+                </span>
+                <span class="tw-line-through tw-text-xs">{{
+                  calculateTotalAppliedDiscount(total) | currency: "$"
+                }}</span>
+              </ng-container>
+              <ng-template #MonthlyOrAnnuallyWithDiscount>
+                <span
+                  class="tw-text-xs"
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                >
+                  {{ "providerDiscount" | i18n: this.discountPercentageFromSub | lowercase }}
+                </span>
+                <span
+                  [style.display]="discountPercentageFromSub > 0 ? 'block' : 'none'"
+                  class="tw-line-through tw-text-xs"
+                  >{{ calculateTotalAppliedDiscount(total) | currency: "$" }}</span
+                >
+              </ng-template>
+            </p>
+          </bit-hint>
+        </div>
         <div *ngIf="totalOpened" id="price" class="row tw-mt-4">
           <bit-hint class="col-6">
             <p
@@ -821,7 +981,9 @@
               </span>
               <span>
                 {{ total | currency: "USD" : "$" }}
-                <span class="tw-text-xs tw-font-light"> / {{ selectedPlanInterval | i18n }}</span>
+                <span class="tw-text-xs tw-font-semibold">
+                  / {{ selectedPlanInterval | i18n }}</span
+                >
               </span>
             </p>
           </bit-hint>
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 9a20fe38efc..dc9f6cce688 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -246,27 +246,28 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
         selected: false,
       },
     ];
-    this.discountPercentageFromSub = this.sub?.customerDiscount?.percentOff;
+    this.discountPercentageFromSub = this.isSecretsManagerTrial()
+      ? 0
+      : (this.sub?.customerDiscount?.percentOff ?? 0);
 
     this.setInitialPlanSelection();
     this.loading = false;
   }
 
   setInitialPlanSelection() {
-    if (
-      this.organization.useSecretsManager &&
-      this.currentPlan.productTier == ProductTierType.Free
-    ) {
-      this.selectPlan(this.getPlanByType(ProductTierType.Teams));
-    } else {
-      this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
-    }
+    this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
   }
 
   getPlanByType(productTier: ProductTierType) {
     return this.selectableProducts.find((product) => product.productTier === productTier);
   }
 
+  secretsManagerTrialDiscount() {
+    return this.sub?.customerDiscount?.appliesTo?.includes("sm-standalone")
+      ? this.discountPercentage
+      : this.discountPercentageFromSub + this.discountPercentage;
+  }
+
   isSecretsManagerTrial(): boolean {
     return (
       this.sub?.subscription?.items?.some((item) =>
@@ -276,14 +277,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   planTypeChanged() {
-    if (
-      this.organization.useSecretsManager &&
-      this.currentPlan.productTier == ProductTierType.Free
-    ) {
-      this.selectPlan(this.getPlanByType(ProductTierType.Teams));
-    } else {
-      this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
-    }
+    this.selectPlan(this.getPlanByType(ProductTierType.Enterprise));
   }
 
   updateInterval(event: number) {
@@ -304,6 +298,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     ];
   }
 
+  optimizedNgForRender(index: number) {
+    return index;
+  }
+
   protected getPlanCardContainerClasses(plan: PlanResponse, index: number) {
     let cardState: PlanCardState;
 
@@ -370,6 +368,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     ) {
       return;
     }
+
+    if (plan === this.currentPlan) {
+      return;
+    }
     this.selectedPlan = plan;
     this.formGroup.patchValue({ productTier: plan.productTier });
   }
@@ -463,6 +465,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     return result;
   }
 
+  get storageGb() {
+    return this.sub?.maxStorageGb - 1;
+  }
+
   passwordManagerSeatTotal(plan: PlanResponse): number {
     if (!plan.PasswordManager.hasAdditionalSeatsOption || this.isSecretsManagerTrial()) {
       return 0;
@@ -486,8 +492,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
 
     return (
-      plan.PasswordManager.additionalStoragePricePerGb *
-      Math.abs(this.organization.maxStorageGb || 0)
+      plan.PasswordManager.additionalStoragePricePerGb * Math.abs(this.sub?.maxStorageGb - 1 || 0)
     );
   }
 
@@ -499,7 +504,10 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   additionalServiceAccountTotal(plan: PlanResponse): number {
-    if (!plan.SecretsManager.hasAdditionalServiceAccountOption || this.additionalServiceAccount) {
+    if (
+      !plan.SecretsManager.hasAdditionalServiceAccountOption ||
+      this.additionalServiceAccount == 0
+    ) {
       return 0;
     }
 
@@ -541,7 +549,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     if (this.selectedPlan.productTier === ProductTierType.Families) {
       return this.selectedPlan.PasswordManager.baseSeats;
     }
-    return this.organization.seats;
+    return this.sub?.seats;
   }
 
   get total() {
@@ -565,7 +573,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   get additionalServiceAccount() {
-    const baseServiceAccount = this.selectedPlan.SecretsManager?.baseServiceAccount || 0;
+    const baseServiceAccount = this.currentPlan.SecretsManager?.baseServiceAccount || 0;
     const usedServiceAccounts = this.sub?.smServiceAccounts || 0;
 
     const additionalServiceAccounts = baseServiceAccount - usedServiceAccounts;
@@ -652,7 +660,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       if (!this.acceptingSponsorship && !this.isInTrialFlow) {
         // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.router.navigate(["/organizations/" + orgId]);
+        this.router.navigate(["/organizations/" + orgId + "/members"]);
       }
 
       if (this.isInTrialFlow) {
@@ -676,11 +684,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   private async updateOrganization() {
     const request = new OrganizationUpgradeRequest();
     if (this.selectedPlan.productTier !== ProductTierType.Families) {
-      request.additionalSeats = this.organization.seats;
+      request.additionalSeats = this.sub?.seats;
     }
-    if (this.organization.maxStorageGb > this.selectedPlan.PasswordManager.baseStorageGb) {
+    if (this.sub?.maxStorageGb > this.selectedPlan.PasswordManager.baseStorageGb) {
       request.additionalStorageGb =
-        this.organization.maxStorageGb - this.selectedPlan.PasswordManager.baseStorageGb;
+        this.sub?.maxStorageGb - this.selectedPlan.PasswordManager.baseStorageGb;
     }
     request.premiumAccessAddon =
       this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
@@ -768,6 +776,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       request.additionalSmSeats = this.organization.seats;
     } else {
       request.additionalSmSeats = this.sub?.smSeats;
+      request.additionalServiceAccounts = this.additionalServiceAccount;
     }
   }
 
@@ -812,6 +821,16 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.totalOpened = !this.totalOpened;
   }
 
+  calculateTotalAppliedDiscount(total: number) {
+    const discountPercent =
+      this.selectedInterval == PlanInterval.Annually
+        ? this.discountPercentage + this.discountPercentageFromSub
+        : this.discountPercentageFromSub;
+
+    const discountedTotal = total / (1 - discountPercent / 100);
+    return discountedTotal;
+  }
+
   get paymentSourceClasses() {
     if (this.billing.paymentSource == null) {
       return [];
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 25c8c547b2b..341324c4a2a 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -69,14 +69,25 @@
     ></app-subscription-status>
     <ng-container *ngIf="userOrg.canEditSubscription">
       <div class="tw-flex-col">
-        <strong class="tw-block tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300">{{
-          "details" | i18n
-        }}</strong>
+        <strong class="tw-block tw-border-0 tw-border-b tw-border-solid tw-border-secondary-300"
+          >{{ "details" | i18n
+          }}<span
+            class="tw-ml-3"
+            *ngIf="customerDiscount?.percentOff > 0 && !isSecretsManagerTrial()"
+            bitBadge
+            variant="success"
+            >{{ "providerDiscount" | i18n: customerDiscount?.percentOff }}</span
+          ></strong
+        >
         <bit-table>
           <ng-template body>
             <ng-container *ngIf="subscription">
               <tr bitRow *ngFor="let i of subscriptionLineItems">
-                <td bitCell [ngClass]="{ 'tw-pl-20': i.addonSubscriptionItem }">
+                <td
+                  bitCell
+                  [ngClass]="{ 'tw-pl-20': i.addonSubscriptionItem }"
+                  class="tw-align-middle"
+                >
                   <span *ngIf="!i.addonSubscriptionItem">{{ i.productName | i18n }} -</span>
                   {{ i.name }} {{ i.quantity > 1 ? "&times;" + i.quantity : "" }} &#64;
                   {{ i.amount | currency: "$" }}
@@ -91,7 +102,19 @@
                     {{ "freeForOneYear" | i18n }}
                   </ng-container>
                   <ng-template #calculateElse>
-                    {{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}
+                    <div class="tw-flex tw-flex-col">
+                      <span>
+                        {{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }}
+                      </span>
+                      <span
+                        *ngIf="customerDiscount?.percentOff && !isSecretsManagerTrial()"
+                        class="tw-line-through !tw-text-muted"
+                        >{{
+                          calculateTotalAppliedDiscount(i.quantity * i.amount) | currency: "$"
+                        }}
+                        / {{ "year" | i18n }}</span
+                      >
+                    </div>
                   </ng-template>
                 </td>
               </tr>
@@ -112,7 +135,7 @@
     </ng-container>
 
     <ng-container *ngIf="userOrg.canEditSubscription">
-      <div class="tw-mt-7">
+      <div class="tw-mt-5">
         <button
           bitButton
           buttonType="secondary"
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 2a565face75..fa6db94bf51 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -430,6 +430,14 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     }
   }
 
+  isSecretsManagerTrial(): boolean {
+    return (
+      this.sub?.subscription?.items?.some((item) =>
+        this.sub?.customerDiscount?.appliesTo?.includes(item.productId),
+      ) ?? false
+    );
+  }
+
   closeChangePlan() {
     this.showChangePlan = false;
   }
@@ -464,6 +472,11 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
     this.load();
   }
 
+  calculateTotalAppliedDiscount(total: number) {
+    const discountedTotal = total / (1 - this.customerDiscount?.percentOff / 100);
+    return discountedTotal;
+  }
+
   adjustStorage = (add: boolean) => {
     return async () => {
       const deprecateStripeSourcesAPI = await firstValueFrom(this.deprecateStripeSourcesAPI$);
diff --git a/apps/web/src/app/core/web-file-download.service.ts b/apps/web/src/app/core/web-file-download.service.ts
index 743048dc3b9..ad034702a55 100644
--- a/apps/web/src/app/core/web-file-download.service.ts
+++ b/apps/web/src/app/core/web-file-download.service.ts
@@ -12,14 +12,12 @@ export class WebFileDownloadService implements FileDownloadService {
   download(request: FileDownloadRequest): void {
     const builder = new FileDownloadBuilder(request);
     const a = window.document.createElement("a");
-    if (builder.downloadMethod === "save") {
-      a.download = request.fileName;
-    } else if (!this.platformUtilsService.isSafari()) {
+    if (!this.platformUtilsService.isSafari()) {
       a.rel = "noreferrer";
       a.target = "_blank";
     }
     a.href = URL.createObjectURL(builder.blob);
-    a.style.position = "fixed";
+    a.download = request.fileName;
     window.document.body.appendChild(a);
     a.click();
     window.document.body.removeChild(a);
diff --git a/apps/web/src/app/vault/individual-vault/attachments.component.ts b/apps/web/src/app/vault/individual-vault/attachments.component.ts
index 7a5706319ee..b578efcae67 100644
--- a/apps/web/src/app/vault/individual-vault/attachments.component.ts
+++ b/apps/web/src/app/vault/individual-vault/attachments.component.ts
@@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-attachments",
@@ -33,6 +33,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
     dialogService: DialogService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       cipherService,
@@ -47,6 +48,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
       dialogService,
       billingAccountProfileStateService,
       accountService,
+      toastService,
     );
   }
 
diff --git a/apps/web/src/app/vault/org-vault/attachments.component.ts b/apps/web/src/app/vault/org-vault/attachments.component.ts
index 9ebb917aaf5..2bba4d389c0 100644
--- a/apps/web/src/app/vault/org-vault/attachments.component.ts
+++ b/apps/web/src/app/vault/org-vault/attachments.component.ts
@@ -15,7 +15,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { AttachmentsComponent as BaseAttachmentsComponent } from "../individual-vault/attachments.component";
 
@@ -39,6 +39,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent implements On
     dialogService: DialogService,
     billingAccountProfileStateService: BillingAccountProfileStateService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       cipherService,
@@ -52,6 +53,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent implements On
       dialogService,
       billingAccountProfileStateService,
       accountService,
+      toastService,
     );
   }
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 6834e350155..a9a709f3ec1 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -562,6 +562,9 @@
       }
     }
   },
+  "copySuccessful": {
+    "message": "Copy Successful"
+  },
   "copyValue": {
     "message": "Copy value",
     "description": "Copy value to clipboard"
@@ -3894,6 +3897,12 @@
       }
     }
   },
+  "encryptionKeyUpdateCannotProceed": {
+    "message": "Encryption key update cannot proceed"
+  },
+  "keyUpdateFoldersFailed": {
+    "message": "When updating your encryption key, your folders could not be decrypted. To continue with the update, your folders must be deleted. No vault items will be deleted if you proceed."
+  },
   "keyUpdated": {
     "message": "Key updated"
   },
@@ -9067,8 +9076,11 @@
   "bitwardenPasswordManager": {
     "message": "Bitwarden Password Manager"
   },
-  "secretsManagerWithFreePasswordManagerInfo": {
-    "message": "Your complementary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
+  "secretsManagerComplimentaryPasswordManager": {
+    "message": "Your complimentary one year Password Manager subscription will upgrade to the selected plan. You will not be charged until the complimentary period is over."
+  },
+  "fileSavedToDevice": {
+    "message": "File saved to device. Manage from your device downloads."
   },
   "publicApi": {
     "message": "Public API",
diff --git a/libs/angular/src/vault/components/attachments.component.ts b/libs/angular/src/vault/components/attachments.component.ts
index e377427eb89..4ae68c9ca9d 100644
--- a/libs/angular/src/vault/components/attachments.component.ts
+++ b/libs/angular/src/vault/components/attachments.component.ts
@@ -17,7 +17,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Directive()
 export class AttachmentsComponent implements OnInit {
@@ -49,6 +49,7 @@ export class AttachmentsComponent implements OnInit {
     protected dialogService: DialogService,
     protected billingAccountProfileStateService: BillingAccountProfileStateService,
     protected accountService: AccountService,
+    protected toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -182,6 +183,11 @@ export class AttachmentsComponent implements OnInit {
         fileName: attachment.fileName,
         blobData: decBuf,
       });
+      this.toastService.showToast({
+        variant: "success",
+        title: null,
+        message: this.i18nService.t("fileSavedToDevice"),
+      });
     } catch (e) {
       this.platformUtilsService.showToast("error", null, this.i18nService.t("errorOccurred"));
     }
diff --git a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
index d29ff71290a..1762400b3dd 100644
--- a/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
+++ b/libs/common/src/vault/abstractions/folder/folder-api.service.abstraction.ts
@@ -5,4 +5,5 @@ export class FolderApiServiceAbstraction {
   save: (folder: Folder) => Promise<any>;
   delete: (id: string) => Promise<any>;
   get: (id: string) => Promise<FolderResponse>;
+  deleteAll: () => Promise<void>;
 }
diff --git a/libs/common/src/vault/services/folder/folder-api.service.ts b/libs/common/src/vault/services/folder/folder-api.service.ts
index c618c958720..e46df37c176 100644
--- a/libs/common/src/vault/services/folder/folder-api.service.ts
+++ b/libs/common/src/vault/services/folder/folder-api.service.ts
@@ -32,6 +32,11 @@ export class FolderApiService implements FolderApiServiceAbstraction {
     await this.folderService.delete(id);
   }
 
+  async deleteAll(): Promise<void> {
+    await this.apiService.send("DELETE", "/folders/all", null, true, false);
+    await this.folderService.clear();
+  }
+
   async get(id: string): Promise<FolderResponse> {
     const r = await this.apiService.send("GET", "/folders/" + id, null, true, true);
     return new FolderResponse(r);
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
index 626934b20e8..7555b206976 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
@@ -87,7 +87,9 @@
             [disabled]="!filePassword"
             appStopClick
             bitSuffix
-            (click)="copyPasswordToClipboard()"
+            [appCopyClick]="filePassword"
+            [valueLabel]="'password' | i18n"
+            showToast
           ></button>
           <bit-hint>{{ "exportPasswordDescription" | i18n }}</bit-hint>
         </bit-form-field>
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index d83d189cd79..e4f5ec9d32d 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -121,7 +121,6 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
   encryptedExportType = EncryptedExportType;
   protected showFilePassword: boolean;
 
-  filePasswordValue: string = null;
   private _disabledByPolicy = false;
 
   organizations$: Observable<Organization[]>;
@@ -278,18 +277,9 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
 
   generatePassword = async () => {
     const [options] = await this.passwordGenerationService.getOptions();
-    this.filePasswordValue = await this.passwordGenerationService.generatePassword(options);
-    this.exportForm.get("filePassword").setValue(this.filePasswordValue);
-    this.exportForm.get("confirmFilePassword").setValue(this.filePasswordValue);
-  };
-
-  copyPasswordToClipboard = async () => {
-    this.platformUtilsService.copyToClipboard(this.filePasswordValue);
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("valueCopied", this.i18nService.t("password")),
-    });
+    const generatedPassword = await this.passwordGenerationService.generatePassword(options);
+    this.exportForm.get("filePassword").setValue(generatedPassword);
+    this.exportForm.get("confirmFilePassword").setValue(generatedPassword);
   };
 
   submit = async () => {