diff --git a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
index 8aae15a62d..2ff368678c 100644
--- a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
@@ -1,5 +1,10 @@
 import React from "react";
-import { AnchorButton, IButtonProps, MaybeElement } from "@blueprintjs/core";
+import {
+  AnchorButton,
+  IButtonProps,
+  MaybeElement,
+  IconName,
+} from "@blueprintjs/core";
 import styled, { css } from "styled-components";
 import { ButtonStyle } from "widgets/ButtonWidget";
 import { Theme, darkenHover, darkenActive } from "constants/DefaultTheme";
@@ -114,6 +119,7 @@ interface ButtonContainerProps extends ComponentProps {
   disabled?: boolean;
   buttonStyle?: ButtonStyle;
   isLoading: boolean;
+  rightIcon?: IconName | MaybeElement;
 }
 
 const mapButtonStyleToStyleName = (buttonStyle?: ButtonStyle) => {
@@ -135,6 +141,7 @@ const ButtonContainer = (props: ButtonContainerProps & ButtonStyleProps) => {
     <BaseButton
       className={props.isLoading ? "bp3-skeleton" : ""}
       icon={props.icon}
+      rightIcon={props.rightIcon}
       text={props.text}
       filled={props.buttonStyle !== "SECONDARY_BUTTON"}
       accent={mapButtonStyleToStyleName(props.buttonStyle)}
diff --git a/app/client/src/components/designSystems/blueprint/CalloutComponent.tsx b/app/client/src/components/designSystems/blueprint/CalloutComponent.tsx
new file mode 100644
index 0000000000..2b245b1f7e
--- /dev/null
+++ b/app/client/src/components/designSystems/blueprint/CalloutComponent.tsx
@@ -0,0 +1,11 @@
+import styled from "styled-components";
+import { Callout } from "@blueprintjs/core";
+import { Colors } from "constants/Colors";
+
+const CalloutComponent = styled(Callout)`
+  && {
+    background-color: ${Colors.WHITE_SMOKE};
+  }
+`;
+
+export default CalloutComponent;
diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx
index 1c534bceea..a4d1fba57a 100644
--- a/app/client/src/constants/Colors.tsx
+++ b/app/client/src/constants/Colors.tsx
@@ -1,6 +1,7 @@
 // Color Names generated from http://chir.ag/projects/name-that-color
 export const Colors: Record<string, string> = {
   WHITE: "#FFFFFF",
+  WHITE_SMOKE: "#F4F4F4",
   POLAR: "#E9FAF3",
   GEYSER: "#D3DEE3",
   GEYSER_LIGHT: "#D0D7DD",
diff --git a/app/client/src/pages/Editor/APIEditor/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/Pagination.tsx
index ecf1a4e98e..c08655a50e 100644
--- a/app/client/src/pages/Editor/APIEditor/Pagination.tsx
+++ b/app/client/src/pages/Editor/APIEditor/Pagination.tsx
@@ -1,13 +1,11 @@
 import React from "react";
 import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-// import { Button } from "@blueprintjs/core";
-import Button from "components/editorComponents/Button";
 
 import styled from "constants/DefaultTheme";
 import DropdownField from "components/editorComponents/form/fields/DropdownField";
 import FormRow from "components/editorComponents/FormRow";
-import { Directions } from "utils/helpers";
-import { Callout } from "@blueprintjs/core";
+import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
+import CalloutComponent from "components/designSystems/blueprint/CalloutComponent";
 interface PaginationProps {
   onTestClick: Function;
   paginationType: PaginationType;
@@ -25,6 +23,7 @@ export enum PaginationType {
 
 const ExampleApi = styled.p`
   color: #ef7b63;
+  font-family: monospace;
 `;
 
 const StyledLabel = styled.label`
@@ -35,6 +34,22 @@ const StyledLabel = styled.label`
 const PaginationTypeView = styled.div`
   padding: 0px 6px;
 `;
+
+const StyledDynamicTextField = styled(DynamicTextField)`
+  &&&& {
+    margin-right: 5px;
+  }
+`;
+
+const TestButton = styled(BaseButton)`
+  &&& {
+    max-width: 72px;
+    margin: 0 5px;
+    min-height: 32px;
+    padding-right: 4px;
+  }
+`;
+
 export default function Pagination(props: PaginationProps) {
   return (
     <React.Fragment>
@@ -71,30 +86,27 @@ export default function Pagination(props: PaginationProps) {
       >
         <StyledLabel>Previous url</StyledLabel>
         <PaginationFieldWrapper>
-          <DynamicTextField name="actionConfiguration.prev" />
-          <Button
+          <StyledDynamicTextField name="actionConfiguration.prev" />
+          <TestButton
+            accent="secondary"
             onClick={() => {
               props.onTestClick("PREV");
             }}
             text={"Test"}
-            icon={"play"}
-            iconAlignment={Directions.RIGHT}
-            filled
-          ></Button>
+            rightIcon={"play"}
+          ></TestButton>
         </PaginationFieldWrapper>
         <StyledLabel>Next url</StyledLabel>
         <PaginationFieldWrapper>
-          <DynamicTextField name="actionConfiguration.next" />
-          <Button
+          <StyledDynamicTextField name="actionConfiguration.next" />
+          <TestButton
+            accent="secondary"
             onClick={() => {
               props.onTestClick("NEXT");
             }}
             text={"Test"}
-            icon={"play"}
-            iconAlignment={Directions.RIGHT}
-            // rightIcon={"play"}
-            filled
-          ></Button>
+            rightIcon={"play"}
+          ></TestButton>
         </PaginationFieldWrapper>
       </PaginationTypeView>
       <PaginationTypeView
@@ -102,7 +114,7 @@ export default function Pagination(props: PaginationProps) {
           props.paginationType !== PaginationType.PAGE_NO ? "display-none" : ""
         }
       >
-        <Callout>
+        <CalloutComponent>
           <p
             style={{
               marginBottom: "6px",
@@ -114,7 +126,7 @@ export default function Pagination(props: PaginationProps) {
             http://api.example.com/users?pageNo={"{{Table.pageNo}}"}
             &amp;pageSize={"{{Table.pageSize}}"}
           </ExampleApi>
-        </Callout>
+        </CalloutComponent>
       </PaginationTypeView>
     </React.Fragment>
   );