diff --git a/src/Core/MailTemplates/Mjml/components/mj-bw-hero.js b/src/Core/MailTemplates/Mjml/components/mj-bw-hero.js
index c7a3b7e7ff..f3f4b4cc6e 100644
--- a/src/Core/MailTemplates/Mjml/components/mj-bw-hero.js
+++ b/src/Core/MailTemplates/Mjml/components/mj-bw-hero.js
@@ -62,7 +62,7 @@ class MjBwHero extends BodyComponent {
             height="30px"
           ></mj-image>
           <mj-text color="#fff" padding-top="0" padding-bottom="0">
-            <h1 style="font-weight: normal; font-size: 24px; line-height: 32px">
+            <h1 style="font-weight: 500; font-size: 24px; line-height: 32px">
               ${this.getAttribute("title")}
             </h1>
             ` +
diff --git a/src/Core/MailTemplates/Mjml/components/mj-bw-icon-row.js b/src/Core/MailTemplates/Mjml/components/mj-bw-icon-row.js
index d0ccde5513..ed087062da 100644
--- a/src/Core/MailTemplates/Mjml/components/mj-bw-icon-row.js
+++ b/src/Core/MailTemplates/Mjml/components/mj-bw-icon-row.js
@@ -1,7 +1,7 @@
 const { BodyComponent } = require("mjml-core");
 
 const BODY_TEXT_STYLES = `
-  font-family="Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif"
+  font-family="'Helvetica Neue', Helvetica, Arial, sans-serif"
   font-size="16px"
   font-weight="400"
   line-height="24px"
@@ -30,12 +30,17 @@ class MjBwIconRow extends BodyComponent {
     return `
       @media only screen and (max-width:${breakpoint}) {
         .mj-bw-icon-row-text {
-          padding-left: 5px !important;
+          padding-left: 15px !important;
+          padding-right: 15px !important;
           line-height: 20px;
         }
-        .mj-bw-icon-row {
-          padding: 10px 15px;
-          width: fit-content !important;
+        .mj-bw-icon-row-icon {
+          display: none !important;
+          width: 0 !important;
+          max-width: 0 !important;
+        }
+        .mj-bw-icon-row-text-column {
+          width: 100% !important;
         }
       }
     `;
@@ -77,20 +82,20 @@ class MjBwIconRow extends BodyComponent {
 
     return this.renderMJML(
       `
-      <mj-section background-color="#fff" padding="10px 10px 10px 10px">
+      <mj-section background-color="#fff" padding="0px 10px 24px 10px">
         <mj-group css-class="mj-bw-icon-row">
-          <mj-column width="15%" vertical-align="top">
+          <mj-column width="15%" vertical-align="middle" css-class="mj-bw-icon-row-icon">
             <mj-image
               src="${this.getAttribute("icon-src")}"
               alt="${this.getAttribute("icon-alt")}"
               width="48px"
-              padding="0px"
+              padding="0px 10px 0px 5px"
               border-radius="8px"
             />
           </mj-column>
-          <mj-column width="85%" vertical-align="top">
+          <mj-column width="85%" vertical-align="middle" css-class="mj-bw-icon-row-text-column">
               ${headAnchorElement}
-              <mj-text css-class="mj-bw-icon-row-text" padding="5px 10px 0px 10px" ${BODY_TEXT_STYLES}>
+              <mj-text css-class="mj-bw-icon-row-text" padding="0px 0px 0px 0px" ${BODY_TEXT_STYLES}>
                 ${this.getAttribute("text")}
               </mj-text>
               ${footAnchorElement}
diff --git a/src/Core/MailTemplates/Mjml/components/mj-bw-learn-more-footer.js b/src/Core/MailTemplates/Mjml/components/mj-bw-learn-more-footer.js
index fb8b5b69dd..acecc6106a 100644
--- a/src/Core/MailTemplates/Mjml/components/mj-bw-learn-more-footer.js
+++ b/src/Core/MailTemplates/Mjml/components/mj-bw-learn-more-footer.js
@@ -25,21 +25,25 @@ class MjBwLearnMoreFooter extends BodyComponent {
   render() {
     return this.renderMJML(
       `
-      <mj-section border-radius="0px 0px 4px 4px" background-color="#F3F6F9" padding="5px 10px 10px 10px">
+      <mj-section border-radius="0px 0px 4px 4px" background-color="#F3F6F9" padding="14px 10px 14px 10px">
         <mj-column width="70%">
-          <mj-text line-height="24px">
-            <p style="font-size: 18px; line-height: 28px; font-weight: bold;">
+          <mj-text padding="10px 15px 10px 15px">
+            <p style="font-size: 18px; line-height: 28px; font-weight: 500; margin: 0 0 8px 0;">
               Learn more about Bitwarden
             </p>
-            Find user guides, product documentation, and videos on the
-            <a href="https://bitwarden.com/help/" class="link"> Bitwarden Help Center</a>.
+            <p style="font-size: 16px; line-height: 24px; margin: 0;">
+              Find user guides, product documentation, and videos on the
+              <a href="https://bitwarden.com/help/" class="link"> Bitwarden Help Center</a>.
+            </p>
           </mj-text>
         </mj-column>
-        <mj-column width="30%">
+        <mj-column width="30%" vertical-align="bottom">
           <mj-image
             src="https://assets.bitwarden.com/email/v1/spot-community.png"
             css-class="mj-bw-learn-more-footer-responsive-img"
             width="94px"
+            padding="0px 15px 0px 0px"
+            align="right"
           />
         </mj-column>
       </mj-section>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-use-all-shared-components.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-use-all-shared-components.mjml
new file mode 100644
index 0000000000..ca8436a58f
--- /dev/null
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-use-all-shared-components.mjml
@@ -0,0 +1,51 @@
+<mjml>
+    <mj-head>
+        <!-- Include shared head styles -->
+        <mj-include path="../../../components/head.mjml" />
+
+
+    </mj-head>
+
+    <mj-body>
+        <!-- Blue Header Section -->
+        <mj-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
+            <mj-bw-hero
+                    title="You can now share passwords with members of {{OrganizationName}}!"
+                    img-src="https://assets.bitwarden.com/email/v1/ac-spot-enterprise.png"
+                    button-text="Log in"
+                    button-url="{{WebVaultUrl}}"
+            />
+        </mj-wrapper>
+
+        <!-- Main Content -->
+        <mj-wrapper padding="5px 20px 8px 20px">
+            <mj-section background-color="#fff" padding="10px 10px 16px 10px">
+                <mj-column>
+                    <mj-text font-size="16px" line-height="24px" padding="15px 15px 0px 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="Share 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-wrapper>
+
+        <!-- Learn More Section -->
+        <mj-wrapper padding="8px 20px 10px 20px">
+            <mj-bw-learn-more-footer />
+        </mj-wrapper>
+
+        <!-- Footer -->
+        <mj-include path="../../../components/footer.mjml" />
+    </mj-body>
+</mjml>
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-without-rows.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-without-rows.mjml
new file mode 100644
index 0000000000..2ba614f637
--- /dev/null
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams-without-rows.mjml
@@ -0,0 +1,116 @@
+<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-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
+            <mj-bw-hero
+                    title="You can now share passwords with members of {{OrganizationName}}!"
+                    img-src="https://assets.bitwarden.com/email/v1/ac-spot-enterprise.png"
+                    button-text="Log in"
+                    button-url="{{WebVaultUrl}}"
+            />
+        </mj-wrapper>
+
+        <!-- Main Content -->
+        <mj-wrapper padding="5px 20px 8px 20px">
+            <!-- Main Text -->
+            <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>
+        </mj-wrapper>
+
+        <!-- Learn More Section -->
+        <mj-wrapper padding="8px 20px 10px 20px">
+            <mj-bw-learn-more-footer />
+        </mj-wrapper>
+
+        <!-- Footer -->
+        <mj-include path="../../../components/footer.mjml" />
+    </mj-body>
+</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 52a21abf59..9662c3fd0c 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
@@ -60,6 +60,7 @@
         </mj-section>
 
         <!-- Main Content Section -->
+        <!-- Main Text -->
         <mj-section
                 padding="40px 40px 8px 40px"
                 background-color="#fff">