diff --git a/openmetadata-spec/src/main/resources/json/schema/configuration/authenticationConfiguration.json b/openmetadata-spec/src/main/resources/json/schema/configuration/authenticationConfiguration.json
index ac7d5075eca..af94d3fee3c 100644
--- a/openmetadata-spec/src/main/resources/json/schema/configuration/authenticationConfiguration.json
+++ b/openmetadata-spec/src/main/resources/json/schema/configuration/authenticationConfiguration.json
@@ -22,10 +22,8 @@
       "javaType": "org.openmetadata.schema.api.security.ClientType",
       "description": "Client Type",
       "type": "string",
-      "enum": [
-        "public",
-        "confidential"
-      ],
+      "enum": ["public", "confidential"],
+      "enumNames": ["Public", "Confidential"],
       "default": "public"
     },
     "provider": {
diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-custom-oidc.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-custom-oidc.svg
new file mode 100644
index 00000000000..c5fe8fad70b
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-custom-oidc.svg
@@ -0,0 +1,3 @@
+<svg width="448" height="416" viewBox="0 0 448 416" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M271.5 384L203.5 416C88.5 405.7 0 344.5 0 270.2C0 198.7 82.5 139.2 191.7 125.9V168.9C120.2 181.4 67.7 221.9 67.7 270.2C67.7 321.2 126.2 363.5 203.4 373.2V33.2L271.4 0V384H271.5ZM448 243L316.7 214.5L353.5 193.8C334 182.3 310 173.8 283.5 169V126C329.7 131.5 371.2 145.5 403.8 165.3L438.8 145.5L448 243Z" fill="#016AFB"/>
+</svg>
diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-ldap.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-ldap.svg
new file mode 100644
index 00000000000..4bd1d003196
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-ldap.svg
@@ -0,0 +1,9 @@
+<svg width="55" height="40" viewBox="0 0 55 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27.933 8.09241V32.3762" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M28.0854 10.126V15.8757C28.0854 19.1894 30.7717 21.8757 34.0854 21.8757H41.4646C44.7783 21.8757 47.4646 24.562 47.4646 27.8757V28.1318" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<path d="M27.8022 10.126V15.8757C27.8022 19.1894 25.116 21.8757 21.8022 21.8757H14.4231C11.1094 21.8757 8.42312 24.562 8.42312 27.8757V28.1318" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+<rect x="1.38867" y="27.6302" width="12.64" height="11.2356" rx="2" fill="white" stroke="#151515" stroke-width="2"/>
+<rect x="41.3404" y="27.6302" width="12.64" height="11.2356" rx="2" fill="white" stroke="#151515" stroke-width="2"/>
+<rect x="21.613" y="27.6302" width="12.64" height="11.2356" rx="2" fill="white" stroke="#151515" stroke-width="2"/>
+<rect x="18.9578" y="1.13428" width="17.9506" height="12.64" rx="2" fill="white" stroke="#151515" stroke-width="2"/>
+</svg>
diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-saml.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-saml.svg
new file mode 100644
index 00000000000..fadef2ba7c8
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-saml.svg
@@ -0,0 +1,4 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.3241 1.72692C33.1805 0.655127 35.4677 0.655127 37.3241 1.72692L60.7734 15.2654C62.6299 16.3372 63.7734 18.318 63.7734 20.4616V47.5386C63.7734 49.6822 62.6299 51.663 60.7734 52.7348L37.3241 66.2733C35.4677 67.3451 33.1805 67.3451 31.3241 66.2733L7.87468 52.7348C6.01828 51.663 4.87468 49.6822 4.87468 47.5386V20.4616C4.87468 18.318 6.01828 16.3372 7.87468 15.2654L31.3241 1.72692Z" fill="#378BF7"/>
+<path d="M43.3688 32.4039V28.6793C43.3688 23.6914 39.3118 19.6344 34.3239 19.6344C29.3359 19.6344 25.279 23.6914 25.279 28.6793V32.4039C23.8118 32.4039 22.6187 33.5971 22.6187 35.0642V45.7055C22.6187 47.1727 23.8118 48.3658 25.279 48.3658H43.3691C44.8363 48.3658 46.0294 47.1727 46.0294 45.7055V35.0642C46.0294 33.5971 44.8363 32.4039 43.3691 32.4039H43.3688ZM36.1487 44.6416H32.5001L33.1133 40.6592C32.387 40.2388 31.8922 39.462 31.8922 38.5615C31.8922 37.218 32.9816 36.13 34.3237 36.13C35.6672 36.13 36.7552 37.2194 36.7552 38.5615C36.7552 39.4607 36.2604 40.2375 35.5342 40.6592L36.1474 44.6416H36.1487ZM39.6445 32.4039H29.0032V28.6793C29.0032 25.745 31.3895 23.3587 34.3239 23.3587C37.2582 23.3587 39.6445 25.745 39.6445 28.6793V32.4039Z" fill="white"/>
+</svg>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/UnsavedChangesModal/unsaved-changes-modal.less b/openmetadata-ui/src/main/resources/ui/src/components/Modals/UnsavedChangesModal/unsaved-changes-modal.less
index 329b93685a5..5c33ea27a1d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/UnsavedChangesModal/unsaved-changes-modal.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/UnsavedChangesModal/unsaved-changes-modal.less
@@ -77,4 +77,9 @@
     flex: 1;
     min-width: 0;
   }
