From da2fc0ee35ae994fc39e6eda2f146da4c27dbb49 Mon Sep 17 00:00:00 2001
From: Jimmy Vo <huynhmaivo82@gmail.com>
Date: Tue, 10 Feb 2026 15:31:03 -0500
Subject: [PATCH] [PM-30610] Remove multiple versions

---
 ...ization-confirmation-enterprise-teams.mjml | 247 +++++++++---
 ...anization-confirmation-family-free-v2.mjml | 270 -------------
 ...organization-confirmation-family-free.mjml | 372 ++++++++++--------
 .../organization-confirmation-v1.mjml         | 296 --------------
 .../organization-confirmation-v2.mjml         | 209 ----------
 5 files changed, 411 insertions(+), 983 deletions(-)
 delete mode 100644 src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free-v2.mjml
 delete mode 100644 src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v1.mjml
 delete mode 100644 src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v2.mjml

diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
index b94bf0dc86..52a21abf59 100644
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
@@ -1,50 +1,209 @@
 <mjml>
-  <mj-head>
-    <mj-include path="../../../components/head.mjml" />
-  </mj-head>
+    <mj-head>
+        <!-- Include shared head styles -->
+        <mj-include path="../../../components/head.mjml" />
 
-  <mj-body css-class="border-fix">
-    <!-- Blue Header Section -->
-    <mj-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
-      <mj-bw-hero
-        img-src="https://assets.bitwarden.com/email/v1/spot-enterprise.png"
-        title="You can now share passwords with members of <b>{{OrganizationName}}!</b>"
-        button-text="<b>Log in</b>"
-        button-url="{{WebVaultUrl}}"
-      />
-    </mj-wrapper>
+        <!-- Include admin console shared styles -->
+        <mj-include path="../../../components/admin-console-head.mjml" />
+    </mj-head>
 
-    <!-- Main Content -->
-    <mj-wrapper padding="5px 20px 10px 20px">
-      <mj-section background-color="#fff" padding="15px 10px 10px 10px">
-        <mj-column>
-          <mj-text font-size="16px" line-height="24px" padding="10px 15px">
-            As a member of <b>{{OrganizationName}}</b>:
-          </mj-text>
-        </mj-column>
-      </mj-section>
-      <mj-bw-icon-row
-        icon-src="https://assets.bitwarden.com/email/v1/icon-enterprise.png"
-        icon-alt="Organization Icon"
-        text="Your account is owned by {{OrganizationName}} and is subject to their security and management policies."
-      />
-      <mj-bw-icon-row
-        icon-src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
-        icon-alt="Group Users Icon"
-        text="You can easily access and share passwords with your team."
-        foot-url-text="Share passwords in Bitwarden"
-        foot-url="https://bitwarden.com/help/sharing"
-      />
-      <mj-section background-color="#fff" padding="0 20px 20px 20px">
-      </mj-section>
-    </mj-wrapper>
+    <mj-body>
+        <!-- Blue Header Section -->
+        <mj-section
+                border-radius="10px 10px 0px 0px"
+                padding="32px 32px 40px 32px"
+                background-color="#175ddc">
+            <mj-column
+                    width="65%"
+                    padding="0px">
+                <mj-image
+                        padding="0px 0px 24px 0px"
+                        align="left"
+                        width="150px"
+                        src="https://bitwarden.com/images/logo-horizontal-white.png">
+                </mj-image>
+                <mj-text
+                        mj-class="ac-hero-text"
+                        padding="0px 0px 24px 0px">
+                    <p>You can now share passwords with members of <b>{{OrganizationName}}!</b></p>
+                </mj-text>
+                <mj-button
+                        mj-class="ac-button"
+                        href="{{WebVaultUrl}}"
+                        padding="0px">
+                    Log in
+                </mj-button>
+            </mj-column>
+            <mj-column
+                    vertical-align="bottom"
+                    width="35%">
+                <mj-image
+                        css-class="hide-mobile"
+                        align="right"
+                        padding="0px"
+                        width="155px"
+                        alt="Business Building"
+                        src="https://assets.bitwarden.com/email/v1/ac-spot-enterprise.png">
+                </mj-image>
+            </mj-column>
+        </mj-section>
 
-    <!-- Learn More Section -->
-    <mj-wrapper padding="5px 20px 10px 20px">
-      <mj-bw-learn-more-footer />
-    </mj-wrapper>
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
 
