diff --git a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
index 68b07e359a8e..22f5f17454cd 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
+++ b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts
@@ -279,7 +279,7 @@ describe(
       });
 
       apiPage.SelectPaneTab("Authentication");
-      agHelper.ClickButton("Save as datasource");
+      agHelper.GetNClick(locators._saveDatasource);
 
       agHelper.AssertText(
         locators._inputFieldByName("URL") + "//" + locators._inputField,
@@ -296,16 +296,14 @@ describe(
       // });
       dataSources.SaveDatasource();
       agHelper.ValidateToastMessage("datasource created");
-      agHelper.AssertElementVisibility(
-        locators._buttonByText("Edit datasource"),
-      );
+      agHelper.AssertElementVisibility(locators._saveDatasource);
       apiPage.SelectPaneTab("Body");
       dataSources.UpdateGraphqlQueryAndVariable({
         query: GRAPHQL_QUERY,
         variable: GRAPHQL_VARIABLES,
       });
       apiPage.RunAPI();
-      agHelper.ClickButton("Edit datasource");
+      agHelper.GetNClick(locators._saveDatasource);
       dataSources.AssertDataSourceInfo([
         dataManager.dsValues[
           dataManager.defaultEnviorment
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index 3152737bfa05..3db2224e7c1f 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -338,4 +338,5 @@ export class CommonLocators {
   errorPageDescription = ".t--error-page-description";
   _selectClearButton_testId = "selectbutton.btn.cancel";
   _selectClearButton_dataTestId = `[data-testid="${this._selectClearButton_testId}"]`;
+  _saveDatasource = `[data-testid='t--store-as-datasource']`;
 }
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 7de903836a11..8407a185902a 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -364,8 +364,8 @@ export const DATASOURCE_UPDATE = (dsName: string) =>
   `${dsName} datasource updated successfully`;
 export const DATASOURCE_VALID = (dsName: string) =>
   `${dsName} datasource is valid`;
-export const EDIT_DATASOURCE = () => "Edit datasource";
-export const SAVE_DATASOURCE = () => "Save as datasource";
+export const EDIT_DATASOURCE = () => "Edit";
+export const SAVE_DATASOURCE = () => "Save";
 export const SAVE_DATASOURCE_MESSAGE = () =>
   "Save the URL as a datasource to access authentication settings";
 export const EDIT_DATASOURCE_MESSAGE = () =>
diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
index 84c2f5111afb..b605ca26eb38 100644
--- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx
+++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
@@ -60,11 +60,12 @@ function StoreAsDatasource(props: storeDataSourceProps) {
   return (
     <Button
       className="t--store-as-datasource"
+      data-testid="t--store-as-datasource"
       isDisabled={!props.enable}
       kind="secondary"
       onClick={saveOrEditDatasource}
       size="md"
-      startIcon={props.shouldSave ? "cloud" : "pencil-line"}
+      startIcon={props.shouldSave ? "database-2-line" : "pencil-line"}
     >
       {props.shouldSave
         ? createMessage(SAVE_DATASOURCE)