diff --git a/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js b/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
index 114649375e..597673d113 100644
--- a/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
+++ b/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
@@ -95,12 +95,12 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.get("@pricingPage").should("be.called");
       cy.wait(2000);
       cy.go(-1);
-      cy.stubPricingPage();
+      cy.stubCustomerPortalPage();
       cy.get(adminsSettings.branding).click();
       cy.url().should("contain", adminSettingsHelper.routes.BRANDING);
       cy.get(adminsSettings.brandingSubmitButton).should("be.disabled");
       cy.xpath(adminsSettings.upgrade).click();
-      cy.get("@pricingPage").should("be.called");
+      cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
       cy.go(-1);
     }
@@ -119,11 +119,14 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       });
       cy.get(adminsSettings.accessControl).click();
       cy.url().should("contain", adminSettingsHelper.routes.ACCESS_CONTROL);
-      cy.stubPricingPage();
+      cy.stubCustomerPortalPage();
       cy.xpath(adminsSettings.upgrade).click();
-      cy.get("@pricingPage").should("be.called");
+      cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
-      cy.go(-1);
+      agHelper.VisitNAssert(
+        adminSettingsHelper.routes.GENERAL,
+        "getEnvVariables",
+      );
       cy.get(adminsSettings.auditLogs).within(() => {
         cy.get(adminsSettings.businessTag)
           .should("exist")
@@ -131,11 +134,14 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       });
       cy.get(adminsSettings.auditLogs).click();
       cy.url().should("contain", adminSettingsHelper.routes.AUDIT_LOGS);
-      cy.stubPricingPage();
+      cy.stubCustomerPortalPage();
       cy.xpath(adminsSettings.upgrade).click();
-      cy.get("@pricingPage").should("be.called");
+      cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
-      cy.go(-1);
+      agHelper.VisitNAssert(
+        adminSettingsHelper.routes.GENERAL,
+        "getEnvVariables",
+      );
       cy.get(adminsSettings.provisioning).within(() => {
         cy.get(adminsSettings.enterpriseTag)
           .should("exist")
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index ce0769a313..a888f44863 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -2076,6 +2076,14 @@ Cypress.Commands.add("stubPricingPage", () => {
   });
 });
 