-    <!-- Footer -->
-    <mj-include path="../../../components/footer.mjml" />
-  </mj-body>
+        <!-- Main Content Section -->
+        <mj-section
+                padding="40px 40px 8px 40px"
+                background-color="#fff">
+            <mj-column>
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px">
+                    As a member of <b>{{OrganizationName}}</b>:
+                </mj-text>
+            </mj-column>
+        </mj-section>
+
+        <!-- Icon Row 1: Organization Ownership -->
+        <mj-section
+                padding="8px 40px"
+                text-align="left"
+                background-color="#fff">
+            <mj-column
+                    width="48px"
+                    css-class="hide-mobile"
+                    vertical-align="top">
+                <mj-image
+                        src="https://assets.bitwarden.com/email/v1/icon-enterprise.png"
+                        alt="Organization Icon"
+                        width="48px"
+                        border-radius="8px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="5%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="80%"
+                    vertical-align="top">
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px 0px 0px 0px">
+                    Your account is owned by {{OrganizationName}} and is subject to their security and management policies.
+                </mj-text>
+            </mj-column>
+        </mj-section>
+
+        <!-- Icon Row 2: Password Sharing -->
+        <mj-section
+                padding="8px 40px 40px 40px"
+                text-align="left"
+                background-color="#fff">
+            <mj-column
+                    width="48px"
+                    css-class="hide-mobile"
+                    vertical-align="top">
+                <mj-image
+                        src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
+                        alt="Share Icon"
+                        width="48px"
+                        border-radius="8px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="5%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="80%"
+                    vertical-align="top">
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px 0px 0px 0px">
+                    You can easily access and share passwords with your team.
+                    <a href="https://bitwarden.com/help/sharing" class="ac-link">Share passwords in Bitwarden</a>
+                </mj-text>
+            </mj-column>
+        </mj-section>
+
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
+
+        <!-- Learn More Section -->
+        <mj-section
+                border-radius="0px 0px 10px 10px"
+                padding="40px"
+                background-color="#F3F6F9">
+            <mj-column
+                    width="60%">
+                <mj-text
+                        mj-class="ac-heading"
+                        padding="0px 0px 8px 0px">
+                    Learn more about Bitwarden
+                </mj-text>
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px">
+                    Find user guides, product documentation, and videos on the <a href="https://bitwarden.com/help/" class="ac-link">Bitwarden Help Center</a>.
+                </mj-text>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="10%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="30%"
+                    vertical-align="top">
+                <mj-image
+                        css-class="hide-mobile"
+                        align="right"
+                        src="https://assets.bitwarden.com/email/v1/spot-community.png"
+                        width="94px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+        </mj-section>
+
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
+
+        <!-- Footer -->
+        <mj-include path="../../../components/footer.mjml" />
+    </mj-body>
 </mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free-v2.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free-v2.mjml