+
+  .unsaved-changes-modal-discard {
+    color: @grey-800;
+    font-weight: @font-medium;
+  }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
index d1eab823364..e963b10a144 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
@@ -1492,7 +1492,7 @@ const SSOConfigurationFormRJSF = ({
                       data-testid="cancel-sso-configuration"
                       type="link"
                       onClick={handleCancelClick}>
-                      {t('label.cancel-lowercase')}
+                      {t('label.cancel')}
                     </Button>
                     <Button
                       className="save-sso-configuration text-md"
@@ -1590,7 +1590,7 @@ const SSOConfigurationFormRJSF = ({
                     data-testid="cancel-sso-configuration"
                     type="link"
                     onClick={handleCancelClick}>
-                    {t('label.cancel-lowercase')}
+                    {t('label.cancel')}
                   </Button>
                   <Button
                     className="save-sso-configuration text-md"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form-array-field-template.less b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form-array-field-template.less
index 4bbd25f8eb0..a18b78455e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form-array-field-template.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form-array-field-template.less
@@ -60,10 +60,9 @@
     gap: @size-xxs;
     background: @blue-29;
     border: 1px solid @blue-30;
-    border-radius: @border-rad-xs;
+    border-radius: 6px;
     margin: 0;
-    min-height: @size-xl;
-    height: auto;
+    height: @size-lg;
     color: @grey-900;
     font-size: @size-sm;
     font-weight: @font-medium;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
index 1de78341d02..27bb62e4314 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
@@ -131,7 +131,7 @@
     width: 100%;
 
     .cancel-sso-configuration {
-      font-weight: @font-semibold;
+      font-weight: @font-regular;
 
       line-height: 24px;
       color: @primary-6;
@@ -177,7 +177,7 @@
     box-sizing: border-box;
 
     .cancel-sso-configuration {
-      font-weight: 600;
+      font-weight: @font-regular;
 
       line-height: 24px;
       color: @primary-6;
@@ -562,9 +562,14 @@
   }
 }
 
-// SSO-specific dropdown menu box-shadow
+// SSO-specific dropdown menu box-shadow and border radius
 .sso-configuration-form-card .ant-select-dropdown {
   box-shadow: 0px 1px 2px 0px @grey-27;
+  border-radius: @border-rad-xs;
+
+  .ant-select-dropdown-content {
+    border-radius: @border-rad-xs;
+  }
 }
 
 .sso-configuration-form-card .rjsf .form-group.field {
@@ -820,3 +825,19 @@
     }
   }
 }
+
+// SSO-specific scrollbar thumb color
+.sso-configuration-form-card,
+.content-resizable-panel-container.sso-configured,
+.content-height-with-resizable-panel.sso-configured {
+  &::-webkit-scrollbar-thumb {
+    background-color: @grey-500;
+  }
+
+  // Apply to all scrollable children within SSO forms
+  * {
+    &::-webkit-scrollbar-thumb {
+      background-color: @grey-500;
+    }
+  }
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SSOUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/SSOUtils.ts
index 493252908c2..bc3bc87f064 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/SSOUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/SSOUtils.ts
@@ -11,13 +11,14 @@
  *  limitations under the License.
  */
 
-import LdapIcon from '../assets/img/ic-ldap.svg';
-import SamlIcon from '../assets/img/ic-saml.svg';
 import Auth0Icon from '../assets/img/icon-auth0.png';
 import CognitoIcon from '../assets/img/icon-aws-cognito.png';
 import AzureIcon from '../assets/img/icon-azure.png';
 import GoogleIcon from '../assets/img/icon-google.png';
 import OktaIcon from '../assets/img/icon-okta.png';
+import CustomOIDCIcon from '../assets/svg/ic-custom-oidc.svg';
+import LdapIcon from '../assets/svg/ic-ldap.svg';
+import SamlIcon from '../assets/svg/ic-saml.svg';
 import SSOIcon from '../assets/svg/sso-settings.svg';
 
 import { AuthProvider } from '../generated/settings/settings';
@@ -167,7 +168,7 @@ export const PROVIDER_OPTIONS: ProviderOption[] = [
   {
     key: AuthProvider.CustomOidc,
     label: 'Custom-OIDC',
-    icon: CognitoIcon,
+    icon: CustomOIDCIcon,
   },
   {
     key: AuthProvider.LDAP,