+Cypress.Commands.add("stubCustomerPortalPage", () => {
+  cy.window().then((win) => {
+    cy.stub(win, "open", (url) => {
+      win.location.href = "https://customer.appsmith.com?";
+    }).as("customerPortalPage");
+  });
+});
+
 /**
  * @param testID
  * @returns
diff --git a/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx b/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx
index f4d5eda917..42201f84dd 100644
--- a/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx
+++ b/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx
@@ -22,6 +22,7 @@ export function ProvisioningUpgradePage() {
     logEventData: { source: "Provisioning" },
     featureName: RampFeature.Provisioning,
     sectionName: RampSection.AdminSettings,
+    isEnterprise: true,
   });
 
   const header: Header = {
diff --git a/app/client/src/components/editorComponents/ActionNameEditor.tsx b/app/client/src/components/editorComponents/ActionNameEditor.tsx
index 6301f9980f..6339e1c797 100644
--- a/app/client/src/components/editorComponents/ActionNameEditor.tsx
+++ b/app/client/src/components/editorComponents/ActionNameEditor.tsx
@@ -9,7 +9,7 @@ import { removeSpecialChars } from "utils/helpers";
 import type { AppState } from "@appsmith/reducers";
 
 import { saveActionName } from "actions/pluginActionActions";
-import { Flex, Spinner } from "design-system";
+import { Flex } from "design-system";
 import { getAction, getPlugin } from "@appsmith/selectors/entitiesSelector";
 import NameEditorComponent, {
   IconBox,
@@ -116,7 +116,6 @@ function ActionNameEditor(props: ActionNameEditorProps) {
               updating={saveStatus.isSaving}
               valueTransform={removeSpecialChars}
             />
-            {saveStatus.isSaving && <Spinner size="md" />}
           </Flex>
         </NameWrapper>
       )}
diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx
index 7dc9b0ca43..9ca152518c 100644
--- a/app/client/src/components/editorComponents/EditableText.tsx
+++ b/app/client/src/components/editorComponents/EditableText.tsx
@@ -6,7 +6,7 @@ import {
 } from "@blueprintjs/core";
 import styled from "styled-components";
 import _ from "lodash";
-import { Button, toast, Tooltip } from "design-system";
+import { Button, Spinner, toast, Tooltip } from "design-system";
 
 export enum EditInteractionKind {
   SINGLE,
@@ -221,13 +221,8 @@ export function EditableText(props: EditableTextProps) {
     [valueTransform, isInvalid],
   );
 
-  const showEditIcon = !(
-    disabled ||
-    minimal ||
-    hideEditIcon ||
-    updating ||
-    isEditing
-  );
+  const showEditIcon = !(disabled || minimal || hideEditIcon || isEditing);
+
   return (
     <EditableTextWrapper
       isEditing={isEditing}
@@ -265,15 +260,18 @@ export function EditableText(props: EditableTextProps) {
             selectAllOnFocus
             value={value}
           />
-          {showEditIcon && (
-            <Button
-              className="t--action-name-edit-icon"
-              isIconButton
-              kind="tertiary"
-              size="md"
-              startIcon="pencil-line"
-            />
-          )}
+          {showEditIcon &&
+            (updating ? (
+              <Spinner size="md" />
+            ) : (
+              <Button
+                className="t--action-name-edit-icon"
+                isIconButton
+                kind="tertiary"
+                size="md"
+                startIcon="pencil-line"
+              />
+            ))}
         </TextContainer>
       </Tooltip>
     </EditableTextWrapper>
diff --git a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
index 2f525fc0a8..2506379e76 100644
--- a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
+++ b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
@@ -108,6 +108,7 @@ export function ActionButton({ method }: { method: AuthMethodType }) {
     logEventData: { method: method.label },
     featureName: RampFeature.Sso,
     sectionName: RampSection.AdminSettings,
+    isEnterprise: true,
   });
 
   const onClickHandler = (method: AuthMethodType) => {
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
index 2c9359cc54..a923dae07f 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
@@ -27,13 +27,13 @@ export const StyledLabel = styled.div`
   margin-bottom: 4px;
   display: flex;
   align-items: center;
+  gap: var(--ads-v2-spaces-3);
 
   .admin-settings-form-group-label {
     font-weight: var(--ads-v2-h5-font-weight);
   }
 
   .help-icon {
-    margin-left: 8px;
     cursor: pointer;
   }
 `;
@@ -66,11 +66,11 @@ export function FormGroup({ children, className, setting }: FieldHelperProps) {
             renderAs="label"
           >
             {setting.label || ""}
+            {setting.isRequired && (
+              <StyledAsterisk renderAs="span">*</StyledAsterisk>
+            )}
           </Text>
         )}
-        {setting.isRequired && (
-          <StyledAsterisk renderAs="span">*</StyledAsterisk>
-        )}
         {setting.helpText && (
           <Tooltip content={createMessage(() => setting.helpText || "")}>
             <Icon
@@ -82,14 +82,8 @@ export function FormGroup({ children, className, setting }: FieldHelperProps) {
             />
           </Tooltip>
         )}
-        <div className="ml-2">
-          {setting.isFeatureEnabled === false &&
-            (setting.isEnterprise === true ? (
-              <EnterpriseTag />
-            ) : (
-              <BusinessTag />
-            ))}
-        </div>
+        {setting.isFeatureEnabled === false &&
+          (setting.isEnterprise === true ? <EnterpriseTag /> : <BusinessTag />)}
       </StyledLabel>
       {children}
       {setting.subText && (
diff --git a/app/client/src/pages/AdminSettings/LeftPane.tsx b/app/client/src/pages/AdminSettings/LeftPane.tsx
index d73cff9491..bf5e495694 100644
--- a/app/client/src/pages/AdminSettings/LeftPane.tsx
+++ b/app/client/src/pages/AdminSettings/LeftPane.tsx
@@ -68,7 +68,7 @@ export const StyledLink = styled(Link)<{ $active: boolean }>`
 
   .ads-v2-text {
     display: flex;
-    gap: 12px;
+    gap: var(--ads-v2-spaces-3);
     align-items: center;
   }
 
diff --git a/app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx b/app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx
index 0c4a8ffd99..ea69a07e97 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/FormTitle.tsx
@@ -15,7 +15,6 @@ import {
   saveDatasourceName,
   updateDatasourceName,
 } from "actions/datasourceActions";
-import { Spinner } from "@blueprintjs/core";
 import { TEMP_DATASOURCE_ID } from "constants/Datasource";
 
 const Wrapper = styled.div`
@@ -151,7 +150,6 @@ function FormTitle(props: FormTitleProps) {
         underline
         updating={saveStatus.isSaving}
       />
-      {saveStatus.isSaving && <Spinner size={16} />}
     </Wrapper>
   );
 }
diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
index 372fbafbd2..71f0e0c9b0 100644
--- a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
@@ -16,7 +16,7 @@ import {
 import EditableText, {
   EditInteractionKind,
 } from "components/editorComponents/EditableText";
-import { Flex, Spinner } from "design-system";
+import { Flex } from "design-system";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 import NameEditorComponent, {
   IconBox,
@@ -113,7 +113,6 @@ export function JSObjectNameEditor(props: JSObjectNameEditorProps) {
               updating={saveStatus.isSaving}
               valueTransform={removeSpecialChars}
             />
-            {saveStatus.isSaving && <Spinner size="md" />}
           </Flex>
         </NameWrapper>
       )}
diff --git a/app/client/src/utils/hooks/useOnUpgrade.ts b/app/client/src/utils/hooks/useOnUpgrade.ts
index cd62f9f790..1ac5c0a8a1 100644
--- a/app/client/src/utils/hooks/useOnUpgrade.ts
+++ b/app/client/src/utils/hooks/useOnUpgrade.ts
@@ -1,6 +1,9 @@
 import { useSelector } from "react-redux";
 import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
-import { CUSTOMER_PORTAL_URL_WITH_PARAMS } from "constants/ThirdPartyConstants";
+import {
+  CUSTOMER_PORTAL_URL_WITH_PARAMS,
+  PRICING_PAGE_URL,
+} from "constants/ThirdPartyConstants";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "@appsmith/configs";
@@ -15,10 +18,12 @@ interface Props {
   logEventData?: any;
   featureName?: RampFeature;
   sectionName?: RampSection;
+  isEnterprise?: boolean;
 }
 
 const useOnUpgrade = (props: Props) => {
-  const { featureName, logEventData, logEventName, sectionName } = props;
+  const { featureName, isEnterprise, logEventData, logEventName, sectionName } =
+    props;
   const instanceId = useSelector(getInstanceId);
   const appsmithConfigs = getAppsmithConfigs();
 
@@ -27,16 +32,28 @@ const useOnUpgrade = (props: Props) => {
       logEventName || "ADMIN_SETTINGS_UPGRADE",
       logEventData,
     );
-    window.open(
-      CUSTOMER_PORTAL_URL_WITH_PARAMS(
-        appsmithConfigs.customerPortalUrl,
-        pricingPageUrlSource,
-        instanceId,
-        featureName,
-        sectionName,
-      ),
-      "_blank",
-    );
+    if (isEnterprise) {
+      window.open(
+        PRICING_PAGE_URL(
+          appsmithConfigs.pricingUrl,
+          pricingPageUrlSource,
+          instanceId,
+          featureName,
+          sectionName,
+        ),
+      );
+    } else {
+      window.open(
+        CUSTOMER_PORTAL_URL_WITH_PARAMS(
+          appsmithConfigs.customerPortalUrl,
+          pricingPageUrlSource,
+          instanceId,
+          featureName,
+          sectionName,
+        ),
+        "_blank",
+      );
+    }
   };
 
   return { onUpgrade };