deleted file mode 100644
index 1a9ecf8378..0000000000
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free-v2.mjml
+++ /dev/null
@@ -1,270 +0,0 @@
-<mjml>
-    <mj-head>
-        <!-- Include shared head styles -->
-        <mj-include path="../../../components/head.mjml" />
-
-        <!-- Include admin console shared styles -->
-        <mj-include path="../../../components/admin-console-head.mjml" />
-    </mj-head>
-
-    <mj-body>
-        <!-- Blue Header Section -->
-        <mj-section
-                border-radius="10px 10px 0px 0px"
-                padding="32px 32px 40px 32px"
-                background-color="#175ddc">
-            <mj-column
-                    width="65%"
-                    padding="0px">
-                <mj-image
-                        padding="0px 0px 24px 0px"
-                        align="left"
-                        width="150px"
-                        src="https://bitwarden.com/images/logo-horizontal-white.png">
-                </mj-image>
-                <mj-text
-                        mj-class="ac-hero-text"
-                        padding="0px 0px 24px 0px">
-                    <p>You can now share passwords with members of <b>{{OrganizationName}}!</b></p>
-                </mj-text>
-                <mj-button
-                        mj-class="ac-button"
-                        href="{{WebVaultUrl}}"
-                        padding="0px">
-                    Log in
-                </mj-button>
-            </mj-column>
-            <mj-column
-                    vertical-align="bottom"
-                    width="35%">
-                <mj-image
-                        css-class="hide-mobile"
-                        align="right"
-                        padding="0px"
-                        width="155px"
-                        alt="Business Building"
-                        src="https://assets.bitwarden.com/email/v1/ac-spot-family.png">
-                </mj-image>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Main Content Section -->
-        <mj-section
-                padding="40px 40px 8px 40px"
-                background-color="#fff">
-            <mj-column>
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px">
-                    As a member of <b>{{OrganizationName}}</b>:
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Icon Row 1 -->
-        <mj-section
-                padding="8px 40px"
-                text-align="left"
-                background-color="#fff">
-            <mj-column
-                    width="48px"
-                    css-class="hide-mobile"
-                    vertical-align="top">
-                <mj-image
-                        src="https://assets.bitwarden.com/email/v1/icon-item-type.png"
-                        alt="Group Users Icon"
-                        width="48px"
-                        border-radius="8px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="5%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                width="80%"
-                vertical-align="top">
-                <mj-text
-                    mj-class="ac-text"
-                    padding="0px 0px 0px 0px">
-                    You can access passwords {{OrganizationName}} has shared with you.
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Icon Row 2 -->
-        <mj-section
-                padding="8px 40px 40px 40px"
-                text-align="left"
-                background-color="#fff">
-            <mj-column
-                    width="48px"
-                    css-class="hide-mobile"
-                    vertical-align="top">
-                <mj-image
-                        src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
-                        alt="Share Icon"
-                        width="48px"
-                        border-radius="8px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="5%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                    width="80%"
-                    vertical-align="top">
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px 0px 0px 0px">
-                    You can easily share passwords with friends, family, or coworkers.
-                    <a href="https://bitwarden.com/help/sharing" class="ac-link">Share passwords in Bitwarden</a>
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Download Mobile Apps Section -->
-        <mj-section background-color="#fff" padding="32px 32px 0px 32px">
-            <mj-column>
-                <mj-text
-                        font-size="16px"
-                        font-weight="700"
-                        line-height="24px"
-                        padding="0 0 16px 0">
-                    Download Bitwarden on all devices
-                </mj-text>
-
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0 0 24px 0">
-                    Already using the <a href="https://bitwarden.com/download/" class="ac-link">browser extension</a>?
-                    Download the Bitwarden mobile app from the
-                    <a href="https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744" class="ac-link">App Store</a>
-                    or <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" class="ac-link">Google Play</a>
-                    to quickly save logins and autofill forms on the go.
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <mj-section background-color="#fff" padding="0 32px 32px 32px">
-            <mj-group>
-                <mj-column width="159px">
-                    <mj-image
-                            css-class="hide-mobile"
-                            href="https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744"
-                            src="https://assets.bitwarden.com/email/v1/ac-apple-store.png"
-                            alt="Download on the App Store"
-                            width="135px"
-                            height="40px"
-                            padding="0 24px 0 0"
-                    />
-                </mj-column>
-                <mj-column width="140px">
-                    <mj-image
-                            css-class="hide-mobile"
-                            href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-                            src="https://assets.bitwarden.com/email/v1/ac-google-play.png"
-                            alt="Get it on Google Play"
-                            width="140px"
-                            height="40px"
-                            padding="0"
-                    />
-                </mj-column>
-            </mj-group>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Learn More Section -->
-        <mj-section
-                border-radius="0px 0px 10px 10px"
-                padding="40px"
-                background-color="#F3F6F9">
-            <mj-column
-                    width="60%">
-                <mj-text
-                        mj-class="ac-heading"
-                        padding="0px 0px 8px 0px">
-                    Learn more about Bitwarden
-                </mj-text>
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px">
-                    Find user guides, product documentation, and videos on the <a href="https://bitwarden.com/help/" class="ac-link">Bitwarden Help Center</a>.
-                </mj-text>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="10%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                    width="30%"
-                    vertical-align="top">
-                <mj-image
-                        css-class="hide-mobile"
-                        align="right"
-                        src="https://assets.bitwarden.com/email/v1/spot-community.png"
-                        width="94px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Footer -->
-        <mj-include path="../../../components/footer.mjml" />
-    </mj-body>
-</mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
index 8ae25255da..7bf583b5ff 100644
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
@@ -1,188 +1,177 @@
 <mjml>
-  <mj-head>
-    <mj-include path="../../../components/head.mjml" />
+    <mj-head>
+        <!-- Include shared head styles -->
+        <mj-include path="../../../components/head.mjml" />
 
-      <mj-style>
-          @media only screen and (max-width:480px) {
-              .mj-bw-icon-row-text {
-                  padding-left: 5px !important;
-                  line-height: 20px;
-              }
-              .mj-bw-icon-row {
-                  padding: 10px 15px;
-                  width: fit-content !important;
-              }
-          }
-      </mj-style>
-  </mj-head>
+        <!-- Include admin console shared styles -->
+        <mj-include path="../../../components/admin-console-head.mjml" />
+    </mj-head>
 
-  <mj-body css-class="border-fix">
-    <!-- Blue Header Section -->
-    <mj-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
+    <mj-body>
+        <!-- Blue Header Section -->
         <mj-section
-                full-width="full-width"
-                background-color="#175ddc"
-                border-radius="4px 4px 0px 0px"
-        >
-            <mj-column width="70%">
+                border-radius="10px 10px 0px 0px"
+                padding="32px 32px 40px 32px"
+                background-color="#175ddc">
+            <mj-column
+                    width="65%"
+                    padding="0px">
                 <mj-image
+                        padding="0px 0px 24px 0px"
                         align="left"
-                        src="https://bitwarden.com/images/logo-horizontal-white.png"
                         width="150px"
