diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index 036163af3d9..245e216eea2 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -3,7 +3,7 @@
 <bit-container>
   <ng-container *ngIf="loading">
     <i
-      class="bwi bwi-spinner bwi-spin text-muted"
+      class="bwi bwi-spinner bwi-spin tw-text-muted"
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
@@ -109,8 +109,9 @@
       <!-- Key Connector -->
       <ng-container
         *ngIf="
-          ssoConfigForm.value.memberDecryptionType === memberDecryptionType.KeyConnector &&
-          showKeyConnectorOptions
+          true ||
+          (ssoConfigForm.value.memberDecryptionType === memberDecryptionType.KeyConnector &&
+            showKeyConnectorOptions)
         "
       >
         <bit-callout type="warning" [useAlertRole]="true">
@@ -148,7 +149,7 @@
             aria-live="polite"
             *ngIf="haveTestedKeyConnector && !keyConnectorUrl.hasError('invalidUrl')"
           >
-            <small class="text-success">
+            <small class="tw-text-success-600">
               <i class="bwi bwi-check-circle" aria-hidden="true"></i>
               {{ "keyConnectorTestSuccess" | i18n }}
             </small>
@@ -173,8 +174,12 @@
       *ngIf="ssoConfigForm.get('configType').value === ssoType.OpenIdConnect"
       [formGroup]="openIdForm"
     >
-      <div class="config-section">
-        <h2 class="secondary-header">{{ "openIdConnectConfig" | i18n }}</h2>
+      <div>
+        <h2
+          class="tw-mb-4 tw-pb-2.5 tw-mt-16 tw-border-0 tw-border-b tw-border-solid tw-border-b-secondary-300 dark:tw-border-b-secondary-700"
+        >
+          {{ "openIdConnectConfig" | i18n }}
+        </h2>
 
         <bit-form-field>
           <bit-label>{{ "callbackPath" | i18n }}</bit-label>
@@ -246,14 +251,14 @@
 
         <!-- Optional customizations -->
         <div
-          class="section-header d-flex flex-row align-items-center mt-3 mb-3"
+          class="tw-flex tw-flex-row tw-items-center tw-my-3 tw-text-main hover:tw-cursor-pointer"
           (click)="toggleOpenIdCustomizations()"
         >
-          <h3 class="mb-0 mr-2" id="customizations-header">
+          <h3 class="tw-mb-0 tw-mr-2 tw-font-normal tw-uppercase" id="customizations-header">
             {{ "openIdOptionalCustomizations" | i18n }}
           </h3>
           <button
-            class="mb-1 btn btn-link"
+            class="tw-my-1 tw-text-primary-600 hover:tw-text-primary-700 focus:tw-outline focus:tw-outline-1 focus:tw-outline-offset-1"
             type="button"
             appStopClick
             role="button"
@@ -314,8 +319,12 @@
     <!-- SAML2 SP -->
     <div *ngIf="ssoConfigForm.get('configType').value === ssoType.Saml2" [formGroup]="samlForm">
       <!-- SAML2 SP -->
-      <div class="config-section">
-        <h2 class="secondary-header">{{ "samlSpConfig" | i18n }}</h2>
+      <div>
+        <h2
+          class="tw-mb-4 tw-pb-2.5 tw-mt-16 tw-border-0 tw-border-b tw-border-solid tw-border-b-secondary-300 dark:tw-border-b-secondary-700"
+        >
+          {{ "samlSpConfig" | i18n }}
+        </h2>
 
         <bit-form-control>
           <bit-label>{{ "spUniqueEntityId" | i18n }}</bit-label>
@@ -457,8 +466,12 @@
       </div>
 
       <!-- SAML2 IDP -->
-      <div class="config-section">
-        <h2 class="secondary-header">{{ "samlIdpConfig" | i18n }}</h2>
+      <div>
+        <h2
+          class="tw-mb-2 tw-pb-2.5 tw-mt-16 tw-border-0 tw-border-b tw-border-solid tw-border-b-secondary-300 dark:tw-border-b-secondary-700"
+        >
+          {{ "samlIdpConfig" | i18n }}
+        </h2>
 
         <bit-form-field>
           <bit-label>{{ "idpEntityId" | i18n }}</bit-label>