-                        height="30px"
-                />
-
-                <mj-text color="#fff" padding-top="0" padding-bottom="0">
-                    <h1 style="font-weight: normal; font-size: 24px; line-height: 32px">
-                        You can now share passwords with members of <b>{{OrganizationName}}!</b>
-                    </h1>
+                        src="https://bitwarden.com/images/logo-horizontal-white.png">
+                </mj-image>
+                <mj-text
+                        mj-class="ac-hero-text"
+                        padding="0px 0px 24px 0px">
+                    <p>You can now share passwords with members of <b>{{OrganizationName}}!</b></p>
                 </mj-text>
-
                 <mj-button
+                        mj-class="ac-button"
                         href="{{WebVaultUrl}}"
-                        background-color="#ffffff"
-                        color="#1A41AC"
-                        border-radius="20px"
-                        align="left"
-                        inner-padding="12px 24px"
-                        font-size="16px"
-                        font-family="Helvetica Neue, Helvetica, Arial, sans-serif"
-                        font-weight="700"
-                        line-height="24px"
-                >
+                        padding="0px">
                     Log in
                 </mj-button>
-
             </mj-column>
-
-            <mj-column width="30%" vertical-align="bottom">
+            <mj-column
+                    vertical-align="bottom"
+                    width="35%">
                 <mj-image
-                        src="https://assets.bitwarden.com/email/v1/spot-family-homes.png"
-                        alt=""
-                        width="155px"
+                        css-class="hide-mobile"
+                        align="right"
                         padding="0px"
-                        css-class="mj-bw-hero-responsive-img"
-                />
+                        width="155px"
+                        alt="Business Building"
+                        src="https://assets.bitwarden.com/email/v1/ac-spot-family.png">
+                </mj-image>
             </mj-column>
         </mj-section>
-    </mj-wrapper>
 
-        <!-- Main Content -->
-        <mj-wrapper padding="5px 20px 10px 20px">
-          <mj-section background-color="#fff" padding="32px 32px 0px 0px">
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
+
+        <!-- Main Content Section -->
+        <mj-section
+                padding="40px 40px 8px 40px"
+                background-color="#fff">
             <mj-column>
-              <mj-text font-size="16px" line-height="24px" padding="10px 15px">
-                As a member of <b>{{OrganizationName}}</b>:
-              </mj-text>
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px">
+                    As a member of <b>{{OrganizationName}}</b>:
+                </mj-text>
             </mj-column>
-          </mj-section>
-
-        <mj-section background-color="#fff" padding="24px 32px 0px">
-            <mj-group >
-                <mj-column width="72px" padding-right="24px" vertical-align="top">
-                    <mj-image
-                            src="https://assets.bitwarden.com/email/v1/icon-item-type.png"
-                            alt="Collections Icon"
-                            width="48px"
-                            padding="0px"
-                            border-radius="8px"
-                            align="left"
-                    />
-                </mj-column>
-
-                <mj-column width="484px" vertical-align="top">
-
-                    <mj-text
-                            css-class="mj-bw-icon-row-text"
-                            padding="0px"
-                            font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif"
-                            font-size="16px"
-                            font-weight="400"
-                            line-height="24px"
-                            align="left"
-                    >
-                        You can access passwords {{OrganizationName}} has shared with you.
-                    </mj-text>
-
-                </mj-column>
-            </mj-group>
         </mj-section>
-        <mj-section background-color="#fff" padding="24px 32px 32px">
-            <mj-group >
-                <mj-column width="72px" padding-right="24px" vertical-align="top">
-                    <mj-image
-                            src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
-                            alt="Group Users Icon"
-                            width="48px"
-                            padding="0px"
-                            border-radius="8px"
-                            align="left"
-                    />
-                </mj-column>
 
-                <mj-column width="484px" vertical-align="top">
-
-                    <mj-text
-                            css-class="mj-bw-icon-row-text"
-                            padding="0px"
-                            font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif"
-                            font-size="16px"
-                            font-weight="400"
-                            line-height="24px"
-                            align="left"
-                    >
-                        You can easily share passwords with friends, family, or coworkers.
-                    </mj-text>
-
-                    <mj-text
-                            css-class="mj-bw-icon-row-text"
-                            padding="0px"
-                            font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif"
-                            font-size="16px"
-                            font-weight="400"
-                            line-height="24px"
-                            align="left"
-                    >
-                        <a href="https://bitwarden.com/help/sharing" class="link">
-                            Share passwords in Bitwarden
-                            <span style="text-decoration: none">
-                                <img src="https://assets.bitwarden.com/email/v1/bwi-external-link-16px.png"
-                                     alt="External Link Icon"
-                                     width="16px"
-                                     style="vertical-align: middle;"
-                                />
-                            </span>
-                        </a>
-                    </mj-text>
-
-                </mj-column>
-            </mj-group>
+        <!-- Icon Row 1 -->
+        <mj-section
+                padding="8px 40px"
+                text-align="left"
+                background-color="#fff">
+            <mj-column
+                    width="48px"
+                    css-class="hide-mobile"
+                    vertical-align="top">
+                <mj-image
+                        src="https://assets.bitwarden.com/email/v1/icon-item-type.png"
+                        alt="Group Users Icon"
+                        width="48px"
+                        border-radius="8px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="5%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="80%"
+                    vertical-align="top">
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px 0px 0px 0px">
+                    You can access passwords {{OrganizationName}} has shared with you.
+                </mj-text>
+            </mj-column>
         </mj-section>
-    </mj-wrapper>
 
-    <!-- Download Mobile Apps Section -->
-    <mj-wrapper padding="5px 20px 10px 20px">
+        <!-- Icon Row 2 -->
+        <mj-section
+                padding="8px 40px 40px 40px"
+                text-align="left"
+                background-color="#fff">
+            <mj-column
+                    width="48px"
+                    css-class="hide-mobile"
+                    vertical-align="top">
+                <mj-image
+                        src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
+                        alt="Share Icon"
+                        width="48px"
+                        border-radius="8px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="5%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="80%"
+                    vertical-align="top">
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px 0px 0px 0px">
+                    You can easily share passwords with friends, family, or coworkers.
+                    <a href="https://bitwarden.com/help/sharing" class="ac-link">Share passwords in Bitwarden</a>
+                </mj-text>
+            </mj-column>
+        </mj-section>
+
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
+
+        <!-- Download Mobile Apps Section -->
         <mj-section background-color="#fff" padding="32px 32px 0px 32px">
             <mj-column>
                 <mj-text
-                        font-size="18px"
-                        font-weight="600"
-                        line-height="28px"
-                        padding="0 0 16px 0"
-                        font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif">
+                        font-size="16px"
+                        font-weight="700"
+                        line-height="24px"
+                        padding="0 0 16px 0">
                     Download Bitwarden on all devices
                 </mj-text>
 
                 <mj-text
-                        font-size="16px"
-                        font-weight="400"
-                        line-height="24px"
-                        padding="0 0 24px 0"
-                        font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif">
-                    Already using the <a href="https://bitwarden.com/download/" style="text-decoration: none; color: #175ddc; font-weight: 700;">browser extension</a>?
+                        mj-class="ac-text"
+                        padding="0 0 24px 0">
+                    Already using the <a href="https://bitwarden.com/download/" class="ac-link">browser extension</a>?
                     Download the Bitwarden mobile app from the
-                    <a href="https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744" style="text-decoration: none; color: #175ddc; font-weight: 700;">App Store</a>
-                    or <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" style="text-decoration: none; color: #175ddc; font-weight: 700;">Google Play</a>
+                    <a href="https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744" class="ac-link">App Store</a>
+                    or <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" class="ac-link">Google Play</a>
                     to quickly save logins and autofill forms on the go.
                 </mj-text>
             </mj-column>
@@ -192,18 +181,20 @@
             <mj-group>
                 <mj-column width="159px">
                     <mj-image
+                            css-class="hide-mobile"
                             href="https://apps.apple.com/us/app/bitwarden-password-manager/id1137397744"
-                            src="https://assets.bitwarden.com/email/v1/App-store.png"
+                            src="https://assets.bitwarden.com/email/v1/ac-apple-store.png"
                             alt="Download on the App Store"
                             width="135px"
                             height="40px"
                             padding="0 24px 0 0"
                     />
                 </mj-column>
-                <mj-column  width="140px">
+                <mj-column width="140px">
                     <mj-image
+                            css-class="hide-mobile"
                             href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
-                            src="https://assets.bitwarden.com/email/v1/google-play-badge.png"
+                            src="https://assets.bitwarden.com/email/v1/ac-google-play.png"
                             alt="Get it on Google Play"
                             width="140px"
                             height="40px"
@@ -213,14 +204,67 @@
             </mj-group>
         </mj-section>
 
-    </mj-wrapper>
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
 
-    <!-- Learn More Section -->
-    <mj-wrapper padding="5px 20px 10px 20px">
-      <mj-bw-learn-more-footer />
-    </mj-wrapper>
+        <!-- Learn More Section -->
+        <mj-section
+                border-radius="0px 0px 10px 10px"
+                padding="40px"
+                background-color="#F3F6F9">
+            <mj-column
+                    width="60%">
+                <mj-text
+                        mj-class="ac-heading"
+                        padding="0px 0px 8px 0px">
+                    Learn more about Bitwarden
+                </mj-text>
+                <mj-text
+                        mj-class="ac-text"
+                        padding="0px">
+                    Find user guides, product documentation, and videos on the <a href="https://bitwarden.com/help/" class="ac-link">Bitwarden Help Center</a>.
+                </mj-text>
+            </mj-column>
+            <mj-column
+                    css-class="hide-mobile"
+                    width="10%">
+                <mj-spacer
+                        height="1px">
+                </mj-spacer>
+            </mj-column>
+            <mj-column
+                    width="30%"
+                    vertical-align="top">
+                <mj-image
+                        css-class="hide-mobile"
+                        align="right"
+                        src="https://assets.bitwarden.com/email/v1/spot-community.png"
+                        width="94px"
+                        padding="0px">
+                </mj-image>
+            </mj-column>
+        </mj-section>
 
-    <!-- Footer -->
-    <mj-include path="../../../components/footer.mjml" />
-  </mj-body>
+        <!-- Spacing -->
+        <mj-section
+                padding="0px">
+            <mj-column
+                    padding="0px">
+                <mj-spacer
+                        height="16px">
+                </mj-spacer>
+            </mj-column>
+        </mj-section>
+
+        <!-- Footer -->
+        <mj-include path="../../../components/footer.mjml" />
+    </mj-body>
 </mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v1.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v1.mjml
deleted file mode 100644
index 8670263259..0000000000
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v1.mjml
+++ /dev/null
@@ -1,296 +0,0 @@
-<mjml>
-  <mj-head>
-    <mj-font
-        name="Inter"
-        href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap">
-    </mj-font>
-    <mj-font
-        name="Roboto"
-        href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap">
-    </mj-font>
-    <mj-attributes>
-      <mj-all
-          font-family="'Inter','Helvetica Neue',Helvetica,Arial,sans-serif" />
-      <mj-text
-          color="#1B2029" />
-      <mj-body
-          background-color="#e6e9ef"
-          width="660px" />
-    </mj-attributes>
-    <mj-style>
-      p { margin: 0px !important; }
-      .link { color: #175ddc; text-decoration: none; font-weight: 600; }
-      .icon-box { background: #dbe5f6; border-radius: 8px; }
-    </mj-style>
-  </mj-head>
-
-  <mj-body
-      background-color="#e6e9ef">
-    <!-- Blue Header Section -->
-    <mj-section
-        border-radius="10px 10px 0px 0px"
-        padding="32px 32px 40px 32px"
-        background-color="#175ddc">
-      <mj-column
-          width="65%"
-          padding="0px">
-        <mj-image
-            padding="0px 0px 24px 0px"
-            align="left"
-            width="150px"
-            src="https://bitwarden.com/images/logo-horizontal-white.png">
-        </mj-image>
-        <mj-text
-            font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-            font-size="24px"
-            line-height="32px"
-            font-weight="600"
-            padding="0px 0px 24px 0px"
-            align="left"
-            color="#ffffff">
-          <p><strong>{{OrganizationName}}</strong> set up a Bitwarden password manager account for you.</p>
-        </mj-text>
-        <mj-button
-            href="{{WebVaultUrl}}"
-            background-color="#ffffff"
-            color="#1A41AC"
-            border-radius="20px"
-            align="left"
-            inner-padding="6px 16px"
-            padding="0px"
-            font-size="16px"
-            font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-            font-weight="700"
-            line-height="24px">
-          Log in
-        </mj-button>
-      </mj-column>
-      <mj-column
-          vertical-align="middle"
-          width="35%">
-        <mj-image
-            align="center"
-            padding="0px"
-            width="200px"
-            alt="Business Building"
-            src="https://assets.bitwarden.com/email/v1/spot-enterprise.png">
-        </mj-image>
-      </mj-column>
-    </mj-section>
-
-    <!-- Spacing -->
-    <mj-section
-        padding="0px">
-      <mj-column
-          padding="0px">
-        <mj-spacer
-            height="16px">
-        </mj-spacer>
-      </mj-column>
-    </mj-section>
-
-    <!-- Main Content Section -->
-    <mj-section
-        padding="40px 40px 8px 40px"
-        background-color="#fff">
-      <mj-column>
-        <mj-text
-            font-size="16px"
-            line-height="24px"
-            padding="0px">
-          As a member of <b>{{OrganizationName}}</b>:
-        </mj-text>
-      </mj-column>
-    </mj-section>
-
-    <!-- Icon Row 1: Organization Ownership -->
-    <mj-section
-        padding="8px 40px"
-        text-align="left"
-        background-color="#fff">
-      <mj-column
-          width="48px"
-          vertical-align="top">
-        <mj-image
-            css-class="icon-box"
-            src="https://assets.bitwarden.com/email/v1/icon-enterprise.png"
-            alt="Organization Icon"
-            width="48px"
-            border-radius="8px"
-            padding="0px">
-        </mj-image>
-      </mj-column>
-      <mj-column
-          width="5%">
-        <mj-spacer
-            height="1px">
-        </mj-spacer>
-      </mj-column>
-      <mj-column
-          width="80%"
-          vertical-align="top">
-        <mj-text
-            font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-            line-height="24px"
-            font-size="16px"
-            padding="0px 0px 0px 0px">
-          Your account is owned by {{OrganizationName}} and is subject to their security and management policies.
-        </mj-text>
-      </mj-column>
-    </mj-section>
-
-    <!-- Icon Row 2: Password Sharing -->
-    <mj-section
-        padding="8px 40px 40px 40px"
-        text-align="left"
-        background-color="#fff">
-      <mj-column
-              width="25%">
-        <mj-image
-            src="https://static.mailjet.com/mjml-website/templates/recast-image2.png"
-            alt="Share Icon"
-            width="48px">
-        </mj-image>
-
-      </mj-column>
-      <mj-column
-          width="5%">
-        <mj-spacer
-            height="1px">
-        </mj-spacer>
-      </mj-column>
-      <mj-column
-          width="80%"
-          vertical-align="top">
-        <mj-text
-            font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-            line-height="24px"
-            font-size="16px"
-            padding="0px 0px 0px 0px">
-          You can easily access and share passwords with your team.<br/>
-          <a href="https://bitwarden.com/help/share-items/" class="link">Share passwords in Bitwarden</a>
-        </mj-text>
-      </mj-column>
-    </mj-section>
-
-    <!-- Icon Row 3: test -->
-    <mj-section
-            background-color="#fff">
-      <mj-column
-          width="25%">
-        <mj-image
-            width="48px"
-            src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png">
-        </mj-image>
-      </mj-column>
-      <mj-column
-          width="75%">
-          <mj-text
-                  font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-                  line-height="24px"
-                  font-size="16px"
-                  padding="0px 0px 0px 0px"
-          >
-              You can easily access and share passwords with your team.<br/>
-              <a href="https://bitwarden.com/help/share-items/" class="link">Share passwords in Bitwarden</a>
-          </mj-text>
-      </mj-column>
-    </mj-section>
-
-      <!-- Icon Row 4: test iteration -->
-      <mj-section>
-
-          <mj-column width="25%">
-              <mj-image width="48px"
-                        src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png">
-
-              </mj-image>
-          </mj-column>
-          <mj-column width="75%">
-              <mj-text
-                      font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-                      line-height="24px"
-                      font-size="16px"
-              >
-                  You can easily access and share passwords with your team.<br/>
-                  <a href="https://bitwarden.com/help/share-items/" class="link">Share passwords in Bitwarden</a>
-              </mj-text>
-          </mj-column>
-      </mj-section>
-
-      <!-- Icon Row 5: test original -->
-      <mj-section>
-
-          <mj-column width="25%">
-              <mj-image width="100px" href="http://projects.csail.mit.edu/soundnet/" src="https://static.mailjet.com/mjml-website/templates/recast-image2.png"></mj-image>
-          </mj-column>
-          <mj-column width="75%">
-              <mj-text
-                      font-family="'Roboto','Helvetica Neue',Helvetica,Arial,sans-serif"
-                      line-height="24px"
-                      font-size="16px"
-              >
-                  You can easily access and share passwords with your team.<br/>
-                  <a href="https://bitwarden.com/help/share-items/" class="link">Share passwords in Bitwarden</a>
-              </mj-text>
-          </mj-column>
-      </mj-section>
-
-    <!-- Spacing -->
-    <mj-section
-        padding="0px">
-      <mj-column
-          padding="0px">
-        <mj-spacer
-            height="16px">
-        </mj-spacer>
-      </mj-column>
-    </mj-section>
-
-    <!-- Learn More Section -->
-    <mj-section
-        border-radius="0px 0px 10px 10px"
-        padding="40px"
-        background-color="#F3F6F9">
-      <mj-column
-          width="70%">
-        <mj-text
-            line-height="30px"
-            font-size="20px"
-            font-weight="700"
-            padding="0px 0px 8px 0px">
-          Learn more about Bitwarden
-        </mj-text>
-        <mj-text
-            line-height="20px"
-            font-size="14px"
-            padding="0px">
-          Find user guides, product documentation, and videos on the <a href="https://bitwarden.com/help/" class="link">Bitwarden help center</a>.
-        </mj-text>
-      </mj-column>
-      <mj-column
-          width="30%"
-          vertical-align="middle">
-        <mj-image
-            src="https://assets.bitwarden.com/email/v1/spot-community.png"
-            width="94px"
-            padding="0px">
-        </mj-image>
-      </mj-column>
-    </mj-section>
-
-    <!-- Spacing -->
-    <mj-section
-        padding="0px">
-      <mj-column
-          padding="0px">
-        <mj-spacer
-            height="16px">
-        </mj-spacer>
-      </mj-column>
-    </mj-section>
-
-      <!-- Footer -->
-      <mj-include path="../../../components/footer.mjml" />
-  </mj-body>
-</mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v2.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v2.mjml
deleted file mode 100644
index 52a21abf59..0000000000
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-v2.mjml
+++ /dev/null
@@ -1,209 +0,0 @@
-<mjml>
-    <mj-head>
-        <!-- Include shared head styles -->
-        <mj-include path="../../../components/head.mjml" />
-
-        <!-- Include admin console shared styles -->
-        <mj-include path="../../../components/admin-console-head.mjml" />
-    </mj-head>
-
-    <mj-body>
-        <!-- Blue Header Section -->
-        <mj-section
-                border-radius="10px 10px 0px 0px"
-                padding="32px 32px 40px 32px"
-                background-color="#175ddc">
-            <mj-column
-                    width="65%"
-                    padding="0px">
-                <mj-image
-                        padding="0px 0px 24px 0px"
-                        align="left"
-                        width="150px"
-                        src="https://bitwarden.com/images/logo-horizontal-white.png">
-                </mj-image>
-                <mj-text
-                        mj-class="ac-hero-text"
-                        padding="0px 0px 24px 0px">
-                    <p>You can now share passwords with members of <b>{{OrganizationName}}!</b></p>
-                </mj-text>
-                <mj-button
-                        mj-class="ac-button"
-                        href="{{WebVaultUrl}}"
-                        padding="0px">
-                    Log in
-                </mj-button>
-            </mj-column>
-            <mj-column
-                    vertical-align="bottom"
-                    width="35%">
-                <mj-image
-                        css-class="hide-mobile"
-                        align="right"
-                        padding="0px"
-                        width="155px"
-                        alt="Business Building"
-                        src="https://assets.bitwarden.com/email/v1/ac-spot-enterprise.png">
-                </mj-image>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Main Content Section -->
-        <mj-section
-                padding="40px 40px 8px 40px"
-                background-color="#fff">
-            <mj-column>
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px">
-                    As a member of <b>{{OrganizationName}}</b>:
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Icon Row 1: Organization Ownership -->
-        <mj-section
-                padding="8px 40px"
-                text-align="left"
-                background-color="#fff">
-            <mj-column
-                    width="48px"
-                    css-class="hide-mobile"
-                    vertical-align="top">
-                <mj-image
-                        src="https://assets.bitwarden.com/email/v1/icon-enterprise.png"
-                        alt="Organization Icon"
-                        width="48px"
-                        border-radius="8px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="5%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                    width="80%"
-                    vertical-align="top">
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px 0px 0px 0px">
-                    Your account is owned by {{OrganizationName}} and is subject to their security and management policies.
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Icon Row 2: Password Sharing -->
-        <mj-section
-                padding="8px 40px 40px 40px"
-                text-align="left"
-                background-color="#fff">
-            <mj-column
-                    width="48px"
-                    css-class="hide-mobile"
-                    vertical-align="top">
-                <mj-image
-                        src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
-                        alt="Share Icon"
-                        width="48px"
-                        border-radius="8px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="5%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                    width="80%"
-                    vertical-align="top">
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px 0px 0px 0px">
-                    You can easily access and share passwords with your team.
-                    <a href="https://bitwarden.com/help/sharing" class="ac-link">Share passwords in Bitwarden</a>
-                </mj-text>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Learn More Section -->
-        <mj-section
-                border-radius="0px 0px 10px 10px"
-                padding="40px"
-                background-color="#F3F6F9">
-            <mj-column
-                    width="60%">
-                <mj-text
-                        mj-class="ac-heading"
-                        padding="0px 0px 8px 0px">
-                    Learn more about Bitwarden
-                </mj-text>
-                <mj-text
-                        mj-class="ac-text"
-                        padding="0px">
-                    Find user guides, product documentation, and videos on the <a href="https://bitwarden.com/help/" class="ac-link">Bitwarden Help Center</a>.
-                </mj-text>
-            </mj-column>
-            <mj-column
-                    css-class="hide-mobile"
-                    width="10%">
-                <mj-spacer
-                        height="1px">
-                </mj-spacer>
-            </mj-column>
-            <mj-column
-                    width="30%"
-                    vertical-align="top">
-                <mj-image
-                        css-class="hide-mobile"
-                        align="right"
-                        src="https://assets.bitwarden.com/email/v1/spot-community.png"
-                        width="94px"
-                        padding="0px">
-                </mj-image>
-            </mj-column>
-        </mj-section>
-
-        <!-- Spacing -->
-        <mj-section
-                padding="0px">
-            <mj-column
-                    padding="0px">
-                <mj-spacer
-                        height="16px">
-                </mj-spacer>
-            </mj-column>
-        </mj-section>
-
-        <!-- Footer -->
-        <mj-include path="../../../components/footer.mjml" />
-    </mj-body>
-</mjml>