Merge branch 'release'

# Conflicts: # app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js # app/client/src/components/editorComponents/Onboarding/Tooltip.tsx # app/client/src/constants/OnboardingConstants.tsx # app/client/src/pages/Editor/Welcome.tsx # app/client/src/sagas/ActionExecutionSagas.ts # app/client/src/sagas/OnboardingSagas.ts
2021-01-20 15:49:56 +05:30 · 2021-01-20 15:49:56 +05:30 · 63fb249e40
commit 63fb249e40
parent 09c4e4fc49 ddad022fff
389 changed files with 8578 additions and 4251 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -216,7 +216,79 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "nidhi-nair",
+      "name": "Nidhi",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5298848?v=4",
+      "profile": "https://github.com/nidhi-nair",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jsartisan",
+      "name": "Pawan Kumar",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/6636360?v=4",
+      "profile": "https://github.com/jsartisan",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sumitsum",
+      "name": "Sumit Kumar",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1757421?v=4",
+      "profile": "https://github.com/sumitsum",
+      "contributions": [
+        "code"
+      ]
    }
+    {
+      "login": "rishabhsaxena",
+      "name": "Rishabh Saxena ",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1944800?v=4",
+      "profile": "https://github.com/rishabhsaxena",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ofpiyush",
+      "name": "Piyush Mishra",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/292174?v=4",
+      "profile": "https://github.com/ofpiyush",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "akash-codemonk",
+      "name": "akash-codemonk",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/67054171?v=4",
+      "profile": "https://github.com/akash-codemonk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vicky-primathon",
+      "name": "vicky-primathon",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/67091118?v=4",
+      "profile": "https://github.com/vicky-primathon",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "devrk96",
+      "name": "devrk96",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/68607686?v=4",
+      "profile": "https://github.com/devrk96",
+      "contributions": [
+        "code"
+      ]
+    },
  ],
  "contributorsPerLine": 7,
  "projectName": "appsmith",
--- a/.github/config.json
+++ b/.github/config.json
@ -215,11 +215,21 @@
      "color": "e8b851",
      "description": "Needs attention from maintainers to triage"
    },
+    "New Widget": {
+      "name": "New Widget",
+      "color": "693BA1",
+      "description": "Issues related to new widgets"
+    },
    "Omnibar": {
      "name": "Omnibar",
      "color": "10b5ce",
      "description": ""
    },
+    "Onboarding": {
+      "name": "Onboarding",
+      "color": "079829",
+      "description": ""
+    },
    "Pages": {
      "name": "Pages",
      "color": "dee258",
@ -305,10 +315,15 @@
      "color": "d130d1",
      "description": ""
    },
+    "UI Building Pod": {
+      "name": "UI Building Pod",
+      "color": "e2ffb2",
+      "description": "Issues picked up by the UI building pod"
+    },
    "UI Building": {
      "name": "UI Building",
-      "color": "e2ffb2",
-      "description": ""
+      "color": "006b75",
+      "description": "Issues related to the building UI on the canvas"
    },
    "UI Improvement": {
      "name": "UI Improvement",
@ -400,10 +415,15 @@
      "color": "e053d6",
      "description": "API configuration section"
    },
+    "Actions Pod": {
+      "name": "Actions Pod",
+      "color": "61ed84",
+      "description": "Issues picked up by the actions pod"
+    },
    "Actions": {
      "name": "Actions",
-      "color": "61ed84",
-      "description": "Issues related to API / Query execution"
+      "color": "c5def5",
+      "description": "Issues related to API / Query / JS execution"
    },
    "Datasources": {
      "name": "Datasources",
@ -436,7 +456,7 @@
      "prereleaseName": "alpha",
      "issue": {
        "labels": {
-          "Actions": {
+          "Actions Pod": {
            "requires": 1,
            "conditions": [
              {
@ -463,6 +483,11 @@
                "type": "hasLabel",
                "label": "Auto Complete",
                "value": true
+              },
+              {
+                "type": "hasLabel",
+                "label": "Actions",
+                "value": true
              }
            ]
          },
@ -559,6 +584,11 @@
                "type": "hasLabel",
                "value": true
              },
+              {
+                "label": "New Widget",
+                "type": "hasLabel",
+                "value": true
+              },
              {
                "label": "Widgets",
                "type": "hasLabel",
@ -566,7 +596,7 @@
              }
            ]
          },
-          "UI Building": {
+          "UI Building Pod": {
            "requires": 1,
            "conditions": [
              {
@ -583,6 +613,11 @@
                "type": "hasLabel",
                "label": "Property Pane",
                "value": true
+              },
+              {
+                "type": "hasLabel",
+                "label": "UI Building",
+                "value": true
              }
            ]
          },
@ -638,6 +673,16 @@
                "type": "hasLabel",
                "label": "Telemetry",
                "value": true
+              },
+              {
+                "type": "hasLabel",
+                "label": "Editor",
+                "value": true
+              },
+              {
+                "type": "hasLabel",
+                "label": "Onboarding",
+                "value": true
              }
            ]
          }
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@ -1,12 +1,16 @@
 name: Appsmith Client Workflow

 on:
+  # This line enables manual triggering of this workflow.
+  workflow_dispatch:
+
  push:
    branches: [release, master]
    # Only trigger if files have changed in this specific path
    paths:
      - 'app/client/**'
      - '!app/client/cypress/manual_TestSuite/**'
+
  pull_request_target:
    branches: [release, master]
    paths:
@ -29,14 +33,17 @@ jobs:
    steps:
      # Checkout the code
      - name: Checkout the merged commit from PR and base branch
-        if: ${{ github.event_name == 'pull_request_target' }}
+        if: github.event_name == 'pull_request_target'
        uses: actions/checkout@v2
        with:
+          fetch-depth: 0
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - name: Checkout the head commit of the branch
-        if: ${{ github.event_name == 'push' }}
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Figure out the PR number
        run: echo ${{ github.event.pull_request.number }}
@ -75,6 +82,13 @@ jobs:
          if [[ "${{github.ref}}" == "refs/heads/release" ]]; then
              echo "::set-output name=REACT_APP_ENVIRONMENT::STAGING"
          fi
+          # Since this is an unreleased build, we set the version to incremented version number with
+          # a `-SNAPSHOT` suffix.
+          latest_released_version="$(git tag --list 'v*' --sort=-version:refname | head -1)"
+          echo "latest_released_version = $latest_released_version"
+          next_version="$(echo "$latest_released_version" | awk -F. -v OFS=. '{ $NF++; print }')"
+          echo "next_version = $next_version"
+          echo ::set-output name=version::$next_version-SNAPSHOT

      - name: Run the jest tests
        run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
@ -82,7 +96,13 @@ jobs:
      # We burn React environment & the Segment analytics key into the build itself.
      # This is to ensure that we don't need to configure it in each installation
      - name: Create the bundle
-        run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} yarn build
+        run: |
+          REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} \
+            REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} \
+            REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \
+            REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
+            REACT_APP_VERSION_RELEASE_DATE=$(date +%Y-%m-%d) \
+            yarn build

      # Upload the build artifact so that it can be used by the test & deploy job in the workflow
      - name: Upload react build bundle
@ -121,13 +141,13 @@ jobs:
    steps:
      # Checkout the code
      - name: Checkout the merged commit from PR and base branch
-        if: ${{ github.event_name == 'pull_request_target' }}
+        if: github.event_name == 'pull_request_target'
        uses: actions/checkout@v2
        with:
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - name: Checkout the head commit of the branch
-        if: ${{ github.event_name == 'push' }}
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
        uses: actions/checkout@v2

      - name: Use Node.js 10.16.3
@ -150,7 +170,6 @@ jobs:
            ${{ runner.OS }}-node-
            ${{ runner.OS }}-

-
      # Install all the dependencies
      - name: Install dependencies
        run: yarn install
@ -168,12 +187,15 @@ jobs:
          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin

          docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
-          --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
-          --env APPSMITH_REDIS_URL=redis://localhost:6379 \
-          --env APPSMITH_ENCRYPTION_PASSWORD=password \
-          --env APPSMITH_ENCRYPTION_SALT=salt \
-          --env APPSMITH_IS_SELF_HOSTED=false \
-          appsmith/appsmith-server:release
+            --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
+            --env APPSMITH_REDIS_URL=redis://localhost:6379 \
+            --env APPSMITH_ENCRYPTION_PASSWORD=password \
+            --env APPSMITH_ENCRYPTION_SALT=salt \
+            --env APPSMITH_IS_SELF_HOSTED=false \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
+            --env APPSMITH_CLOUD_SERVICES_USERNAME= \
+            --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:release

      - name: Pull master server docker container and start it locally
        if: github.ref == 'refs/heads/master'
@ -182,12 +204,15 @@ jobs:
          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin

          docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
-          --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
-          --env APPSMITH_REDIS_URL=redis://localhost:6379 \
-          --env APPSMITH_ENCRYPTION_PASSWORD=password \
-          --env APPSMITH_ENCRYPTION_SALT=salt \
-          --env APPSMITH_IS_SELF_HOSTED=false \
-          appsmith/appsmith-server:nightly
+            --env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
+            --env APPSMITH_REDIS_URL=redis://localhost:6379 \
+            --env APPSMITH_ENCRYPTION_PASSWORD=password \
+            --env APPSMITH_ENCRYPTION_SALT=salt \
+            --env APPSMITH_IS_SELF_HOSTED=false \
+            --env APPSMITH_CLOUD_SERVICES_BASE_URL= \
+            --env APPSMITH_CLOUD_SERVICES_USERNAME= \
+            --env APPSMITH_CLOUD_SERVICES_PASSWORD= \
+            ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly

      - name: Installing Yarn serve
        run: |
@ -259,13 +284,13 @@ jobs:
    steps:
      # Checkout the code
      - name: Checkout the merged commit from PR and base branch
-        if: ${{ github.event_name == 'pull_request_target' }}
+        if: github.event_name == 'pull_request_target'
        uses: actions/checkout@v2
        with:
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

      - name: Checkout the head commit of the branch
-        if: ${{ github.event_name == 'push' }}
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
        uses: actions/checkout@v2

      - name: Download the react build artifact
@ -282,17 +307,17 @@ jobs:

      # Build release Docker image and push to Docker Hub
      - name: Push release image to Docker Hub
-        if: success() && github.ref == 'refs/heads/release' && github.event_name == 'push'
+        if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
        run: |
-          docker build -t appsmith/appsmith-editor:${{steps.branch_name.outputs.tag}} .
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.branch_name.outputs.tag}} .
          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push appsmith/appsmith-editor
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor

      # Build master Docker image and push to Docker Hub
      - name: Push production image to Docker Hub with commit tag
-        if: success() && github.ref == 'refs/heads/master' && github.event_name == 'push'
+        if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
        run: |
-          docker build -t appsmith/appsmith-editor:${GITHUB_SHA} .
-          docker build -t appsmith/appsmith-editor:nightly .
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} .
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly .
          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push appsmith/appsmith-editor
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@ -1,14 +1,53 @@
 name: Appsmith Github Release Workflow

+# This workflow builds Docker images for server and client, and then pushes them to Docher Hub.
+# The docker-tag with which this push happens in the release tag (e.g., v1.2.3 etc.).
+# In addition to the above tag, unless the git-tag matches `*beta*`, we also push to the `latest` docker-tag.
+# This workflow does NOT run tests.
+# This workflow is automatically triggered when a relese is created on GitHub.
+
 on:
-  push:
-    # Only trigger if a tag has been created and pushed to this branch
-    tags:
-      - v*
+  # Ref: <https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#release>.
+  release:
+    types:
+      # Unlike the `released` event, the `published` event triggers for pre-releases as well.
+      - released

 jobs:
-  build-client:
+  prelude:
    runs-on: ubuntu-latest
+
+    outputs:
+      tag: ${{ steps.get_version.outputs.tag }}
+      version: ${{ steps.get_version.outputs.version }}
+      is_beta: ${{ steps.get_version.outputs.is_beta }}
+
+    steps:
+      - name: Environment details
+        run: |
+          echo "PWD: $PWD"
+          echo "GITHUB_REF: $GITHUB_REF"
+          echo "GITHUB_SHA: $GITHUB_SHA"
+          echo "GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME"
+
+      - name: Get the version
+        id: get_version
+        run: |
+          tag="${GITHUB_REF#refs/tags/}"
+          echo "::set-output name=version::${tag#v}"
+          echo "::set-output name=tag::$tag"
+          if [[ $tag == *"beta"* ]]; then
+            echo "::set-output name=is_beta::true"
+          else
+            echo "::set-output name=is_beta::false"
+          fi
+
+  build-client:
+    needs:
+      - prelude
+
+    runs-on: ubuntu-latest
+
    defaults:
      run:
        working-directory: app/client
@ -39,41 +78,40 @@ jobs:
      - name: Install dependencies
        run: yarn install

-      - name: Set the build environment based on the branch
-        id: vars
-        run: |
-          REACT_APP_ENVIRONMENT="PRODUCTION"
-          echo ::set-output name=REACT_APP_ENVIRONMENT::${REACT_APP_ENVIRONMENT}
-
      - name: Create the bundle
-        run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} yarn build
-
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+        env:
+          REACT_APP_ENVIRONMENT: 'PRODUCTION'
+          REACT_APP_FUSIONCHARTS_LICENSE_KEY: '${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }}'
+          REACT_APP_SEGMENT_CE_KEY: '${{ secrets.APPSMITH_SEGMENT_CE_KEY }}'
+          REACT_APP_VERSION_ID: '${{ needs.prelude.outputs.version }}'
+        run: 'REACT_APP_VERSION_RELEASE_DATE="$(date +%Y-%m-%d)" yarn build'

      # Build Docker image and push to Docker Hub
      - name: Push production image to Docker Hub with commit tag
        run: |
-          docker build -t appsmith/appsmith-editor:${{steps.get_version.outputs.tag}}  .
+          docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{needs.prelude.outputs.tag}} .

          # Only build & tag with latest if the tag doesn't contain beta
-          if [[ ! ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then 
-            docker build -t appsmith/appsmith-editor:latest  .
+          if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then
+            docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:latest .
          fi

          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push appsmith/appsmith-editor
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor

  build-server:
+    needs:
+      - prelude
+
    runs-on: ubuntu-latest
+
    defaults:
      run:
        working-directory: app/server

    steps:
-      # Checkout the code
-      - uses: actions/checkout@v2
+      - name: Checkout the code
+        uses: actions/checkout@v2

      # Setup Java
      - name: Set up JDK 1.11
@ -94,55 +132,22 @@ jobs:

      # Build the code
      - name: Build without running any tests
-        run: mvn -B package -DskipTests
-
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+        run: |
+          mvn --batch-mode versions:set \
+            -DnewVersion=${{ needs.prelude.outputs.version }} \
+            -DgenerateBackupPoms=false \
+            -DprocessAllModules=true
+          mvn --batch-mode package -DskipTests

      # Build Docker image and push to Docker Hub
      - name: Push image to Docker Hub
        run: |
-          docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${{steps.get_version.outputs.tag}} .
+          docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{needs.prelude.outputs.tag}} .

          # Only build & tag with latest if the tag doesn't contain beta
-          if [[ ! ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then 
-            docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:latest .
+          if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then
+            docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:latest .
          fi

          echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          docker push appsmith/appsmith-server
-
-  create-release:
-    needs:
-      - build-server
-      - build-client
-    runs-on: ubuntu-latest
-
-    steps:
-      # Creating the release on Github
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-
-      # If the tag has the string "beta", then mark the Github release as a pre-release
-      - name: Get the version
-        id: get_prerelease
-        run: |
-          STATUS=false
-          if [[ ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then 
-            STATUS=true
-          fi
-
-          echo ::set-output name=status::${STATUS}
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: ${{steps.get_prerelease.outputs.status}}
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@ -2,15 +2,20 @@
 name: Appsmith Server Workflow

 on:
+  # This line enables manual triggering of this workflow.
+  workflow_dispatch:
+
  push:
    branches: [ release, master ]
    # Only trigger if files have changed in this specific path
    paths:
      - 'app/server/**'
+
  pull_request:
    branches: [ release, master ]
    paths:
      - 'app/server/**'
+
 # Change the working directory for all the jobs in this workflow
 defaults:
  run:
@ -33,6 +38,8 @@ jobs:
    steps:
    # Checkout the code
    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0

    # Setup Java
    - name: Set up JDK 1.11
@ -51,6 +58,22 @@ jobs:
        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
        restore-keys: ${{ runner.os }}-m2

+    # Here, the GITHUB_REF is of type /refs/head/<branch_name>. We extract branch_name from this by removing the
+    # first 11 characters. This can be used to build images for several branches
+    # Since this is an unreleased build, we get the latest released version number, increment the minor number in it,
+    # append a `-SNAPSHOT` at it's end to prepare the snapshot version number. This is used as the project's version.
+    - name: Get the version to tag the Docker image
+      id: vars
+      run: |
+        # Since this is an unreleased build, we set the version to incremented version number with a
+        # `-SNAPSHOT` suffix.
+        latest_released_version="$(git tag --list 'v*' --sort=-version:refname | head -1)"
+        echo "latest_released_version = $latest_released_version"
+        next_version="$(echo "$latest_released_version" | awk -F. -v OFS=. '{ $NF++; print }')"
+        echo "next_version = $next_version"
+        echo ::set-output name=version::$next_version-SNAPSHOT
+        echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+
    # Build and test the code
    - name: Build and test
      env:
@ -59,37 +82,36 @@ jobs:
        APPSMITH_ENCRYPTION_PASSWORD: "password"
        APPSMITH_ENCRYPTION_SALT: "salt"
        APPSMITH_IS_SELF_HOSTED: false
-      run: mvn -B package
-
-    # Here, the GITHUB_REF is of type /refs/head/<branch_name>. We extract branch_name from this by removing the
-    # first 11 characters. This can be used to build images for several branches
-    - name: Get the version to tag the Docker image
-      id: vars
-      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+      run: |
+        mvn --batch-mode versions:set \
+          -DnewVersion=${{ steps.vars.outputs.version }} \
+          -DgenerateBackupPoms=false \
+          -DprocessAllModules=true
+        mvn --batch-mode package

    # Build release Docker image and push to Docker Hub
    - name: Push release image to Docker Hub
      if: success() && github.ref == 'refs/heads/release'
      run: |
-        docker build  --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${{steps.vars.outputs.tag}} .
+        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} .
        echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-        # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful 
+        # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful
        # with this command
-        docker push appsmith/appsmith-server
+        docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server

    # Build master Docker image and push to Docker Hub
    - name: Push master image to Docker Hub with commit tag
      if: success() && github.ref == 'refs/heads/master'
      run: |
-        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:${GITHUB_SHA} .
-        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t appsmith/appsmith-server:nightly .
+        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA} .
+        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly .
        echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-        # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful 
+        # This command pushes all the tags on the machine to Docker hub. This has been written for ease of reading. Be very careful
        # with this command
-        docker push appsmith/appsmith-server
-  
-  # These are dummy jobs in the CI build to satisfy required status checks for merging PRs. This is a hack because Github doesn't support conditional 
-  # required checks in monorepos. These jobs are a clone of similarly named jobs in client.yml. 
+        docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server
+
+  # These are dummy jobs in the CI build to satisfy required status checks for merging PRs. This is a hack because Github doesn't support conditional
+  # required checks in monorepos. These jobs are a clone of similarly named jobs in client.yml.
  #
  # Check support request at: https://github.community/t/feature-request-conditional-required-checks/16761
  ui-test:
@ -98,25 +120,25 @@ jobs:
      fail-fast: false
      matrix:
        job: [0, 1, 2, 3, 4, 5, 6]
-    
+
    steps:
    # Checkout the code
    - uses: actions/checkout@v2
-    
+
    - name: Do nothing as this is a dummy step
      shell: bash
      run: |
        exit 0
-  
+
  package:
    runs-on: ubuntu-latest

    steps:
    # Checkout the code
    - uses: actions/checkout@v2
-    
+
    - name: Do nothing as this is a dummy step
      shell: bash
      run: |
        exit 0
-          
+
--- a/.github/workflows/sync-community-repo.yml
+++ b/.github/workflows/sync-community-repo.yml
@ -2,13 +2,14 @@
 name: Sync Community workflow

 on:
+  workflow_dispatch:
  schedule:
-  - cron:  "0 * * * *"
+  - cron: "0 * * * *"

 jobs:
  repo-sync:
    runs-on: ubuntu-latest
-    
+
    steps:
    - uses: actions/checkout@v2
      with:
--- a/README.md
+++ b/README.md
@ -23,7 +23,7 @@ Appsmith is a JavaScript-based visual development platform to build and launch i

 **UI Components**: Table, Chart, Form, Map, Image, Video, and many more.<br/>
 **API Support**: REST APIs<br/>
-**Database Support**: PostgreSQL, MongoDB, MySQL, Redshift, Elastic Search, DynamoDB, Redis, and MSFT SQL Server<br/>
+**Database Support**: PostgreSQL, MongoDB, MySQL, Firestore, Redshift, Elastic Search, DynamoDB, Redis, and MSFT SQL Server<br/>
 **Hosting**: Cloud-hosted & On-premise

 Already familiar with Appsmith? [Quickly start building on your own](#%EF%B8%8F-quickstart).
@ -101,37 +101,48 @@ The Appsmith platform is available under the [Apache License 2.0](https://www.ap
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="http://arpitmohan.com"><img src="https://avatars2.githubusercontent.com/u/458946?v=4" width="100px;" alt=""/><br /><sub><b>Arpit Mohan</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=mohanarpit" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Nikhil-Nandagopal"><img src="https://avatars2.githubusercontent.com/u/3897254?v=4" width="100px;" alt=""/><br /><sub><b>Nikhil Nandagopal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=Nikhil-Nandagopal" title="Documentation">📖</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=Nikhil-Nandagopal" title="Code">💻</a> <a href="#projectManagement-Nikhil-Nandagopal" title="Project Management">📆</a></td>
-    <td align="center"><a href="https://github.com/areyabhishek"><img src="https://avatars1.githubusercontent.com/u/30255708?v=4" width="100px;" alt=""/><br /><sub><b>areyabhishek</b></sub></a><br /><a href="#ideas-areyabhishek" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-areyabhishek" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/trishaanand"><img src="https://avatars2.githubusercontent.com/u/8403079?v=4" width="100px;" alt=""/><br /><sub><b>Trisha Anand</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=trishaanand" title="Code">💻</a> <a href="#infra-trishaanand" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-trishaanand" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/hetunandu"><img src="https://avatars2.githubusercontent.com/u/12022471?v=4" width="100px;" alt=""/><br /><sub><b>Hetu Nandu</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=hetunandu" title="Code">💻</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=hetunandu" title="Tests">⚠️</a> <a href="#ideas-hetunandu" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/riodeuno"><img src="https://avatars1.githubusercontent.com/u/103687?v=4" width="100px;" alt=""/><br /><sub><b>Abhinav Jha</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=riodeuno" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/satbir121"><img src="https://avatars3.githubusercontent.com/u/39981226?v=4" width="100px;" alt=""/><br /><sub><b>satbir121</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=satbir121" title="Code">💻</a> <a href="#ideas-satbir121" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="http://arpitmohan.com"><img src="https://avatars2.githubusercontent.com/u/458946?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Arpit Mohan</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=mohanarpit" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Nikhil-Nandagopal"><img src="https://avatars2.githubusercontent.com/u/3897254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikhil Nandagopal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=Nikhil-Nandagopal" title="Documentation">📖</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=Nikhil-Nandagopal" title="Code">💻</a> <a href="#projectManagement-Nikhil-Nandagopal" title="Project Management">📆</a></td>
+    <td align="center"><a href="https://github.com/areyabhishek"><img src="https://avatars1.githubusercontent.com/u/30255708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>areyabhishek</b></sub></a><br /><a href="#ideas-areyabhishek" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-areyabhishek" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/trishaanand"><img src="https://avatars2.githubusercontent.com/u/8403079?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Trisha Anand</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=trishaanand" title="Code">💻</a> <a href="#infra-trishaanand" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-trishaanand" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/hetunandu"><img src="https://avatars2.githubusercontent.com/u/12022471?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hetu Nandu</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=hetunandu" title="Code">💻</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=hetunandu" title="Tests">⚠️</a> <a href="#ideas-hetunandu" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/riodeuno"><img src="https://avatars1.githubusercontent.com/u/103687?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abhinav Jha</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=riodeuno" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/satbir121"><img src="https://avatars3.githubusercontent.com/u/39981226?v=4?s=100" width="100px;" alt=""/><br /><sub><b>satbir121</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=satbir121" title="Code">💻</a> <a href="#ideas-satbir121" title="Ideas, Planning, & Feedback">🤔</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://sharats.me"><img src="https://avatars3.githubusercontent.com/u/120119?v=4" width="100px;" alt=""/><br /><sub><b>Shrikant Sharat Kandula</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=sharat87" title="Code">💻</a> <a href="#plugin-sharat87" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="https://github.com/aakashDesign"><img src="https://avatars2.githubusercontent.com/u/65771350?v=4" width="100px;" alt=""/><br /><sub><b>Aakash Shrivastava</b></sub></a><br /><a href="#design-aakashDesign" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/Debsourabh"><img src="https://avatars2.githubusercontent.com/u/34486435?v=4" width="100px;" alt=""/><br /><sub><b>Debsourabh Ghosh</b></sub></a><br /><a href="#design-Debsourabh" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/NandanAnantharamu"><img src="https://avatars1.githubusercontent.com/u/67676905?v=4" width="100px;" alt=""/><br /><sub><b>NandanAnantharamu</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=NandanAnantharamu" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://github.com/prapullac"><img src="https://avatars3.githubusercontent.com/u/71753653?v=4" width="100px;" alt=""/><br /><sub><b>prapullac</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aprapullac" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=prapullac" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://github.com/Saket2"><img src="https://avatars0.githubusercontent.com/u/49346036?v=4" width="100px;" alt=""/><br /><sub><b>Saket Agrawal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3ASaket2" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=Saket2" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://harishkotra.me"><img src="https://avatars1.githubusercontent.com/u/4999463?v=4" width="100px;" alt=""/><br /><sub><b>Harish Kotra</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aharishkotra" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://sharats.me"><img src="https://avatars3.githubusercontent.com/u/120119?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shrikant Sharat Kandula</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=sharat87" title="Code">💻</a> <a href="#plugin-sharat87" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="https://github.com/aakashDesign"><img src="https://avatars2.githubusercontent.com/u/65771350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aakash Shrivastava</b></sub></a><br /><a href="#design-aakashDesign" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Debsourabh"><img src="https://avatars2.githubusercontent.com/u/34486435?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Debsourabh Ghosh</b></sub></a><br /><a href="#design-Debsourabh" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/NandanAnantharamu"><img src="https://avatars1.githubusercontent.com/u/67676905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>NandanAnantharamu</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=NandanAnantharamu" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/prapullac"><img src="https://avatars3.githubusercontent.com/u/71753653?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prapullac</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aprapullac" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=prapullac" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Saket2"><img src="https://avatars0.githubusercontent.com/u/49346036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saket Agrawal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3ASaket2" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=Saket2" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://harishkotra.me"><img src="https://avatars1.githubusercontent.com/u/4999463?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Harish Kotra</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aharishkotra" title="Bug reports">🐛</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/visibleajay"><img src="https://avatars0.githubusercontent.com/u/13945951?v=4" width="100px;" alt=""/><br /><sub><b>Ajay Kumar</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Avisibleajay" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=visibleajay" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/akbansa"><img src="https://avatars0.githubusercontent.com/u/13042781?v=4" width="100px;" alt=""/><br /><sub><b>Anshul Bansal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aakbansa" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=akbansa" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/gogetter22"><img src="https://avatars3.githubusercontent.com/u/71608910?v=4" width="100px;" alt=""/><br /><sub><b>Navia Garg</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Agogetter22" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Xniveres"><img src="https://avatars0.githubusercontent.com/u/56609232?v=4" width="100px;" alt=""/><br /><sub><b>Xniveres</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3AXniveres" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/daniel-shuy"><img src="https://avatars1.githubusercontent.com/u/17351764?v=4" width="100px;" alt=""/><br /><sub><b>Daniel Shuy</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=daniel-shuy" title="Code">💻</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=daniel-shuy" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://prashantchaubey.com"><img src="https://avatars3.githubusercontent.com/u/14848874?v=4" width="100px;" alt=""/><br /><sub><b>Prashant Chaubey</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=pc9795" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/A-Scratchy"><img src="https://avatars0.githubusercontent.com/u/25309929?v=4" width="100px;" alt=""/><br /><sub><b>Adam</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=A-Scratchy" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/visibleajay"><img src="https://avatars0.githubusercontent.com/u/13945951?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ajay Kumar</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Avisibleajay" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=visibleajay" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/akbansa"><img src="https://avatars0.githubusercontent.com/u/13042781?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anshul Bansal</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Aakbansa" title="Bug reports">🐛</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=akbansa" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/gogetter22"><img src="https://avatars3.githubusercontent.com/u/71608910?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Navia Garg</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3Agogetter22" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/Xniveres"><img src="https://avatars0.githubusercontent.com/u/56609232?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Xniveres</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/issues?q=author%3AXniveres" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/daniel-shuy"><img src="https://avatars1.githubusercontent.com/u/17351764?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Shuy</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=daniel-shuy" title="Code">💻</a> <a href="https://github.com/appsmithorg/appsmith/commits?author=daniel-shuy" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://prashantchaubey.com"><img src="https://avatars3.githubusercontent.com/u/14848874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prashant Chaubey</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=pc9795" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/A-Scratchy"><img src="https://avatars0.githubusercontent.com/u/25309929?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=A-Scratchy" title="Code">💻</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/sumanthyedoti"><img src="https://avatars3.githubusercontent.com/u/30371888?v=4" width="100px;" alt=""/><br /><sub><b>Sumanth Yedoti</b></sub></a><br /> <a href="https://github.com/appsmithorg/appsmith/commits?author=sumanthyedoti" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/sumanthyedoti"><img src="https://avatars3.githubusercontent.com/u/30371888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sumanth Yedoti</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=sumanthyedoti" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/nidhi-nair"><img src="https://avatars2.githubusercontent.com/u/5298848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nidhi</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=nidhi-nair" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jsartisan"><img src="https://avatars1.githubusercontent.com/u/6636360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pawan Kumar</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=jsartisan" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/sumitsum"><img src="https://avatars0.githubusercontent.com/u/1757421?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sumit Kumar</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=sumitsum" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/rishabhsaxena"><img src="https://avatars0.githubusercontent.com/u/1944800?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabh Saxena </b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=rishabhsaxena" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ofpiyush"><img src="https://avatars0.githubusercontent.com/u/292174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piyush Mishra</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=ofpiyush" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/akash-codemonk"><img src="https://avatars2.githubusercontent.com/u/67054171?v=4?s=100" width="100px;" alt=""/><br /><sub><b>akash-codemonk</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=akash-codemonk" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/vicky-primathon"><img src="https://avatars2.githubusercontent.com/u/67091118?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vicky-primathon</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=vicky-primathon" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/devrk96"><img src="https://avatars0.githubusercontent.com/u/68607686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>devrk96</b></sub></a><br /><a href="https://github.com/appsmithorg/appsmith/commits?author=devrk96" title="Code">💻</a></td>
  </tr>
 </table>

-<!-- markdownlint-enable -->
+<!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
--- a/app/client/.eslintrc.json
+++ b/app/client/.eslintrc.json
@ -26,18 +26,21 @@
    "import/no-webpack-loader-syntax": 0,
    "no-undef": 0,
    "react/prop-types": 0,
-    "@typescript-eslint/explicit-module-boundary-types": 0
+    "@typescript-eslint/explicit-module-boundary-types": 0,
+    "cypress/no-unnecessary-waiting": 0,
+    "cypress/no-assigning-return-values": 0
  },
  "settings": {
    "react": {
      "pragma": "React",
      // Tells eslint-plugin-react to automatically detect the version of React to use
-      "version": "detect" 
+      "version": "detect"
    }
  },
  "env": {
    "browser": true,
    "node": true,
-    "cypress/globals": true
+    "cypress/globals": true,
+    "worker": true
  }
 }
--- a/app/client/README.md
+++ b/app/client/README.md
@ -7,4 +7,3 @@
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

 For details on setting up your development machine, please refer to the [Setup Guide](https://github.com/appsmithorg/appsmith/blob/release/contributions/ClientSetup.md)
-
--- a/app/client/craco.build.config.js
+++ b/app/client/craco.build.config.js
@ -18,16 +18,25 @@ plugins.push(
 );

 if (env === "PRODUCTION" || env === "STAGING") {
-  plugins.push(
-    new SentryWebpackPlugin({
-      include: "build",
-      ignore: ["node_modules", "webpack.config.js"],
-      release: process.env.REACT_APP_SENTRY_RELEASE,
-      deploy: {
-        env: process.env.REACT_APP_SENTRY_ENVIRONMENT
-      }
-    })
-  );
+  if (
+    process.env.SENTRY_AUTH_TOKEN != null &&
+    process.env.SENTRY_AUTH_TOKEN !== ""
+  ) {
+    plugins.push(
+      new SentryWebpackPlugin({
+        include: "build",
+        ignore: ["node_modules", "webpack.config.js"],
+        release: process.env.REACT_APP_SENTRY_RELEASE,
+        deploy: {
+          env: process.env.REACT_APP_SENTRY_ENVIRONMENT
+        }
+      })
+    );
+  } else {
+    console.log(
+      "Sentry configuration missing in process environment. Sentry will be disabled.",
+    );
+  }
 }

 module.exports = merge(common, {
--- a/app/client/cypress/fixtures/appsmithlogo.png
+++ b/app/client/cypress/fixtures/appsmithlogo.png
--- a/app/client/cypress/fixtures/datasources.json
+++ b/app/client/cypress/fixtures/datasources.json
@ -1,9 +1,9 @@
 {
-    "mongo-host": "ds119422.mlab.com",
+    "mongo-host": "cypress-test.zljea.mongodb.net",
    "mongo-port": 19422,
-    "mongo-databaseName": "heroku_bcmprc4k",
-    "mongo-username": "akash",
-    "mongo-password": "123wheel",
+    "mongo-databaseName": "admin",
+    "mongo-username": "cypress-test",
+    "mongo-password": "RaopEmky505xYV4p",
    "mongo-authenticationAuthtype": "SCRAM-SHA-1",
    "mongo-sslAuthtype": "No SSL",
    "postgres-host": "postgres-test-db.cz8diybf9wdj.ap-south-1.rds.amazonaws.com",
@ -11,5 +11,7 @@
    "postgres-databaseName": "fakeapi",
    "postgres-username": "postgres",
    "postgres-password": "Appsmith2019#",
-    "restapi-url": "https://my-json-server.typicode.com/typicode/demo/posts"
+    "restapi-url": "https://my-json-server.typicode.com/typicode/demo/posts",
+    "mongo-defaultDatabaseName": "sample_airbnb",
+    "connection-type": "Replica set"
 }
--- a/app/client/cypress/fixtures/formdsl1.json
+++ b/app/client/cypress/fixtures/formdsl1.json
@ -91,7 +91,7 @@
                      },
                      {
                        "isVisible": true,
-                        "defaultText": "This is the initial <b>content</b> of the editor",
+                        "defaultText": "",
                        "isDisabled": false,
                        "widgetName": "RichTextEditor1",
                        "isDefaultClickDisabled": true,
--- a/app/client/cypress/fixtures/newFormDsl.json
+++ b/app/client/cypress/fixtures/newFormDsl.json
@ -126,14 +126,12 @@
                  "label": "",
                  "options": [
                    {
-                      "id": "1",
-                      "label": "Male",
-                      "value": "M"
+                      "label":"Male",
+                      "value":"M"
                    },
                    {
-                      "id": "2",
-                      "label": "Female",
-                      "value": "F"
+                      "label":"Female",
+                      "value":"F"
                    }
                  ],
                  "defaultOptionValue": "1",
--- a/app/client/cypress/fixtures/testFile.mov
+++ b/app/client/cypress/fixtures/testFile.mov
--- a/app/client/cypress/fixtures/testdata.json
+++ b/app/client/cypress/fixtures/testdata.json
@ -87,90 +87,6 @@
      "userName": "Tobias Funke",
      "productName": "Beef steak",
      "orderAmount": 19.99
-    },
-    {
-      "id": 7434532,
-      "email": "byron.fields@reqres.in",
-      "userName": "Byron Fields",
-      "productName": "Chicken Sandwich",
-      "orderAmount": 4.99
-    },
-    {
-      "id": 7434532,
-      "email": "ryan.holmes@reqres.in",
-      "userName": "Ryan Holmes",
-      "productName": "Avocado Panini",
-      "orderAmount": 7.99
-    },
-    {
-      "id": 2381224,
-      "email": "michael.lawson@reqres.in",
-      "userName": "Michael Lawson",
-      "productName": "Chicken Sandwich",
-      "orderAmount": 4.99
-    },
-    {
-      "id": 2736212,
-      "email": "lindsay.ferguson@reqres.in",
-      "userName": "Lindsay Ferguson",
-      "productName": "Tuna Salad",
-      "orderAmount": 9.99
-    },
-    {
-      "id": 6788734,
-      "email": "tobias.funke@reqres.in",
-      "userName": "Tobias Funke",
-      "productName": "Beef steak",
-      "orderAmount": 19.99
-    },
-    {
-      "id": 7434532,
-      "email": "byron.fields@reqres.in",
-      "userName": "Byron Fields",
-      "productName": "Chicken Sandwich",
-      "orderAmount": 4.99
-    },
-    {
-      "id": 7434532,
-      "email": "ryan.holmes@reqres.in",
-      "userName": "Ryan Holmes",
-      "productName": "Avocado Panini",
-      "orderAmount": 7.99
-    },
-    {
-      "id": 2381224,
-      "email": "michael.lawson@reqres.in",
-      "userName": "Michael Lawson",
-      "productName": "Chicken Sandwich",
-      "orderAmount": 4.99
-    },
-    {
-      "id": 2736212,
-      "email": "lindsay.ferguson@reqres.in",
-      "userName": "Lindsay Ferguson",
-      "productName": "Tuna Salad",
-      "orderAmount": 9.99
-    },
-    {
-      "id": 6788734,
-      "email": "tobias.funke@reqres.in",
-      "userName": "Tobias Funke",
-      "productName": "Beef steak",
-      "orderAmount": 19.99
-    },
-    {
-      "id": 7434532,
-      "email": "byron.fields@reqres.in",
-      "userName": "Byron Fields",
-      "productName": "Chicken Sandwich",
-      "orderAmount": 4.99
-    },
-    {
-      "id": 7434532,
-      "email": "ryan.holmes@reqres.in",
-      "userName": "Ryan Holmes",
-      "productName": "Avocado Panini",
-      "orderAmount": 7.99
    }
  ],
  "addInputWidgetBinding": "{{Table1.selectedRow.id",
--- a/app/client/cypress/init-pg-dump-for-test.sql
+++ b/app/client/cypress/init-pg-dump-for-test.sql
@ -0,0 +1,53 @@
+CREATE TABLE public.configs (
+    id integer NOT NULL,
+    "configName" text NOT NULL,
+    "configJson" jsonb,
+    "configVersion" integer,
+    "updatedAt" timestamp with time zone,
+    "updatedBy" text
+);
+
+CREATE SEQUENCE public.configs_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER TABLE public.configs_id_seq OWNER TO postgres;
+
+CREATE TABLE public.users (
+    id integer NOT NULL,
+    name character varying,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    status character varying,
+    gender character varying,
+    avatar character varying,
+    email character varying,
+    address text,
+    role text,
+    dob date,
+    "phoneNo" text
+);
+
+CREATE SEQUENCE public.users_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.users_id_seq OWNER TO postgres;
+
+insert into public.configs (id, "configName", "configJson", "configVersion", "updatedAt", "updatedBy") 
+values (3,	'New Config',	'{"key": "val1"}',	1,	'2020-08-26 11:14:28.458209+00', ''), 
+(5,	'New Config',	'{"key": "val2"}',	1,	'2020-08-26 11:14:28.458209+00', '');
+
+insert into public.users (id, name, "createdAt", "updatedAt", status, gender, avatar, email, address, role, dob, "phoneNo") values 
+(7, 'Test user 7', '2019-08-07 21:36:27+00', '2019-10-21 03:23:42+00', 'APPROVED', 'Male', 'https://robohash.org/quiofficiadicta.jpg?size=100x100&set=set1' ,'xkainz6@ihg.com', '19624 Scofield Way', 'Admin','1993-08-14', ''),
+(8, 'Test user 8', '2019-08-07 21:36:27+00', '2019-10-21 03:23:42+00', 'APPROVED', 'Male', 'https://robohash.org/quiofficiadicta.jpg?size=100x100&set=set1' ,'xkainz6@ihg.com', '19624 Scofield Way', 'Admin','1993-08-14', ''),
+(9, 'Test user 9', '2019-08-07 21:36:27+00', '2019-10-21 03:23:42+00', 'APPROVED', 'Male', 'https://robohash.org/quiofficiadicta.jpg?size=100x100&set=set1' ,'xkainz6@ihg.com', '19624 Scofield Way', 'Admin','1993-08-14', '')
--- a/app/client/cypress/integration/Smoke_TestSuite/ActionExecution/Action_PageOnLoad_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ActionExecution/Action_PageOnLoad_spec.js
@ -1,4 +1,5 @@
 const dsl = require("../../../fixtures/tableWidgetDsl.json");
+const commonlocators = require("../../../locators/commonlocators.json");

 describe("API Panel Test Functionality", function() {
  before(() => {
@ -29,21 +30,26 @@ describe("API Panel Test Functionality", function() {
    );
  });

-  it("Will not crash the app for failure", function() {
-    cy.SearchEntityandOpen("PageLoadApi");
-    cy.get("li:contains('Settings')").click({ force: true });
-    cy.get("[data-cy='actionConfiguration.timeoutInMillisecond']")
-      .find(".bp3-input")
-      .type("{backspace}{backspace}{backspace}");
-
+  it("Shows which action failed on action fail.", function() {
    cy.NavigateToAPI_Panel();
-    cy.CreateAPI("NormalApi");
-    cy.enterDatasourceAndPath("https://reqres.in/api/", "users");
+    cy.CreateAPI("PageLoadApi2");
+    cy.enterDatasourceAndPath("https://abc.com", "users");
    cy.WaitAutoSave();
+    cy.get("li:contains('Settings')").click({ force: true });
+    cy.get("[data-cy=executeOnLoad]")
+      .find(".bp3-switch")
+      .click();
+
+    cy.wait("@setExecuteOnLoad");
+
+    cy.SearchEntityandOpen("Table1");
+    cy.testJsontext("tabledata", "{{PageLoadApi2.data.data");
+
+    cy.wait("@updateLayout");

    cy.reload();
-    cy.wait("@postExecute");
-    cy.RunAPI();
-    cy.ResponseStatusCheck("200 OK");
+    cy.get(commonlocators.toastMsg).contains(
+      `The action "PageLoadApi2" has failed.`,
+    );
  });
 });
--- a/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js
@ -13,11 +13,11 @@ describe("Test curl import flow", function() {
    );
    cy.get("textarea").type("curl -X GET https://mock-api.appsmith.com/users");
    cy.importCurl();
-    cy.get("@curlImport").then(response => {
+    cy.get("@curlImport").then((response) => {
      cy.expect(response.response.body.responseMeta.success).to.eq(true);
      cy.get(apiwidget.ApiName)
        .invoke("text")
-        .then(text => {
+        .then((text) => {
          const someText = text;
          expect(someText).to.equal(response.response.body.data.name);
        });
@ -28,10 +28,10 @@ describe("Test curl import flow", function() {
    cy.get(ApiEditor.formActionButtons).should("be.visible");
    cy.get(ApiEditor.ApiDeleteBtn).click();
    cy.wait("@deleteAction");
-    cy.get("@deleteAction").then(response => {
+    cy.get("@deleteAction").then((response) => {
      cy.expect(response.response.body.responseMeta.success).to.eq(true);
    });
    cy.get(ApiEditor.ApiHomePage).should("be.visible");
-    cy.get(ApiEditor.formActionButtons).should("not.be.visible");
+    cy.get(ApiEditor.formActionButtons).should("not.exist");
  });
 });
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/Bind_TableTextPagination_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/Bind_TableTextPagination_spec.js
@ -4,18 +4,18 @@ const pages = require("../../../locators/Pages.json");
 const apiPage = require("../../../locators/ApiEditor.json");
 const publishPage = require("../../../locators/publishWidgetspage.json");

-describe("Test Create Api and Bind to Table widget", function() {
+describe("Test Create Api and Bind to Table widget", function () {
  before(() => {
    cy.addDsl(dsl);
  });

-  it("Test_Add Paginate with Table Page No and Execute the Api", function() {
+  it("Test_Add Paginate with Table Page No and Execute the Api", function () {
    /**Create an Api1 of Paginate with Table Page No */
    cy.createAndFillApi(this.data.paginationUrl, this.data.paginationParam);
    cy.RunAPI();
  });

-  it("Table-Text, Validate Server Side Pagination of Paginate with Table Page No", function() {
+  it("Table-Text, Validate Server Side Pagination of Paginate with Table Page No", function () {
    cy.SearchEntityandOpen("Table1");
    /**Bind Api1 with Table widget */
    cy.testJsontext("tabledata", "{{Api1.data.users}}");
@ -31,21 +31,33 @@ describe("Test Create Api and Bind to Table widget", function() {
    /**Validate Table data on current page(page1) */
    cy.ValidateTableData("1");
    cy.get(commonlocators.tableNextPage).click({ force: true });
+    cy.wait(5000);
+    /*
+    cy.wait("@postExecute").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
    cy.validateToastMessage("done");
    /**Validate Table data on next page(page2) */
-    cy.ValidateTableData("11");
+    //cy.ValidateTableData("11");
  });

-  it("Table-Text, Validate Publish Mode on Server Side Pagination of Paginate with Table Page No", function() {
+  it("Table-Text, Validate Publish Mode on Server Side Pagination of Paginate with Table Page No", function () {
    cy.PublishtheApp();
    cy.ValidatePublishTableData("1");
    cy.get(commonlocators.tableNextPage).click({ force: true });
+    cy.wait("@postExecute").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
    cy.validateToastMessage("done");
    cy.ValidatePublishTableData("11");
    cy.get(publishPage.backToEditor).click({ force: true });
  });

-  it("Test_Add Paginate with Response URL and Execute the Api", function() {
+  it("Test_Add Paginate with Response URL and Execute the Api", function () {
    /** Create Api2 of Paginate with Response URL*/
    cy.createAndFillApi(this.data.paginationUrl, "users");
    cy.RunAPI();
@ -67,7 +79,7 @@ describe("Test Create Api and Bind to Table widget", function() {
    cy.callApi("Api2");
  });

-  it("Table-Text, Validate Server Side Pagination of Paginate with Response URL", function() {
+  it("Table-Text, Validate Server Side Pagination of Paginate with Response URL", function () {
    /**Validate Response data with Table data in Text Widget */
    cy.ValidatePaginateResponseUrlData(apiPage.apiPaginationPrevTest);
    cy.PublishtheApp();
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/Binding_Table_Widget_DefaultSearch_Input_widget_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/Binding_Table_Widget_DefaultSearch_Input_widget_spec.js
@ -27,7 +27,7 @@ describe("Binding the Table and input Widget", function() {
      .type("2736212", { force: true });
    cy.get(commonlocators.editPropCrossButton).click();
    cy.wait("@updateLayout").isSelectRow(0);
-    cy.readTabledataPublish("0", "0").then(tabData => {
+    cy.readTabledataPublish("0", "0").then((tabData) => {
      const tabValue = tabData;
      expect(tabValue).to.be.equal("2736212");
      cy.log("the value is" + tabValue);
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/ButtonWidgets_NavigateTo_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/ButtonWidgets_NavigateTo_validation_spec.js
@ -29,7 +29,7 @@ describe("Binding the button Widgets and validating NavigateTo Page functionalit
    cy.PublishtheApp();
    cy.get(publish.buttonWidget).click();
    cy.wait(500);
-    cy.get(publish.buttonWidget).should("not.be.visible");
+    cy.get(publish.buttonWidget).should("not.exist");
    cy.go("back");
    cy.get(publish.backToEditor)
      .first()
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js
@ -37,7 +37,7 @@ describe("Binding the multiple Widgets and validating NavigateTo Page", function
  it("Validate NavigateTo Page functionality ", function() {
    cy.SearchEntityandOpen("Table1");
    cy.isSelectRow(1);
-    cy.readTabledataPublish("1", "0").then(tabData => {
+    cy.readTabledataPublish("1", "0").then((tabData) => {
      const tabValue = tabData;
      expect(tabValue).to.be.equal("2736212");
      cy.log("the value is" + tabValue);
@ -45,7 +45,7 @@ describe("Binding the multiple Widgets and validating NavigateTo Page", function
        .first()
        .invoke("attr", "value")
        .should("contain", tabValue);
-      cy.get(widgetsPage.chartWidget).should("not.be.visible");
+      cy.get(widgetsPage.chartWidget).should("not.exist");

      cy.get(publish.inputGrp)
        .first()
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/TableWidgets_NavigateTo_Validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/TableWidgets_NavigateTo_Validation_spec.js
@ -17,7 +17,7 @@ describe("Table Widget and Navigate to functionality validation", function() {
    cy.openPropertyPane("tablewidget");
    cy.widgetText("Table1", widgetsPage.tableWidget, commonlocators.tableInner);
    cy.testJsontext("tabledata", JSON.stringify(testdata.TablePagination));
-    cy.get(widgetsPage.tableActionSelect).click();
+    cy.get(widgetsPage.tableOnRowSelect).click();
    cy.get(commonlocators.chooseAction)
      .children()
      .contains("Navigate To")
@ -35,21 +35,12 @@ describe("Table Widget and Navigate to functionality validation", function() {

  it("Validate NavigateTo Page functionality ", function() {
    cy.SearchEntityandOpen("Table1");
+    //Below test to be enabled once the bug related to change of page in table in fixed
+    //cy.get('.t--table-widget-next-page')
+    //  .click();
+    cy.PublishtheApp();
+    cy.get(widgetsPage.chartWidget).should("not.exist");
    cy.isSelectRow(1);
-    cy.readTabledataPublish("1", "2").then(tabData => {
-      const tabValue = tabData;
-      expect(tabValue).to.be.equal("Lindsay Ferguson");
-      cy.log("the value is" + tabValue);
-      cy.wait(500);
-      cy.get(widgetsPage.chartWidget).should("not.be.visible");
-      //Below test to be enabled once the bug related to change of page in table in fixed
-      //cy.get('.t--table-widget-next-page')
-      //  .click();
-      cy.PublishtheApp();
-      cy.get(publish.searchInput)
-        .first()
-        .type(tabData);
-      cy.get(widgetsPage.chartWidget).should("be.visible");
-    });
+    cy.get(widgetsPage.chartWidget).should("be.visible");
  });
 });
--- a/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Chart_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Chart_spec.js
@ -45,12 +45,12 @@ describe("Chart Widget Functionality", function() {
    cy.testJsontext("chartdata", JSON.stringify(this.data.chartInput));
    cy.get(viewWidgetsPage.chartWidget)
      .should("be.visible")
-      .and(chart => {
+      .and((chart) => {
        expect(chart.height()).to.be.greaterThan(200);
      });
    cy.get(viewWidgetsPage.chartWidget).should("have.css", "opacity", "1");
    const labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-    [0, 1, 2, 3, 4, 5, 6].forEach(k => {
+    [0, 1, 2, 3, 4, 5, 6].forEach((k) => {
      cy.get(viewWidgetsPage.rectangleChart)
        .eq(k)
        .trigger("mousemove", { force: true });
@ -72,7 +72,7 @@ describe("Chart Widget Functionality", function() {
  it("Chart Widget Functionality To Unchecked Visible Widget", function() {
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.chartWidget).should("not.be.visible");
+    cy.get(publish.chartWidget).should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Chart Widget Functionality To Check Visible Widget", function() {
@ -84,7 +84,7 @@ describe("Chart Widget Functionality", function() {
  it("Chart Widget Functionality To Uncheck Horizontal Scroll Visible", function() {
    cy.togglebarDisable(commonlocators.horizontalScroll);
    cy.PublishtheApp();
-    cy.get(publish.horizontalTab).should("not.visible");
+    cy.get(publish.horizontalTab).should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Chart Widget Functionality To Check Horizontal Scroll Visible", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Image_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Image_spec.js
@ -65,7 +65,7 @@ describe("Image Widget Functionality", function() {
    cy.openPropertyPane("imagewidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.imageWidget).should("not.be.visible");
+    cy.get(publish.imageWidget).should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Image Widget Functionality To Check Visible Widget", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Map_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/DisplayWidgets/Map_spec.js
@ -86,7 +86,7 @@ if (Cypress.env("APPSMITH_GOOGLE_MAPS_API_KEY")) {
       * Disable the Search Location checkbox and Validate the same in editor mode
       */
      cy.UncheckWidgetProperties(commonlocators.enableSearchLocCheckbox);
-      cy.get(viewWidgetsPage.mapSearch).should("not.be.visible");
+      cy.get(viewWidgetsPage.mapSearch).should("not.exist");
      /**
       * Disable the Pick Location checkbox and Validate the same in editor mode
       */
@ -105,7 +105,7 @@ if (Cypress.env("APPSMITH_GOOGLE_MAPS_API_KEY")) {
      /**
       * Publish mode Validation
       */
-      cy.get(publishPage.mapSearch).should("not.be.visible");
+      cy.get(publishPage.mapSearch).should("not.exist");
      cy.get(publishPage.pickMyLocation).should("not.exist");
      cy.get(publishPage.backToEditor).click();
    });
@ -141,7 +141,7 @@ if (Cypress.env("APPSMITH_GOOGLE_MAPS_API_KEY")) {
      //Uncheck the disabled checkbox and validate
      cy.UncheckWidgetProperties(commonlocators.visibleCheckbox);
      cy.PublishtheApp();
-      cy.get(publishPage.mapWidget).should("not.be.visible");
+      cy.get(publishPage.mapWidget).should("not.exist");
    });
  });
 }
--- a/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_Copy_Delete_Undo_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_Copy_Delete_Undo_spec.js
@ -37,7 +37,7 @@ describe("Test Suite to validate copy/delete/undo functionalites", function() {
    });
    cy.DeleteWidgetFromSideBar();
    cy.wait(500);
-    cy.get(apiwidget.propertyList).should("not.be.visible");
+    cy.get(apiwidget.propertyList).should("not.exist");
    /*
    To be enabled once widget delete click works
    cy.get('.t--delete-widget')
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Button_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Button_spec.js
@ -75,7 +75,7 @@ describe("Button Widget Functionality", function() {
    //Uncheck the disabled checkbox and validate
    cy.UncheckWidgetProperties(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publishPage.buttonWidget).should("not.be.visible");
+    cy.get(publishPage.buttonWidget).should("not.exist");
  });

  it("Button-Check Visible field Validation", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/CheckBox_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/CheckBox_spec.js
@ -62,14 +62,14 @@ describe("Checkbox Widget Functionality", function() {
    cy.openPropertyPane("checkboxwidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.checkboxWidget + " " + "input").should("not.be.visible");
+    cy.get(publish.checkboxWidget + " " + "input").should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Checkbox Functionality To Check Visible Widget", function() {
    cy.openPropertyPane("checkboxwidget");
    cy.togglebar(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.checkboxWidget + " " + "input").should("be.visible");
+    cy.get(publish.checkboxWidget + " " + "input").should("be.checked");
    cy.get(publish.backToEditor).click();
  });

--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
@ -146,7 +146,7 @@ describe("DatePicker Widget Functionality", function() {
    // Check the visible checkbox
    cy.UncheckWidgetProperties(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publishPage.datepickerWidget).should("not.be.visible");
+    cy.get(publishPage.datepickerWidget).should("not.exist");
  });

  it("DatePicker-uncheck Visible field validation", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Dropdown_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Dropdown_spec.js
@ -62,7 +62,7 @@ describe("Dropdown Widget Functionality", function() {
    cy.openPropertyPane("dropdownwidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.dropdownWidget + " " + "input").should("not.be.visible");
+    cy.get(publish.dropdownWidget + " " + "input").should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Dropdown Functionality To Check Visible Widget", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js
@ -17,7 +17,7 @@ describe("FilePicker Widget Functionality", function() {

  it("It checks the loading state of filepicker on call the action", function() {
    cy.openPropertyPane("filepickerwidget");
-    const fixturePath = "example.json";
+    const fixturePath = "testFile.mov";
    cy.getAlert(commonlocators.filePickerOnFilesSelected);
    cy.get(commonlocators.filePickerButton).click();
    cy.get(commonlocators.filePickerInput)
@ -25,6 +25,13 @@ describe("FilePicker Widget Functionality", function() {
      .attachFile(fixturePath);
    cy.get(commonlocators.filePickerUploadButton).click();
    cy.get(".bp3-spinner").should("have.length", 1);
+    cy.wait("@updateLayout").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+    cy.wait(500);
+    cy.get("button").contains("1 files selected");
  });

  afterEach(() => {
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FormWidget_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FormWidget_spec.js
@ -47,7 +47,7 @@ describe("Form Widget Functionality", function() {
    cy.openPropertyPane("formwidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.formWidget).should("not.be.visible");
+    cy.get(publish.formWidget).should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Form Widget Functionality To Check Visible Widget", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Input_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Input_spec.js
@ -101,7 +101,7 @@ describe("Input Widget Functionality", function() {
    cy.openPropertyPane("inputwidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.inputWidget + " " + "input").should("not.be.visible");
+    cy.get(publish.inputWidget + " " + "input").should("not.exist");
    cy.get(publish.backToEditor).click({ force: true });
  });
  it("Input Functionality To Check Visible Widget", function() {
@ -123,7 +123,7 @@ describe("Input Widget Functionality", function() {
      .click()
      .clear()
      .type("1.255");
-    cy.get(".bp3-popover-content").should($x => {
+    cy.get(".bp3-popover-content").should(($x) => {
      expect($x).contain("Invalid input");
    });
    cy.get(widgetsPage.innertext)
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Radio_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/Radio_spec.js
@ -58,14 +58,14 @@ describe("Radio Widget Functionality", function() {
    cy.openPropertyPane("radiogroupwidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.radioWidget + " " + "input").should("not.be.visible");
+    cy.get(publish.radioWidget + " " + "input").should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Radio Functionality To Check Visible Widget", function() {
    cy.openPropertyPane("radiogroupwidget");
    cy.togglebar(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.radioWidget + " " + "input").should("be.visible");
+    cy.get(publish.radioWidget + " " + "input").should("be.checked");
  });
  it("Radio Functionality To Button Text", function() {
    cy.get(publish.radioWidget + " " + "label")
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/RichTextEditor_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/RichTextEditor_spec.js
@ -31,6 +31,15 @@ describe("RichTextEditor Widget Functionality", function() {
      "This is a Heading",
    );

+    // validate after reload
+    cy.reload(true);
+    cy.wait(2000);
+    cy.validateHTMLText(
+      formWidgetsPage.richTextEditorWidget,
+      "h1",
+      "This is a Heading",
+    );
+
    cy.PublishtheApp();
    cy.validateHTMLText(
      publishPage.richTextEditorWidget,
@ -73,7 +82,7 @@ describe("RichTextEditor Widget Functionality", function() {
    // Uncheck the visible checkbox
    cy.UncheckWidgetProperties(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publishPage.richTextEditorWidget).should("not.be.visible");
+    cy.get(publishPage.richTextEditorWidget).should("not.exist");
  });

  it("RichTextEditor-uncheck Visible field validation", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/Tab_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/LayoutWidgets/Tab_spec.js
@ -39,7 +39,7 @@ describe("Tab widget test", function() {
      .click({ force: true });
    cy.get(Layoutpage.tabWidget)
      .contains("Day")
-      .should("not.to.be.visible");
+      .should("not.exist");
    /**
     * @param{toggleButton Css} Assert to be checked
     */
@ -63,7 +63,7 @@ describe("Tab widget test", function() {
    cy.openPropertyPane("tabswidget");
    cy.togglebarDisable(commonlocators.visibleCheckbox);
    cy.PublishtheApp();
-    cy.get(publish.tabWidget).should("not.be.visible");
+    cy.get(publish.tabWidget).should("not.exist");
    cy.get(publish.backToEditor).click();
  });
  it("Tab Widget Functionality To Check Visible Widget", function() {
--- a/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Onboarding/Onboarding_spec.js
@ -56,7 +56,7 @@ describe("Onboarding", function() {
    cy.openPropertyPane("tablewidget");
    cy.closePropertyPane();

-    cy.get(".t--application-feedback-btn").should("not.be.visible");
+    cy.get(".t--application-feedback-btn").should("not.exist");
  });

  // Similar to PublishtheApp command with little changes
--- a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateAppWithSameName_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateAppWithSameName_spec.js
@ -6,7 +6,7 @@ describe("Create org and a new app / delete and recreate app", function() {

  it("create app within an org and delete and re-create another app with same name", function() {
    cy.NavigateToHome();
-    cy.generateUUID().then(uid => {
+    cy.generateUUID().then((uid) => {
      orgid = uid;
      appid = uid;
      localStorage.setItem("OrgName", orgid);
--- a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateDuplicateAppWithinOrg_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateDuplicateAppWithinOrg_spec.js
@ -6,7 +6,7 @@ describe("Create new org and an app within the same", function() {

  it("create multiple apps and validate", function() {
    cy.NavigateToHome();
-    cy.generateUUID().then(uid => {
+    cy.generateUUID().then((uid) => {
      orgid = uid;
      appid = uid;
      localStorage.setItem("OrgName", orgid);
--- a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
@ -2,13 +2,13 @@

 const homePage = require("../../../locators/HomePage.json");

-describe("Create new org and share with a user", function () {
+describe("Create new org and share with a user", function() {
  let orgid;
  let appid;

-  it("create org and then share with a user from UI", function () {
+  it("create org and then share with a user from UI", function() {
    cy.NavigateToHome();
-    cy.generateUUID().then(uid => {
+    cy.generateUUID().then((uid) => {
      orgid = uid;
      appid = uid;
      localStorage.setItem("OrgName", orgid);
@ -25,7 +25,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as invited user and then validate viewer privilage", function () {
+  it("login as invited user and then validate viewer privilage", function() {
    cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
    cy.get(homePage.searchInput).type(appid);
    cy.wait(2000);
@ -39,7 +39,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as Org owner and update the invited user role to developer", function () {
+  it("login as Org owner and update the invited user role to developer", function() {
    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
    cy.visit("/applications");
    cy.wait("@applications").should(
@ -58,7 +58,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as invited user and then validate developer privilage", function () {
+  it("login as invited user and then validate developer privilage", function() {
    cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
    cy.get(homePage.searchInput).type(appid);
    cy.wait(2000);
@ -76,7 +76,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as Org owner and update the invited user role to administrator", function () {
+  it("login as Org owner and update the invited user role to administrator", function() {
    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
    cy.visit("/applications");
    cy.wait("@applications").should(
@ -95,7 +95,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as invited user and then validate administrator privilage", function () {
+  it("login as invited user and then validate administrator privilage", function() {
    cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1"));
    cy.get(homePage.searchInput).type(appid);
    cy.wait(2000);
@ -108,7 +108,7 @@ describe("Create new org and share with a user", function () {
    cy.LogOut();
  });

-  it("login as Org owner and delete App ", function () {
+  it("login as Org owner and delete App ", function() {
    cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
    cy.visit("/applications");
    cy.wait("@applications").should(
@ -119,7 +119,7 @@ describe("Create new org and share with a user", function () {
    cy.get(homePage.searchInput).type(appid);
    cy.wait(2000);
    cy.navigateToOrgSettings(orgid);
-    cy.get(homePage.emailList).then(function ($list) {
+    cy.get(homePage.emailList).then(function($list) {
      expect($list).to.have.length(3);
      expect($list.eq(0)).to.contain(Cypress.env("USERNAME"));
      expect($list.eq(1)).to.contain(Cypress.env("TESTUSERNAME1"));
--- a/app/client/cypress/integration/Smoke_TestSuite/QueryPane/MongoDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/QueryPane/MongoDatasource_spec.js
@ -35,9 +35,11 @@ describe("Create a query with a mongo datasource, run, save and then delete the
    cy.get(".CodeMirror textarea")
      .first()
      .focus()
-      .type(`{"find": "planets"}`, { parseSpecialCharSequences: false });
+      .type(`{"find": "listingsAndReviews","limit": 10}`, {
+        parseSpecialCharSequences: false,
+      });

-    cy.EvaluateCurrentValue(`{"find": "planets"}`);
+    cy.EvaluateCurrentValue(`{"find": "listingsAndReviews","limit": 10}`);
    cy.runAndDeleteQuery();

    cy.get("@createDatasource").then((httpResponse) => {
--- a/app/client/cypress/locators/DatasourcesEditor.json
+++ b/app/client/cypress/locators/DatasourcesEditor.json
@ -15,5 +15,7 @@
  "sectionSSL": "[data-cy=section-SSL\\ \\(optional\\)]",
  "PostgresEntity": ".t--entity-name:contains(PostgreSQL)",
  "createQuerty": ".t--create-query",
-  "editDatasource": ".t--edit-datasource"
+  "editDatasource": ".t--edit-datasource",
+  "defaultDatabaseName": "input[name='datasourceConfiguration.connection.defaultDatabaseName']",
+  "selConnectionType": "[data-cy='datasourceConfiguration.connection.type']"
 }
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@ -46,5 +46,6 @@
    "widgetBtn": ".t--widget-buttonwidget button",
    "actionSelect": ".t--open-dropdown-Select-Action",
    "tableActionSelect": ".t--property-control-onsearchtextchanged .t--open-dropdown-Select-Action",
-    "chartWidget": ".t--widget-chartwidget"
+    "chartWidget": ".t--widget-chartwidget",
+    "tableOnRowSelect": ".t--property-control-onrowselected .t--open-dropdown-Select-Action"
 }
--- a/app/client/cypress/manual_TestSuite/API_Datasource_Spec.js
+++ b/app/client/cypress/manual_TestSuite/API_Datasource_Spec.js
@ -0,0 +1,60 @@
+const commonlocators = require("../../../locators/commonlocators.json");
+
+describe("API associated with Datasource", function() {
+    it("Edit name of the Datasource from Pane and refeclected in the Page ", function() 
+    {
+        // Click on the API datasource 
+        // Click on Action icon (Three Dots)
+        // Click on "Edit Name"
+        // Rename the Datasource
+        // Click on the datasource
+        // Ensure the name is updated on the Page 
+    }
+    )
+    it("Edit name of the Datasource from Page and refeclected in the Pane", function() 
+    {
+        // Click on the API datasource 
+        // Navigate to respective 
+        // Click on "Edit " option next to the Name of the datasource
+        // Rename the Datasource
+        // Ensure the name is updated in the Pane 
+    }
+    )
+    it("Edit the API Datasource", function() 
+    {
+        // Click on the API datasource 
+        // Ensure navigation to respective page
+        // Click on "EDIT"
+        // Make some changes 
+        // Click on Test 
+        // Click on Save
+        // Ensure it is refelected in the API 
+    }
+    )
+    it("Error on trying to Deleting an API Datasource when associated with API  ", function() 
+    {
+        // Click on API associated Datasource
+        // Navigate to respective page 
+        // Click on "Delete"
+        // Ensure an error message is displayed to user
+    }
+    )
+    it("Adding the API to an exsisting Datasource", function() 
+    {
+        // Click on exsisting Datasource
+        // Navigate to Datasource list page 
+        // Click on "+ New API"
+        // Ensure new API is added in the RHS Pane
+        // Click on "Run"
+    }
+    )
+    it("Refresh an Datasource  ", function() 
+    {
+        // Navigate to the Datasource
+        // Click on Action icon (Three Dots)
+        // Click on "Refresh"
+        // Ensure loading icon 
+    }
+    )
+}
+)
--- a/app/client/cypress/manual_TestSuite/Deletion
+++ b/app/client/cypress/manual_TestSuite/Deletion
@ -1,19 +1,15 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function()  {
-    it("Duplicating an application", function() 
-    {
-        // Navigate to home Page 
-        // Click on any application action icon (Three dots)
-        // Click on "Duplicate" option 
-        // Ensure the application gets copied 
-        // Click on "Appsmith" to navigate to homepage
-        // Click  on action icon
-        // Click on Delete option 
-        // Click on "Are You Sure?" option
-        // Ensure  the App gets deleted
-    }
-    )
-}
-)
+describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
+  it("Duplicating an application", function() {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Click on "Appsmith" to navigate to homepage
+    // Click  on action icon
+    // Click on Delete option
+    // Click on "Are You Sure?" option
+    // Ensure  the App gets deleted
+  });
+});
--- a/app/client/cypress/manual_TestSuite/Duplicate_App.js
+++ b/app/client/cypress/manual_TestSuite/Duplicate_App.js
@ -1,15 +1,11 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function()  {
-    it("Duplicating an application", function() 
-    {
-        // Navigate to home Page 
-        // Click on any application action icon (Three dots)
-        // Click on "Duplicate" option 
-        // Ensure the application gets copied 
-        // Ensure the name is appended with the word "Copy" 
-    }
-    )
-}
-)
+describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
+  it("Duplicating an application", function() {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Ensure the name is appended with the word "Copy"
+  });
+});
--- a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
+++ b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
@ -1,28 +1,22 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function()  {
-    it("Duplicating an application", function() 
-    {
-        // Navigate to home Page 
-        // Click on any application action icon (Three dots)
-        // Click on "Duplicate" option 
-        // Ensure the application gets copied 
-        // Ensure the name is appended with the word "Copy" 
-    }
-    )
-    it("Deleting the duplicated Application ", function() 
-    {
-        // Navigate to home Page 
-        // Click on any application action icon (Three dots)
-        // Click on "Duplicate" option 
-        // Ensure the application gets copied 
-        // Click on "Appsmith" to navigate to homepage
-        // Click  on action icon
-        // Click on Delete option 
-        // Click on "Are You Sure?" option
-        // Ensure  the App gets deleted
-    }
-    )
-}
-)
+describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
+  it("Duplicating an application", function() {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Ensure the name is appended with the word "Copy"
+  });
+  it("Deleting the duplicated Application ", function() {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Click on "Appsmith" to navigate to homepage
+    // Click  on action icon
+    // Click on Delete option
+    // Click on "Are You Sure?" option
+    // Ensure  the App gets deleted
+  });
+});
--- a/app/client/cypress/manual_TestSuite/Organisation_Name.js
+++ b/app/client/cypress/manual_TestSuite/Organisation_Name.js
@ -1,15 +1,11 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Checking for error message on Organisation Name ", function()  {
-    it("Ensure of Inactive Submit button ", function() 
-    {
-        // Navigate to home Page 
-        // Click on Create Organisation 
-        // Type "Space" as first character
-        // Ensure "Submit" button does not get Active
-        // Now click on "X" (Close icon) ensure the pop up closes
-    }
-    )
-}
-)
+describe("Checking for error message on Organisation Name ", function() {
+  it("Ensure of Inactive Submit button ", function() {
+    // Navigate to home Page
+    // Click on Create Organisation
+    // Type "Space" as first character
+    // Ensure "Submit" button does not get Active
+    // Now click on "X" (Close icon) ensure the pop up closes
+  });
+});
--- a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
+++ b/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
@ -1,6 +1,5 @@
 const homePage = require("../../../locators/HomePage.json");

-
 describe("Checking for error message on Organisation Name ", function()  {
    it("Ensure of Inactive Submit button ", function() 
    {
@ -18,7 +17,7 @@ describe("Checking for error message on Organisation Name ", function()  {
        // Add some widgets
        // Navigate back to the application
        // Delete the Application
-        // Click on "Create New" option under samee organisation  
+        // Click on "Create New" option under same organisation  
        // Enter the name "XYZ"
        // Ensure the application can be created with the same name 
    }
@ -32,5 +31,17 @@ describe("Checking for error message on Organisation Name ", function()  {
        // Now click outside and ensure the pop up closes
    }
    )
+    it("Reuse the name of the deleted application name on the other organisation", function() 
+    {
+        // Navigate to home Page 
+        // Create an Application by name "XYZ"
+        // Add some widgets
+        // Navigate back to the application
+        // Delete the Application
+        // Click on "Create New" option under different organisation  
+        // Enter the name "XYZ"
+        // Ensure the application can be created with the same name 
+    }
+    )
 }
 )
--- a/app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js
+++ b/app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js
@ -1,18 +1,14 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Reuse the name of the deleted application name inside the same organisation", function()  {
-    it("Reuse the name of the deleted application name ", function() 
-    {
-        // Navigate to home Page 
-        // Create an Application by name "XYZ"
-        // Add some widgets
-        // Navigate back to the application
-        // Delete the Application
-        // Click on "Create New" option under samee organisation  
-        // Enter the name "XYZ"
-        // Ensure the application can be created with the same name 
-    }
-    )
-}
-)
+describe("Reuse the name of the deleted application name inside the same organisation", function() {
+  it("Reuse the name of the deleted application name ", function() {
+    // Navigate to home Page
+    // Create an Application by name "XYZ"
+    // Add some widgets
+    // Navigate back to the application
+    // Delete the Application
+    // Click on "Create New" option under samee organisation
+    // Enter the name "XYZ"
+    // Ensure the application can be created with the same name
+  });
+});
--- a/app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js
+++ b/app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js
@ -1,15 +1,11 @@
 const homePage = require("../../../locators/HomePage.json");

-
-describe("Adding Special Character ", function()  {
-    it("Adding Special Character ", function() 
-    {
-        // Navigate to home Page 
-        // Click on Create Organisation 
-        // Add special as first character
-        // Ensure "Submit" get Active
-        // Now click outside and ensure the pop up closes
-    }
-    )
-}
-)
+describe("Adding Special Character ", function() {
+  it("Adding Special Character ", function() {
+    // Navigate to home Page
+    // Click on Create Organisation
+    // Add special as first character
+    // Ensure "Submit" get Active
+    // Now click outside and ensure the pop up closes
+  });
+});
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@ -20,7 +20,7 @@ const explorer = require("../locators/explorerlocators.json");

 let pageidcopy = " ";

-Cypress.Commands.add("createOrg", orgName => {
+Cypress.Commands.add("createOrg", (orgName) => {
  cy.get(homePage.createOrg)
    .should("be.visible")
    .first()
@ -45,7 +45,7 @@ Cypress.Commands.add(
  },
 );

-Cypress.Commands.add("navigateToOrgSettings", orgName => {
+Cypress.Commands.add("navigateToOrgSettings", (orgName) => {
  cy.get(homePage.orgList.concat(orgName).concat(")"))
    .scrollIntoView()
    .should("be.visible");
@ -207,7 +207,7 @@ Cypress.Commands.add("updateUserRoleForOrg", (orgName, email, role) => {
  );
 });

-Cypress.Commands.add("launchApp", appName => {
+Cypress.Commands.add("launchApp", (appName) => {
  cy.get(homePage.appView)
    .should("be.visible")
    .first()
@ -239,7 +239,7 @@ Cypress.Commands.add("CreateAppForOrg", (orgName, appname) => {
  );
 });

-Cypress.Commands.add("CreateApp", appname => {
+Cypress.Commands.add("CreateApp", (appname) => {
  cy.get(homePage.createNew)
    .first()
    .click({ force: true });
@ -259,7 +259,7 @@ Cypress.Commands.add("CreateApp", appname => {
  );
 });

-Cypress.Commands.add("DeleteApp", appName => {
+Cypress.Commands.add("DeleteApp", (appName) => {
  cy.get(commonlocators.homeIcon).click({ force: true });
  cy.wait("@applications").should(
    "have.nested.property",
@ -312,13 +312,13 @@ Cypress.Commands.add("LoginFromAPI", (uname, pword) => {
      username: uname,
      password: pword,
    },
-  }).then(response => {
+  }).then((response) => {
    expect(response.status).equal(302);
    cy.log(response.body);
  });
 });

-Cypress.Commands.add("DeleteApp", appName => {
+Cypress.Commands.add("DeleteApp", (appName) => {
  cy.get(commonlocators.homeIcon).click({ force: true });
  cy.get(homePage.searchInput).type(appName);
  cy.wait(2000);
@ -360,7 +360,7 @@ Cypress.Commands.add("NavigateToHome", () => {
  );
 });

-Cypress.Commands.add("NavigateToWidgets", pageName => {
+Cypress.Commands.add("NavigateToWidgets", (pageName) => {
  cy.get(pages.pagesIcon).click({ force: true });
  cy.get(".t--page-sidebar-" + pageName + "")
    .find(">div")
@ -371,7 +371,7 @@ Cypress.Commands.add("NavigateToWidgets", pageName => {
  cy.get("#loading").should("not.exist");
 });

-Cypress.Commands.add("SearchApp", appname => {
+Cypress.Commands.add("SearchApp", (appname) => {
  cy.get(homePage.searchInput).type(appname);
  cy.wait(2000);
  cy.get(homePage.applicationCard)
@ -395,10 +395,10 @@ Cypress.Commands.add("SearchEntity", (apiname1, apiname2) => {
  ).should("be.visible");
  cy.get(
    commonlocators.entitySearchResult.concat(apiname2).concat("')"),
-  ).should("not.be.visible");
+  ).should("not.exist");
 });

-Cypress.Commands.add("GlobalSearchEntity", apiname1 => {
+Cypress.Commands.add("GlobalSearchEntity", (apiname1) => {
  cy.get(commonlocators.entityExplorersearch).should("be.visible");
  cy.get(commonlocators.entityExplorersearch)
    .clear()
@ -409,12 +409,12 @@ Cypress.Commands.add("GlobalSearchEntity", apiname1 => {
  ).should("be.visible");
 });

-Cypress.Commands.add("ResponseStatusCheck", statusCode => {
+Cypress.Commands.add("ResponseStatusCheck", (statusCode) => {
  cy.xpath(apiwidget.responseStatus).should("be.visible");
  cy.xpath(apiwidget.responseStatus).contains(statusCode);
 });

-Cypress.Commands.add("ResponseCheck", textTocheck => {
+Cypress.Commands.add("ResponseCheck", (textTocheck) => {
  //Explicit assert
  cy.get(apiwidget.responseText).should("be.visible");
 });
@ -433,7 +433,7 @@ Cypress.Commands.add("NavigateToEntityExplorer", () => {
  cy.get("#loading").should("not.exist");
 });

-Cypress.Commands.add("CreateAPI", apiname => {
+Cypress.Commands.add("CreateAPI", (apiname) => {
  cy.get(apiwidget.createapi).click({ force: true });
  cy.wait("@createNewApi");
  cy.get(apiwidget.resourceUrl).should("be.visible");
@ -449,7 +449,7 @@ Cypress.Commands.add("CreateAPI", apiname => {
  cy.wait(2000);
 });

-Cypress.Commands.add("CreateSubsequentAPI", apiname => {
+Cypress.Commands.add("CreateSubsequentAPI", (apiname) => {
  cy.get(apiwidget.createApiOnSideBar)
    .first()
    .click({ force: true });
@ -462,7 +462,7 @@ Cypress.Commands.add("CreateSubsequentAPI", apiname => {
  cy.WaitAutoSave();
 });

-Cypress.Commands.add("EditApiName", apiname => {
+Cypress.Commands.add("EditApiName", (apiname) => {
  cy.get(apiwidget.ApiName).click({ force: true });
  cy.get(apiwidget.apiTxt)
    .clear()
@ -471,7 +471,7 @@ Cypress.Commands.add("EditApiName", apiname => {
  cy.WaitAutoSave();
 });

-Cypress.Commands.add("EditApiNameFromExplorer", apiname => {
+Cypress.Commands.add("EditApiNameFromExplorer", (apiname) => {
  cy.xpath(apiwidget.popover)
    .last()
    .click({ force: true });
@ -530,7 +530,7 @@ Cypress.Commands.add("validateRequest", (baseurl, path, verb) => {
    .click({ force: true });
 });

-Cypress.Commands.add("SelectAction", action => {
+Cypress.Commands.add("SelectAction", (action) => {
  cy.get(ApiEditor.ApiVerb)
    .first()
    .click({ force: true });
@ -565,7 +565,7 @@ Cypress.Commands.add(
  },
 );

-Cypress.Commands.add("SearchEntityandOpen", apiname1 => {
+Cypress.Commands.add("SearchEntityandOpen", (apiname1) => {
  cy.get(commonlocators.entityExplorersearch).should("be.visible");
  cy.get(commonlocators.entityExplorersearch)
    .clear()
@ -595,7 +595,7 @@ Cypress.Commands.add("enterDatasourceAndPath", (datasource, path) => {
    .type(path, { parseSpecialCharSequences: false });
 });

-Cypress.Commands.add("changeZoomLevel", zoomValue => {
+Cypress.Commands.add("changeZoomLevel", (zoomValue) => {
  cy.get(commonlocators.changeZoomlevel).click();
  cy.get("ul.bp3-menu")
    .children()
@ -609,7 +609,7 @@ Cypress.Commands.add("changeZoomLevel", zoomValue => {
  cy.get(commonlocators.selectedZoomlevel)
    .first()
    .invoke("text")
-    .then(text => {
+    .then((text) => {
      const someText = text;
      expect(someText).to.equal(zoomValue);
    });
@ -663,14 +663,14 @@ Cypress.Commands.add("switchToAPIInputTab", () => {
    .click({ force: true });
 });

-Cypress.Commands.add("selectPaginationType", option => {
+Cypress.Commands.add("selectPaginationType", (option) => {
  cy.get(apiwidget.paginationOption)
    .first()
    .click({ force: true });
  cy.xpath(option).click({ force: true });
 });

-Cypress.Commands.add("clickTest", testbutton => {
+Cypress.Commands.add("clickTest", (testbutton) => {
  cy.wait(2000);
  cy.wait("@saveAction");
  cy.get(testbutton)
@ -726,7 +726,7 @@ Cypress.Commands.add(
  },
 );

-Cypress.Commands.add("CreationOfUniqueAPIcheck", apiname => {
+Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => {
  cy.get(pages.addEntityAPI).click();
  cy.get(apiwidget.createapi).click({ force: true });
  cy.wait("@createNewApi");
@ -738,13 +738,13 @@ Cypress.Commands.add("CreationOfUniqueAPIcheck", apiname => {
    .type(apiname, { force: true })
    .should("have.value", apiname)
    .focus();
-  cy.get(".bp3-popover-content").should($x => {
+  cy.get(".bp3-popover-content").should(($x) => {
    console.log($x);
    expect($x).contain(apiname.concat(" is already being used."));
  });
 });

-Cypress.Commands.add("MoveAPIToHome", apiname => {
+Cypress.Commands.add("MoveAPIToHome", (apiname) => {
  cy.xpath(apiwidget.popover)
    .last()
    .click({ force: true });
@ -757,7 +757,7 @@ Cypress.Commands.add("MoveAPIToHome", apiname => {
  );
 });

-Cypress.Commands.add("MoveAPIToPage", pageName => {
+Cypress.Commands.add("MoveAPIToPage", (pageName) => {
  cy.xpath(apiwidget.popover)
    .last()
    .click({ force: true });
@ -772,7 +772,7 @@ Cypress.Commands.add("MoveAPIToPage", pageName => {
  );
 });

-Cypress.Commands.add("copyEntityToPage", pageName => {
+Cypress.Commands.add("copyEntityToPage", (pageName) => {
  cy.xpath(apiwidget.popover)
    .last()
    .click({ force: true });
@ -825,7 +825,7 @@ Cypress.Commands.add("deleteEntity", () => {
  cy.get(apiwidget.delete).click({ force: true });
 });

-Cypress.Commands.add("DeleteAPI", apiname => {
+Cypress.Commands.add("DeleteAPI", (apiname) => {
  cy.get(apiwidget.deleteAPI)
    .first()
    .click({ force: true });
@ -896,14 +896,14 @@ Cypress.Commands.add("createModal", (modalType, ModalName) => {
  cy.get(".bp3-overlay-backdrop").click({ force: true });
 });

-Cypress.Commands.add("CheckWidgetProperties", checkboxCss => {
+Cypress.Commands.add("CheckWidgetProperties", (checkboxCss) => {
  cy.get(checkboxCss).check({
    force: true,
  });
  cy.assertPageSave();
 });

-Cypress.Commands.add("UncheckWidgetProperties", checkboxCss => {
+Cypress.Commands.add("UncheckWidgetProperties", (checkboxCss) => {
  cy.get(checkboxCss).uncheck({
    force: true,
  });
@ -925,7 +925,7 @@ Cypress.Commands.add(
 Cypress.Commands.add("widgetText", (text, inputcss, innercss) => {
  cy.get(commonlocators.editWidgetName)
    .click({ force: true })
-    .type(text)
+    .type(text, { delay: 300 })
    .type("{enter}");
  cy.get(inputcss)
    .first()
@ -933,13 +933,13 @@ Cypress.Commands.add("widgetText", (text, inputcss, innercss) => {
  cy.get(innercss).should("have.text", text);
 });

-Cypress.Commands.add("EvaluateDataType", dataType => {
+Cypress.Commands.add("EvaluateDataType", (dataType) => {
  cy.get(commonlocators.evaluatedType)
    .should("be.visible")
    .contains(dataType);
 });

-Cypress.Commands.add("EvaluateCurrentValue", currentValue => {
+Cypress.Commands.add("EvaluateCurrentValue", (currentValue) => {
  cy.wait(2000);
  cy.get(commonlocators.evaluatedCurrentValue)
    .should("be.visible")
@ -954,8 +954,8 @@ Cypress.Commands.add("PublishtheApp", () => {
  cy.assertPageSave();

  // Stubbing window.open to open in the same tab
-  cy.window().then(window => {
-    cy.stub(window, "open").callsFake(url => {
+  cy.window().then((window) => {
+    cy.stub(window, "open").callsFake((url) => {
      window.location.href = Cypress.config().baseUrl + url.substring(1);
      window.location.target = "_self";
    });
@ -976,12 +976,12 @@ Cypress.Commands.add("getCodeMirror", () => {
    .type("{ctrl}{shift}{downarrow}");
 });

-Cypress.Commands.add("testCodeMirror", value => {
+Cypress.Commands.add("testCodeMirror", (value) => {
  cy.get(".CodeMirror textarea")
    .first()
    .focus()
    .type("{ctrl}{shift}{downarrow}")
-    .then($cm => {
+    .then(($cm) => {
      if ($cm.val() !== "") {
        cy.get(".CodeMirror textarea")
          .first()
@ -1009,7 +1009,7 @@ Cypress.Commands.add("testJsontext", (endp, value) => {
    .focus({ force: true })
    .type("{uparrow}", { force: true })
    .type("{ctrl}{shift}{downarrow}", { force: true });
-  cy.focused().then($cm => {
+  cy.focused().then(($cm) => {
    if ($cm.contents != "") {
      cy.log("The field is empty");
      cy.get(".t--property-control-" + endp + " .CodeMirror textarea")
@ -1028,14 +1028,14 @@ Cypress.Commands.add("testJsontext", (endp, value) => {
  cy.wait(200);
 });

-Cypress.Commands.add("selectShowMsg", value => {
+Cypress.Commands.add("selectShowMsg", (value) => {
  cy.get(commonlocators.chooseAction)
    .children()
    .contains("Show Message")
    .click();
 });

-Cypress.Commands.add("addSuccessMessage", value => {
+Cypress.Commands.add("addSuccessMessage", (value) => {
  cy.get(commonlocators.chooseMsgType)
    .last()
    .click();
@ -1052,12 +1052,12 @@ Cypress.Commands.add("SetDateToToday", () => {
  cy.assertPageSave();
 });

-Cypress.Commands.add("enterActionValue", value => {
+Cypress.Commands.add("enterActionValue", (value) => {
  cy.get(".CodeMirror textarea")
    .last()
    .focus()
    .type("{ctrl}{shift}{downarrow}")
-    .then($cm => {
+    .then(($cm) => {
      if ($cm.val() !== "") {
        cy.get(".CodeMirror textarea")
          .last()
@ -1079,7 +1079,7 @@ Cypress.Commands.add("enterActionValue", value => {
    });
 });

-Cypress.Commands.add("enterNavigatePageName", value => {
+Cypress.Commands.add("enterNavigatePageName", (value) => {
  cy.get("ul.tree")
    .children()
    .first()
@ -1088,7 +1088,7 @@ Cypress.Commands.add("enterNavigatePageName", value => {
        .first()
        .focus()
        .type("{ctrl}{shift}{downarrow}")
-        .then($cm => {
+        .then(($cm) => {
          if ($cm.val() !== "") {
            cy.get(".CodeMirror textarea")
              .first()
@ -1125,7 +1125,7 @@ Cypress.Commands.add("DeleteModal", () => {
    .click({ force: true });
 });

-Cypress.Commands.add("Createpage", Pagename => {
+Cypress.Commands.add("Createpage", (Pagename) => {
  cy.get(pages.pagesIcon).click({ force: true });
  cy.get(pages.AddPage)
    .first()
@ -1148,7 +1148,7 @@ Cypress.Commands.add("Createpage", Pagename => {
  cy.wait(2000);
 });

-Cypress.Commands.add("Deletepage", Pagename => {
+Cypress.Commands.add("Deletepage", (Pagename) => {
  cy.get(pages.pagesIcon).click({ force: true });
  cy.get(".t--page-sidebar-" + Pagename + "");
  cy.get(
@ -1167,11 +1167,11 @@ Cypress.Commands.add("generateUUID", () => {
  return id.split("-")[0];
 });

-Cypress.Commands.add("addDsl", dsl => {
+Cypress.Commands.add("addDsl", (dsl) => {
  let currentURL;
  let pageid;
  let layoutId;
-  cy.url().then(url => {
+  cy.url().then((url) => {
    currentURL = url;
    const myRegexp = /pages(.*)/;
    const match = myRegexp.exec(currentURL);
@ -1180,7 +1180,7 @@ Cypress.Commands.add("addDsl", dsl => {
    cy.log(pageid + "page id");
    //Fetch the layout id
    cy.server();
-    cy.request("GET", "api/v1/pages/" + pageid).then(response => {
+    cy.request("GET", "api/v1/pages/" + pageid).then((response) => {
      const len = JSON.stringify(response.body);
      cy.log(len);
      layoutId = JSON.parse(len).data.layouts[0].id;
@ -1189,7 +1189,7 @@ Cypress.Commands.add("addDsl", dsl => {
        "PUT",
        "api/v1/layouts/" + layoutId + "/pages/" + pageid,
        dsl,
-      ).then(response => {
+      ).then((response) => {
        expect(response.status).equal(200);
        cy.reload();
      });
@ -1200,7 +1200,7 @@ Cypress.Commands.add("addDsl", dsl => {
 Cypress.Commands.add("DeleteAppByApi", () => {
  let currentURL;
  let appId;
-  cy.url().then(url => {
+  cy.url().then((url) => {
    currentURL = url;
    const myRegexp = /applications(.*)/;
    const match = myRegexp.exec(currentURL);
@ -1212,7 +1212,7 @@ Cypress.Commands.add("DeleteAppByApi", () => {
    }
  });
 });
-Cypress.Commands.add("togglebar", value => {
+Cypress.Commands.add("togglebar", (value) => {
  cy.get(value)
    .check({ force: true })
    .should("be.checked");
@ -1229,7 +1229,7 @@ Cypress.Commands.add("optionValue", (value, value2) => {
    .clear()
    .type(value2);
 });
-Cypress.Commands.add("dropdownDynamic", text => {
+Cypress.Commands.add("dropdownDynamic", (text) => {
  cy.wait(2000);
  cy.get("ul[class='bp3-menu']")
    .first()
@ -1238,24 +1238,6 @@ Cypress.Commands.add("dropdownDynamic", text => {
    .should("have.text", text);
 });

-Cypress.Commands.add("getAlert", alertcss => {
-  cy.get(commonlocators.dropdownSelectButton).click({ force: true });
-  cy.get(widgetsPage.menubar)
-    .contains("Show Alert")
-    .click({ force: true })
-    .should("have.text", "Show Alert");
-
-  cy.get(alertcss)
-    .click({ force: true })
-    .type("{command}{A}{del}")
-    .type("hello")
-    .should("not.to.be.empty");
-  cy.get(".t--open-dropdown-Select-type").click({ force: true });
-  cy.get(".bp3-popover-content .bp3-menu li")
-    .contains("Success")
-    .click({ force: true });
-});
-
 Cypress.Commands.add("tabVerify", (index, text) => {
  cy.get(".t--property-control-tabs input")
    .eq(index)
@ -1268,18 +1250,18 @@ Cypress.Commands.add("tabVerify", (index, text) => {
    .should("be.visible");
 });

-Cypress.Commands.add("togglebar", value => {
+Cypress.Commands.add("togglebar", (value) => {
  cy.get(value)
    .check({ force: true })
    .should("be.checked");
 });
-Cypress.Commands.add("togglebarDisable", value => {
+Cypress.Commands.add("togglebarDisable", (value) => {
  cy.get(value)
    .uncheck({ force: true })
    .should("not.checked");
 });

-Cypress.Commands.add("getAlert", alertcss => {
+Cypress.Commands.add("getAlert", (alertcss) => {
  cy.get(commonlocators.dropdownSelectButton).click({ force: true });
  cy.get(widgetsPage.menubar)
    .contains("Show Message")
@ -1354,10 +1336,11 @@ Cypress.Commands.add("testCreateApiButton", () => {

 Cypress.Commands.add("testSaveDeleteDatasource", () => {
  cy.get(".t--test-datasource").click();
-  cy.wait("@testDatasource")
+  cy.wait("@testDatasource");
+  /*
    .should("have.nested.property", "response.body.data.success", true)
    .debug();
-
+  */
  cy.get(".t--save-datasource").click();
  cy.wait("@saveDatasource").should(
    "have.nested.property",
@ -1397,11 +1380,14 @@ Cypress.Commands.add("NavigateToQueryEditor", () => {

 Cypress.Commands.add("testDatasource", () => {
  cy.get(".t--test-datasource").click();
-  cy.wait("@testDatasource").should(
+  cy.wait("@testDatasource");
+  /*
+   .should(
    "have.nested.property",
    "response.body.data.success",
    true,
  );
+  */
 });

 Cypress.Commands.add("saveDatasource", () => {
@ -1421,7 +1407,12 @@ Cypress.Commands.add("testSaveDatasource", () => {

 Cypress.Commands.add("fillMongoDatasourceForm", () => {
  cy.get(datasourceEditor["host"]).type(datasourceFormData["mongo-host"]);
-  cy.get(datasourceEditor["port"]).type(datasourceFormData["mongo-port"]);
+  //cy.get(datasourceEditor["port"]).type(datasourceFormData["mongo-port"]);
+  cy.get(datasourceEditor["selConnectionType"]).click();
+  cy.contains(datasourceFormData["connection-type"]).click();
+  cy.get(datasourceEditor["defaultDatabaseName"]).type(
+    datasourceFormData["mongo-defaultDatabaseName"],
+  );

  cy.get(datasourceEditor.sectionAuthentication).click();
  cy.get(datasourceEditor["databaseName"])
@ -1473,7 +1464,7 @@ Cypress.Commands.add("createPostgresDatasource", () => {
  cy.testSaveDatasource();
 });

-Cypress.Commands.add("deleteDatasource", datasourceName => {
+Cypress.Commands.add("deleteDatasource", (datasourceName) => {
  cy.NavigateToQueryEditor();

  cy.contains(".t--datasource-name", datasourceName)
@ -1553,7 +1544,7 @@ Cypress.Commands.add("dragAndDropToCanvas", (widgetType, { x, y }) => {
    .trigger("mouseup", { force: true });
 });

-Cypress.Commands.add("executeDbQuery", queryName => {
+Cypress.Commands.add("executeDbQuery", (queryName) => {
  cy.get(widgetsPage.buttonOnClick)
    .get(commonlocators.dropdownSelectButton)
    .click({ force: true })
@ -1567,7 +1558,7 @@ Cypress.Commands.add("executeDbQuery", queryName => {
    .click({ force: true });
 });

-Cypress.Commands.add("openPropertyPane", widgetType => {
+Cypress.Commands.add("openPropertyPane", (widgetType) => {
  const selector = `.t--draggable-${widgetType}`;
  cy.get(selector)
    .first()
@ -1585,13 +1576,13 @@ Cypress.Commands.add("closePropertyPane", () => {
 Cypress.Commands.add("createAndFillApi", (url, parameters) => {
  cy.NavigateToApiEditor();
  cy.testCreateApiButton();
-  cy.get("@createNewApi").then(response => {
+  cy.get("@createNewApi").then((response) => {
    cy.get(ApiEditor.ApiNameField).should("be.visible");
    cy.expect(response.response.body.responseMeta.success).to.eq(true);
    cy.get(ApiEditor.ApiNameField)
      .click()
      .invoke("text")
-      .then(text => {
+      .then((text) => {
        const someText = text;
        expect(someText).to.equal(response.response.body.data.name);
      });
@ -1612,7 +1603,7 @@ Cypress.Commands.add("createAndFillApi", (url, parameters) => {
  cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled");
 });

-Cypress.Commands.add("isSelectRow", index => {
+Cypress.Commands.add("isSelectRow", (index) => {
  cy.get(
    '.tbody .td[data-rowindex="' + index + '"][data-colindex="' + 0 + '"]',
  ).click({ force: true });
@ -1640,13 +1631,13 @@ Cypress.Commands.add("setDate", (date, dateFormate) => {
  cy.get(sel).click();
 });

-Cypress.Commands.add("pageNo", index => {
+Cypress.Commands.add("pageNo", (index) => {
  cy.get(".page-item")
    .first()
    .click({ force: true });
 });

-Cypress.Commands.add("pageNoValidate", index => {
+Cypress.Commands.add("pageNoValidate", (index) => {
  const data = '.e-numericcontainer a[index="' + index + '"]';
  const pageVal = cy.get(data);
  return pageVal;
@ -1661,7 +1652,7 @@ Cypress.Commands.add("validateEnableWidget", (widgetCss, disableCss) => {
 });

 Cypress.Commands.add("validateHTMLText", (widgetCss, htmlTag, value) => {
-  cy.get(widgetCss + " iframe").then($iframe => {
+  cy.get(widgetCss + " iframe").then(($iframe) => {
    const $body = $iframe.contents().find("body");
    cy.wrap($body)
      .find(htmlTag)
@ -1670,6 +1661,7 @@ Cypress.Commands.add("validateHTMLText", (widgetCss, htmlTag, value) => {
 });

 Cypress.Commands.add("startServerAndRoutes", () => {
+  //To update route with intercept after working on alias wrt wait and alias
  cy.server();
  cy.route("GET", "/api/v1/applications/new").as("applications");
  cy.route("GET", "/api/v1/users/profile").as("getUser");
@ -1747,7 +1739,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
  cy.route("DELETE", "/api/v1/organizations/*/logo").as("deleteLogo");
 });

-Cypress.Commands.add("alertValidate", text => {
+Cypress.Commands.add("alertValidate", (text) => {
  cy.get(commonlocators.success)
    .should("be.visible")
    .and("have.text", text);
@ -1777,7 +1769,7 @@ Cypress.Commands.add("scrollTabledataPublish", (rowNum, colNum) => {
  return tabVal;
 });

-Cypress.Commands.add("assertEvaluatedValuePopup", expectedType => {
+Cypress.Commands.add("assertEvaluatedValuePopup", (expectedType) => {
  cy.get(dynamicInputLocators.evaluatedValue)
    .should("be.visible")
    .children("p")
@ -1787,7 +1779,7 @@ Cypress.Commands.add("assertEvaluatedValuePopup", expectedType => {
    .should("have.text", expectedType);
 });

-Cypress.Commands.add("validateToastMessage", value => {
+Cypress.Commands.add("validateToastMessage", (value) => {
  cy.get(commonlocators.toastMsg).should("have.text", value);
 });

@ -1802,23 +1794,23 @@ Cypress.Commands.add("NavigateToPaginationTab", () => {
    .type("{enter}");
 });

-Cypress.Commands.add("ValidateTableData", value => {
+Cypress.Commands.add("ValidateTableData", (value) => {
  // cy.isSelectRow(0);
-  cy.readTabledata("0", "0").then(tabData => {
+  cy.readTabledata("0", "0").then((tabData) => {
    const tableData = tabData;
    expect(tableData).to.equal(value.toString());
  });
 });

-Cypress.Commands.add("ValidatePublishTableData", value => {
+Cypress.Commands.add("ValidatePublishTableData", (value) => {
  cy.isSelectRow(0);
-  cy.readTabledataPublish("0", "0").then(tabData => {
+  cy.readTabledataPublish("0", "0").then((tabData) => {
    const tableData = tabData;
    expect(tableData).to.equal(value);
  });
 });

-Cypress.Commands.add("ValidatePaginateResponseUrlData", runTestCss => {
+Cypress.Commands.add("ValidatePaginateResponseUrlData", (runTestCss) => {
  cy.SearchEntityandOpen("Api2");
  cy.NavigateToPaginationTab();
  cy.RunAPI();
@ -1832,7 +1824,7 @@ Cypress.Commands.add("ValidatePaginateResponseUrlData", runTestCss => {
    .contains("name")
    .siblings("span")
    .invoke("text")
-    .then(tabData => {
+    .then((tabData) => {
      const respBody = tabData.match(/"(.*)"/)[0];
      localStorage.setItem("respBody", respBody);
      cy.log(respBody);
@ -1840,7 +1832,7 @@ Cypress.Commands.add("ValidatePaginateResponseUrlData", runTestCss => {
      // cy.openPropertyPane("tablewidget");
      // cy.testJsontext("tabledata", "{{Api2.data.results}}");
      cy.isSelectRow(0);
-      cy.readTabledata("0", "1").then(tabData => {
+      cy.readTabledata("0", "1").then((tabData) => {
        const tableData = tabData;
        expect(`\"${tableData}\"`).to.equal(respBody);
      });
@ -1849,13 +1841,13 @@ Cypress.Commands.add("ValidatePaginateResponseUrlData", runTestCss => {

 Cypress.Commands.add("ValidatePaginationInputData", () => {
  cy.isSelectRow(0);
-  cy.readTabledataPublish("0", "1").then(tabData => {
+  cy.readTabledataPublish("0", "1").then((tabData) => {
    const tableData = tabData;
    expect(`\"${tableData}\"`).to.equal(localStorage.getItem("respBody"));
  });
 });

-Cypress.Commands.add("callApi", apiname => {
+Cypress.Commands.add("callApi", (apiname) => {
  cy.get(commonlocators.callApi)
    .first()
    .click();
--- a/app/client/package.json
+++ b/app/client/package.json
@ -8,12 +8,13 @@
  },
  "cracoConfig": "craco.dev.config.js",
  "dependencies": {
-    "@blueprintjs/core": "^3.18.1",
+    "@blueprintjs/core": "^3.36.0",
    "@blueprintjs/datetime": "^3.14.0",
    "@blueprintjs/icons": "^3.10.0",
    "@blueprintjs/select": "^3.10.0",
    "@blueprintjs/timezone": "^3.6.0",
    "@craco/craco": "^5.7.0",
+    "@github/g-emoji-element": "^1.1.5",
    "@manaflair/redux-batch": "^1.0.0",
    "@optimizely/optimizely-sdk": "^4.0.0",
    "@sentry/react": "^5.24.2",
@ -44,12 +45,13 @@
    "@uppy/webcam": "^1.3.1",
    "@welldone-software/why-did-you-render": "^4.2.5",
    "algoliasearch": "^4.2.0",
-    "axios": "^0.18.0",
+    "axios": "^0.21.1",
    "chance": "^1.1.3",
    "codemirror": "^5.55.0",
    "copy-to-clipboard": "^3.3.1",
    "craco-alias": "^2.1.1",
    "cypress-log-to-output": "^1.1.2",
+    "deep-diff": "^1.0.2",
    "downloadjs": "^1.4.7",
    "eslint": "^7.11.0",
    "fast-deep-equal": "^3.1.1",
@ -166,6 +168,7 @@
    "@testing-library/jest-dom": "^5.11.4",
    "@testing-library/react": "^11.0.4",
    "@types/codemirror": "^0.0.96",
+    "@types/deep-diff": "^1.0.0",
    "@types/downloadjs": "^1.4.2",
    "@types/jest": "^24.0.22",
    "@types/react-beautiful-dnd": "^11.0.4",
@ -181,7 +184,7 @@
    "babel-loader": "^8.1.0",
    "babel-plugin-styled-components": "^1.10.7",
    "craco-babel-loader": "^0.1.4",
-    "cypress": "5.3.0",
+    "cypress": "6.2.1",
    "cypress-file-upload": "^4.1.1",
    "cypress-multi-reporters": "^1.2.4",
    "cypress-xpath": "^1.4.0",
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@ -160,7 +160,6 @@
    };

  </script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.4.0/tinymce.min.js" referrerpolicy="origin"></script>
 </body>

 </html>
--- a/app/client/src/actions/actionActions.ts
+++ b/app/client/src/actions/actionActions.ts
@ -7,9 +7,7 @@ import {
 import { Action } from "entities/Action";
 import { batchAction } from "actions/batchActions";

-export const createActionRequest = (
-  payload: Partial<Action> & { eventData: any },
-) => {
+export const createActionRequest = (payload: Partial<Action>) => {
  return {
    type: ReduxActionTypes.CREATE_ACTION_INIT,
    payload,
--- a/app/client/src/actions/datasourceActions.ts
+++ b/app/client/src/actions/datasourceActions.ts
@ -1,5 +1,6 @@
 import { ReduxAction, ReduxActionTypes } from "constants/ReduxActionConstants";
-import { CreateDatasourceConfig, Datasource } from "api/DatasourcesApi";
+import { CreateDatasourceConfig } from "api/DatasourcesApi";
+import { Datasource } from "entities/Datasource";

 export const createDatasourceFromForm = (payload: CreateDatasourceConfig) => {
  return {
--- a/app/client/src/actions/queryPaneActions.ts
+++ b/app/client/src/actions/queryPaneActions.ts
@ -1,7 +1,7 @@
 import { ReduxActionTypes, ReduxAction } from "constants/ReduxActionConstants";
-import { RestAction } from "entities/Action";
+import { Action } from "entities/Action";

-export const createQueryRequest = (payload: Partial<RestAction>) => {
+export const createQueryRequest = (payload: Partial<Action>) => {
  return {
    type: ReduxActionTypes.CREATE_QUERY_INIT,
    payload,
--- a/app/client/src/actions/releasesActions.ts
+++ b/app/client/src/actions/releasesActions.ts
@ -0,0 +1,5 @@
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+
+export const resetReleasesCount = () => ({
+  type: ReduxActionTypes.RESET_UNREAD_RELEASES_COUNT,
+});
--- a/app/client/src/actions/widgetActions.tsx
+++ b/app/client/src/actions/widgetActions.tsx
@ -23,10 +23,12 @@ export const executeAction = (

 export const executeActionError = (
  executeErrorPayload: ExecuteErrorPayload,
-): ReduxAction<ExecuteErrorPayload> => ({
-  type: ReduxActionErrorTypes.EXECUTE_ACTION_ERROR,
-  payload: executeErrorPayload,
-});
+): ReduxAction<ExecuteErrorPayload> => {
+  return {
+    type: ReduxActionErrorTypes.EXECUTE_ACTION_ERROR,
+    payload: executeErrorPayload,
+  };
+};

 export const executePageLoadActions = (
  payload: PageAction[][],
--- a/app/client/src/api/ActionAPI.tsx
+++ b/app/client/src/api/ActionAPI.tsx
@ -5,7 +5,7 @@ import {
  DEFAULT_EXECUTE_ACTION_TIMEOUT_MS,
 } from "constants/ApiConstants";
 import axios, { AxiosPromise, CancelTokenSource } from "axios";
-import { Action, RestAction } from "entities/Action";
+import { Action } from "entities/Action";

 export interface CreateActionRequest<T> extends APIRequest {
  datasourceId: string;
@ -78,7 +78,7 @@ export interface ActionApiResponse {
 }

 export interface ActionResponse {
-  body: Record<string, unknown>;
+  body: unknown;
  headers: Record<string, string[]>;
  request?: ActionApiResponseReq;
  statusCode: string;
@ -88,12 +88,12 @@ export interface ActionResponse {
 }

 export interface MoveActionRequest {
-  action: RestAction;
+  action: Action;
  destinationPageId: string;
 }

 export interface CopyActionRequest {
-  action: RestAction;
+  action: Action;
  pageId: string;
 }

@ -109,7 +109,7 @@ class ActionAPI extends API {
  static apiUpdateCancelTokenSource: CancelTokenSource;
  static queryUpdateCancelTokenSource: CancelTokenSource;

-  static fetchAPI(id: string): AxiosPromise<GenericApiResponse<RestAction>> {
+  static fetchAPI(id: string): AxiosPromise<GenericApiResponse<Action>> {
    return API.get(`${ActionAPI.url}/${id}`);
  }

@ -121,30 +121,33 @@ class ActionAPI extends API {

  static fetchActions(
    applicationId: string,
-  ): AxiosPromise<GenericApiResponse<RestAction[]>> {
+  ): AxiosPromise<GenericApiResponse<Action[]>> {
    return API.get(ActionAPI.url, { applicationId });
  }

  static fetchActionsForViewMode(
    applicationId: string,
-  ): AxiosPromise<GenericApiResponse<RestAction[]>> {
+  ): AxiosPromise<GenericApiResponse<Action[]>> {
    return API.get(`${ActionAPI.url}/view`, { applicationId });
  }

  static fetchActionsByPageId(
    pageId: string,
-  ): AxiosPromise<GenericApiResponse<RestAction[]>> {
+  ): AxiosPromise<GenericApiResponse<Action[]>> {
    return API.get(ActionAPI.url, { pageId });
  }

  static updateAPI(
-    apiConfig: Partial<RestAction>,
+    apiConfig: Partial<Action>,
  ): AxiosPromise<ActionCreateUpdateResponse> {
    if (ActionAPI.apiUpdateCancelTokenSource) {
      ActionAPI.apiUpdateCancelTokenSource.cancel();
    }
    ActionAPI.apiUpdateCancelTokenSource = axios.CancelToken.source();
-    return API.put(`${ActionAPI.url}/${apiConfig.id}`, apiConfig, undefined, {
+    const action = Object.assign({}, apiConfig);
+    // While this line is not required, name can not be changed from this endpoint
+    delete action.name;
+    return API.put(`${ActionAPI.url}/${action.id}`, action, undefined, {
      cancelToken: ActionAPI.apiUpdateCancelTokenSource.token,
    });
  }
--- a/app/client/src/api/Api.tsx
+++ b/app/client/src/api/Api.tsx
@ -9,7 +9,7 @@ import { ActionApiResponse } from "./ActionAPI";
 import { AUTH_LOGIN_URL } from "constants/routes";
 import history from "utils/history";
 import { convertObjectToQueryParams } from "utils/AppsmithUtils";
-import { SERVER_API_TIMEOUT_ERROR } from "../constants/messages";
+import { ERROR_500, SERVER_API_TIMEOUT_ERROR } from "../constants/messages";

 //TODO(abhinav): Refactor this to make more composable.
 export const apiRequestConfig = {
@ -71,15 +71,16 @@ axiosInstance.interceptors.response.use(
        code: ERROR_CODES.REQUEST_TIMEOUT,
      });
    }
-    if (error.response.status === API_STATUS_CODES.SERVER_ERROR) {
-      return Promise.reject({
-        ...error,
-        crash: true,
-        code: ERROR_CODES.REQUEST_TIMEOUT,
-        message: SERVER_API_TIMEOUT_ERROR,
-      });
-    }
+
    if (error.response) {
+      if (error.response.status === API_STATUS_CODES.SERVER_ERROR) {
+        return Promise.reject({
+          ...error,
+          code: ERROR_CODES.SERVER_ERROR,
+          message: ERROR_500,
+        });
+      }
+
      // The request was made and the server responded with a status code
      // that falls out of the range of 2xx
      // console.log(error.response.data);
@ -91,7 +92,7 @@ axiosInstance.interceptors.response.use(
          // Redirect to login and set a redirect url.
          history.replace({
            pathname: AUTH_LOGIN_URL,
-            search: `redirectTo=${currentUrl}`,
+            search: `redirectUrl=${currentUrl}`,
          });
          return Promise.reject({
            code: ERROR_CODES.REQUEST_NOT_AUTHORISED,
--- a/app/client/src/api/ApplicationApi.tsx
+++ b/app/client/src/api/ApplicationApi.tsx
@ -106,6 +106,8 @@ export interface FetchUsersApplicationsOrgsResponse extends ApiResponse {
  data: {
    organizationApplications: Array<OrganizationApplicationObject>;
    user: string;
+    newReleasesCount: string;
+    releaseItems: Array<Record<string, any>>;
  };
 }

--- a/app/client/src/api/DatasourcesApi.ts
+++ b/app/client/src/api/DatasourcesApi.ts
@ -1,59 +1,9 @@
+import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "constants/ApiConstants";
 import API from "./Api";
 import { GenericApiResponse } from "./ApiResponses";
 import { AxiosPromise } from "axios";
-import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "constants/ApiConstants";
-import { Property } from "entities/Action";
-
-interface DatasourceAuthentication {
-  authType?: string;
-  username?: string;
-  password?: string;
-}
-
-export interface QueryTemplate {
-  title: string;
-  body: string;
-}
-
-export interface DatasourceColumns {
-  name: string;
-  type: string;
-}
-
-export interface DatasourceKeys {
-  name: string;
-  type: string;
-}
-
-export interface DatasourceTable {
-  type: string;
-  name: string;
-  columns: DatasourceColumns[];
-  keys: DatasourceKeys[];
-  templates: QueryTemplate[];
-}
-
-export interface DatasourceStructure {
-  tables?: DatasourceTable[];
-}
-
-export interface Datasource {
-  id: string;
-  name: string;
-  pluginId: string;
-  organizationId?: string;
-  datasourceConfiguration: {
-    url: string;
-    authentication?: DatasourceAuthentication;
-    properties?: Record<string, string>;
-    headers?: Property[];
-    databaseName?: string;
-  };
-  invalids?: string[];
-  isValid?: boolean;
-  structure?: DatasourceStructure;
-}

+import { DatasourceAuthentication, Datasource } from "entities/Datasource";
 export interface CreateDatasourceConfig {
  name: string;
  pluginId: string;
@ -66,6 +16,15 @@ export interface CreateDatasourceConfig {
  appName?: string;
 }

+export interface EmbeddedRestDatasourceRequest {
+  datasourceConfiguration: { url: string };
+  invalids: Array<string>;
+  isValid: boolean;
+  name: string;
+  organizationId: string;
+  pluginId: string;
+}
+
 class DatasourcesApi extends API {
  static url = "v1/datasources";

--- a/app/client/src/api/ReleasesAPI.tsx
+++ b/app/client/src/api/ReleasesAPI.tsx
@ -0,0 +1,13 @@
+import { AxiosPromise } from "axios";
+import Api from "./Api";
+import { ApiResponse } from "./ApiResponses";
+
+class ReleasesAPI extends Api {
+  static markAsReadURL = `v1/users/setReleaseNotesViewed`;
+
+  static markAsRead(): AxiosPromise<ApiResponse> {
+    return Api.put(ReleasesAPI.markAsReadURL);
+  }
+}
+
+export default ReleasesAPI;
--- a/app/client/src/assets/icons/ads/app-icons/airplane.svg
+++ b/app/client/src/assets/icons/ads/app-icons/airplane.svg
@ -1,6 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M34.444 28.0786L45.6073 48H26.8573V43.6666H22.6906V48H6.02393L15.4377 28.4656C15.8124 28.8854 16.2096 29.2846 16.6276 29.6614C19.1185 31.9086 22.1638 33.25 24.7739 33.25C27.3841 33.25 30.4294 31.9086 32.9203 29.6614C33.4655 29.171 33.9747 28.6421 34.444 28.0786ZM22.6906 35.3333V41.5833H26.8573V35.3333H22.6906Z" fill="white"/>
-<circle opacity="0.6" cx="39.3573" cy="22.8333" r="2.08333" fill="white"/>
-<circle opacity="0.6" cx="10.1903" cy="22.8333" r="2.08333" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.7156 10.5174C30.1496 11.175 33.0272 13.5062 34.3831 16.7289L49.5479 18.6878L48.9589 20.7289H35.1904V20.75C35.1904 26.5 28.8883 31.1667 24.7737 31.1667C20.6591 31.1667 14.357 26.5 14.357 20.75V20.7289H0.589063L0 18.6878L15.1643 16.7289C16.5204 13.5059 19.3985 11.1747 22.8328 10.5174L22.8466 10.3333H18.5237V8.25L23.1177 6.71875L23.4716 2H26.0758L26.4297 6.71875L31.0237 8.25V10.3333H26.7008L26.7156 10.5174ZM24.7737 20.75L31.0237 18.6667V14.5L24.7737 16.5833L18.5237 14.5V18.6667L24.7737 20.75Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M34.444 28.0786L45.6073 48H26.8573V43.6666H22.6906V48H6.02393L15.4377 28.4656C15.8124 28.8854 16.2096 29.2846 16.6276 29.6614C19.1185 31.9086 22.1638 33.25 24.7739 33.25C27.3841 33.25 30.4294 31.9086 32.9203 29.6614C33.4655 29.171 33.9747 28.6421 34.444 28.0786ZM22.6906 35.3333V41.5833H26.8573V35.3333H22.6906Z" clip-rule="evenodd" opacity=".6"/><circle cx="39.357" cy="22.833" r="2.083" fill="#fff" opacity=".6"/><circle cx="10.19" cy="22.833" r="2.083" fill="#fff" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M26.7156 10.5174C30.1496 11.175 33.0272 13.5062 34.3831 16.7289L49.5479 18.6878L48.9589 20.7289H35.1904V20.75C35.1904 26.5 28.8883 31.1667 24.7737 31.1667C20.6591 31.1667 14.357 26.5 14.357 20.75V20.7289H0.589063L0 18.6878L15.1643 16.7289C16.5204 13.5059 19.3985 11.1747 22.8328 10.5174L22.8466 10.3333H18.5237V8.25L23.1177 6.71875L23.4716 2H26.0758L26.4297 6.71875L31.0237 8.25V10.3333H26.7008L26.7156 10.5174ZM24.7737 20.75L31.0237 18.6667V14.5L24.7737 16.5833L18.5237 14.5V18.6667L24.7737 20.75Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/alien.svg
+++ b/app/client/src/assets/icons/ads/app-icons/alien.svg
@ -1,3 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M39.372 8.38758C43.9732 12.525 45.6914 18.7873 45.2011 24.9557L44.7957 30.0557C44.7957 30.0557 42.6948 31.9816 41.5276 32.7038C38.026 41.1297 30.3775 49.0742 24.5415 49.0742C18.9389 49.0742 11.057 41.1297 7.55538 32.9445C6.38817 31.9816 4.2872 30.2964 4.2872 30.2964L3.86821 24.9385C3.38665 18.7804 5.10572 12.5315 9.69738 8.39981C13.8015 4.70683 19.2865 0.926025 24.5415 0.926025C29.7907 0.926025 35.2693 4.69848 39.372 8.38758ZM9.60127 18.0186C7.5003 20.1853 7.96718 24.2779 10.3016 26.6853C12.4026 28.8519 16.8379 31.0186 19.8727 31.0186C20.8064 31.0186 21.5067 30.7779 21.7402 30.5371C21.9736 30.0557 22.4405 28.8519 22.2071 27.889C21.9736 25.2408 20.1061 20.9075 18.0051 18.7408C16.6045 17.2964 12.8694 15.1297 9.60127 18.0186ZM22.2071 41.8519L19.8727 39.4445L22.2071 39.3299H26.8759L29.2103 39.4445L26.8759 41.8519H22.2071ZM29.2103 31.0186C32.4785 31.0186 36.9138 28.8519 38.7814 26.6853C41.1158 24.2779 41.5827 20.1853 39.4817 18.0186C36.2135 15.3705 32.245 17.2964 31.0778 18.9816C27.3428 23.5557 26.8759 27.4075 26.8759 28.1297C26.6424 29.0927 27.1093 30.2964 27.3428 30.5371C27.8096 30.7779 28.2765 31.0186 29.2103 31.0186Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M39.372 8.38758C43.9732 12.525 45.6914 18.7873 45.2011 24.9557L44.7957 30.0557C44.7957 30.0557 42.6948 31.9816 41.5276 32.7038C38.026 41.1297 30.3775 49.0742 24.5415 49.0742C18.9389 49.0742 11.057 41.1297 7.55538 32.9445C6.38817 31.9816 4.2872 30.2964 4.2872 30.2964L3.86821 24.9385C3.38665 18.7804 5.10572 12.5315 9.69738 8.39981C13.8015 4.70683 19.2865 0.926025 24.5415 0.926025C29.7907 0.926025 35.2693 4.69848 39.372 8.38758ZM9.60127 18.0186C7.5003 20.1853 7.96718 24.2779 10.3016 26.6853C12.4026 28.8519 16.8379 31.0186 19.8727 31.0186C20.8064 31.0186 21.5067 30.7779 21.7402 30.5371C21.9736 30.0557 22.4405 28.8519 22.2071 27.889C21.9736 25.2408 20.1061 20.9075 18.0051 18.7408C16.6045 17.2964 12.8694 15.1297 9.60127 18.0186ZM22.2071 41.8519L19.8727 39.4445L22.2071 39.3299H26.8759L29.2103 39.4445L26.8759 41.8519H22.2071ZM29.2103 31.0186C32.4785 31.0186 36.9138 28.8519 38.7814 26.6853C41.1158 24.2779 41.5827 20.1853 39.4817 18.0186C36.2135 15.3705 32.245 17.2964 31.0778 18.9816C27.3428 23.5557 26.8759 27.4075 26.8759 28.1297C26.6424 29.0927 27.1093 30.2964 27.3428 30.5371C27.8096 30.7779 28.2765 31.0186 29.2103 31.0186Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/bar-graph.svg
+++ b/app/client/src/assets/icons/ads/app-icons/bar-graph.svg
@ -1,6 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 46.9607V12.7583H49.2514V46.9607H0ZM16.7455 27.4312H11.8203V39.4312H16.7455V27.4312ZM22.6556 20.4312H27.5808V39.4312H22.6556V20.4312ZM38.4161 26.4312H33.4909V39.4312H38.4161V26.4312Z" fill="white"/>
-<path opacity="0.6" d="M49.2514 10.338V3H0V10.338H49.2514Z" fill="white"/>
-<circle cx="4.43262" cy="6.79907" r="1.47754" fill="white"/>
-<circle cx="9.35791" cy="6.79907" r="1.47754" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M0 46.9607V12.7583H49.2514V46.9607H0ZM16.7455 27.4312H11.8203V39.4312H16.7455V27.4312ZM22.6556 20.4312H27.5808V39.4312H22.6556V20.4312ZM38.4161 26.4312H33.4909V39.4312H38.4161V26.4312Z" clip-rule="evenodd"/><path fill="#fff" d="M49.2514 10.338V3H0V10.338H49.2514Z" opacity=".6"/><circle cx="4.433" cy="6.799" r="1.478" fill="#fff"/><circle cx="9.358" cy="6.799" r="1.478" fill="#fff"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/basketball.svg
+++ b/app/client/src/assets/icons/ads/app-icons/basketball.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="9" y="2" width="41" height="7" rx="3.5" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3835 17V31.4304H22.6591C22.8125 27.7156 23.8387 24.0987 25.6571 20.8727C23.1565 18.6479 19.9308 17.2226 16.3835 17ZM3.72402 22.325C5.21035 25.1318 6.05635 28.2404 6.2 31.4304H0C0.217578 27.9624 1.58428 24.8012 3.72402 22.325ZM6.2 33.3835H0C0.217578 36.8514 1.58428 40.0126 3.72402 42.4888C5.21035 39.682 6.05635 36.5734 6.2 33.3835ZM24.614 33.3835C24.7576 36.5734 25.6036 39.682 27.0899 42.4888C29.2297 40.0126 30.5963 36.8514 30.814 33.3835H24.614ZM14.4304 31.4304H8.15488C8.00146 27.7157 6.97529 24.0987 5.15684 20.8727C7.65742 18.6479 10.8832 17.2226 14.4304 17V31.4304ZM14.4304 33.3835H8.15488C8.00146 37.0981 6.97529 40.715 5.15674 43.9411C7.65742 46.1658 10.8831 47.5913 14.4304 47.8139V33.3835ZM16.3836 33.3835H22.6591C22.8125 37.0981 23.8387 40.715 25.6572 43.9411C23.1566 46.1658 19.9309 47.5913 16.3836 47.8139V33.3835ZM27.0898 22.325C25.6035 25.1318 24.7575 28.2404 24.6139 31.4304H30.8139C30.5963 27.9624 29.2297 24.8012 27.0898 22.325Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M12.9692 15.1817L12.3169 11H22.0002V16.2469C19.9906 15.4425 17.7971 15 15.5002 15C14.6407 15 13.7956 15.062 12.9692 15.1817ZM30.1996 23H33.0002V11H24.0002V17.1993C26.5113 18.5973 28.6425 20.5955 30.1996 23ZM35.0002 23H37.7193C40.691 23 43.215 20.8247 43.6536 17.8856L44.6812 11H35.0002V23Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><rect width="41" height="7" x="9" y="2" fill="#fff" rx="3.5"/><path fill="#fff" fill-rule="evenodd" d="M16.3835 17V31.4304H22.6591C22.8125 27.7156 23.8387 24.0987 25.6571 20.8727C23.1565 18.6479 19.9308 17.2226 16.3835 17ZM3.72402 22.325C5.21035 25.1318 6.05635 28.2404 6.2 31.4304H0C0.217578 27.9624 1.58428 24.8012 3.72402 22.325ZM6.2 33.3835H0C0.217578 36.8514 1.58428 40.0126 3.72402 42.4888C5.21035 39.682 6.05635 36.5734 6.2 33.3835ZM24.614 33.3835C24.7576 36.5734 25.6036 39.682 27.0899 42.4888C29.2297 40.0126 30.5963 36.8514 30.814 33.3835H24.614ZM14.4304 31.4304H8.15488C8.00146 27.7157 6.97529 24.0987 5.15684 20.8727C7.65742 18.6479 10.8832 17.2226 14.4304 17V31.4304ZM14.4304 33.3835H8.15488C8.00146 37.0981 6.97529 40.715 5.15674 43.9411C7.65742 46.1658 10.8831 47.5913 14.4304 47.8139V33.3835ZM16.3836 33.3835H22.6591C22.8125 37.0981 23.8387 40.715 25.6572 43.9411C23.1566 46.1658 19.9309 47.5913 16.3836 47.8139V33.3835ZM27.0898 22.325C25.6035 25.1318 24.7575 28.2404 24.6139 31.4304H30.8139C30.5963 27.9624 29.2297 24.8012 27.0898 22.325Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M12.9692 15.1817L12.3169 11H22.0002V16.2469C19.9906 15.4425 17.7971 15 15.5002 15C14.6407 15 13.7956 15.062 12.9692 15.1817ZM30.1996 23H33.0002V11H24.0002V17.1993C26.5113 18.5973 28.6425 20.5955 30.1996 23ZM35.0002 23H37.7193C40.691 23 43.215 20.8247 43.6536 17.8856L44.6812 11H35.0002V23Z" clip-rule="evenodd" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/bicycle.svg
+++ b/app/client/src/assets/icons/ads/app-icons/bicycle.svg
@ -1,5 +1 @@
-<svg width="56" height="36" viewBox="0 0 56 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M43.221 11.7941L40.9879 1.23233C40.836 0.514062 40.2023 0 39.468 0H35.1167V1.55362V3.10724H38.2085L39.5201 9.31067H6.25049V12.5042C7.63742 12.023 9.1271 11.7615 10.6779 11.7615C12.1334 11.7615 13.5351 11.9918 14.8485 12.418H39.9962C41.0227 12.0849 42.1031 11.8715 43.221 11.7941ZM33.0931 17.5378L23.7438 21.8528C24.0121 22.8841 24.1616 23.9635 24.1766 25.0753L31.093 21.8831C31.4998 20.3044 32.185 18.8374 33.0931 17.5378Z" fill="white"/>
-<path d="M16.3078 4.48047H10.3047V6.03409V7.58771H16.3078V6.03409V4.48047Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 35.9578C17.0751 35.9578 22 31.0329 22 24.9578C22 18.8826 17.0751 13.9578 11 13.9578C4.92487 13.9578 0 18.8826 0 24.9578C0 31.0329 4.92487 35.9578 11 35.9578ZM11 32.9578C15.4183 32.9578 19 29.376 19 24.9578C19 20.5395 15.4183 16.9578 11 16.9578C6.58172 16.9578 3 20.5395 3 24.9578C3 29.376 6.58172 32.9578 11 32.9578ZM55.0265 24.9915C55.0265 31.0667 50.1016 35.9915 44.0265 35.9915C37.9513 35.9915 33.0265 31.0667 33.0265 24.9915C33.0265 18.9164 37.9513 13.9915 44.0265 13.9915C50.1016 13.9915 55.0265 18.9164 55.0265 24.9915ZM44.0265 32.9915C48.4447 32.9915 52.0265 29.4098 52.0265 24.9915C52.0265 20.5733 48.4447 16.9915 44.0265 16.9915C39.6082 16.9915 36.0265 20.5733 36.0265 24.9915C36.0265 29.4098 39.6082 32.9915 44.0265 32.9915Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="56" height="36" fill="none" viewBox="0 0 56 36"><path fill="#fff" fill-rule="evenodd" d="M43.221 11.7941L40.9879 1.23233C40.836 0.514062 40.2023 0 39.468 0H35.1167V1.55362V3.10724H38.2085L39.5201 9.31067H6.25049V12.5042C7.63742 12.023 9.1271 11.7615 10.6779 11.7615C12.1334 11.7615 13.5351 11.9918 14.8485 12.418H39.9962C41.0227 12.0849 42.1031 11.8715 43.221 11.7941ZM33.0931 17.5378L23.7438 21.8528C24.0121 22.8841 24.1616 23.9635 24.1766 25.0753L31.093 21.8831C31.4998 20.3044 32.185 18.8374 33.0931 17.5378Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" d="M16.3078 4.48047H10.3047V6.03409V7.58771H16.3078V6.03409V4.48047Z"/><path fill="#fff" fill-rule="evenodd" d="M11 35.9578C17.0751 35.9578 22 31.0329 22 24.9578C22 18.8826 17.0751 13.9578 11 13.9578C4.92487 13.9578 0 18.8826 0 24.9578C0 31.0329 4.92487 35.9578 11 35.9578ZM11 32.9578C15.4183 32.9578 19 29.376 19 24.9578C19 20.5395 15.4183 16.9578 11 16.9578C6.58172 16.9578 3 20.5395 3 24.9578C3 29.376 6.58172 32.9578 11 32.9578ZM55.0265 24.9915C55.0265 31.0667 50.1016 35.9915 44.0265 35.9915C37.9513 35.9915 33.0265 31.0667 33.0265 24.9915C33.0265 18.9164 37.9513 13.9915 44.0265 13.9915C50.1016 13.9915 55.0265 18.9164 55.0265 24.9915ZM44.0265 32.9915C48.4447 32.9915 52.0265 29.4098 52.0265 24.9915C52.0265 20.5733 48.4447 16.9915 44.0265 16.9915C39.6082 16.9915 36.0265 20.5733 36.0265 24.9915C36.0265 29.4098 39.6082 32.9915 44.0265 32.9915Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/bird.svg
+++ b/app/client/src/assets/icons/ads/app-icons/bird.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M47.7275 11.704H46.1895V8.68506H47.7275C48.5611 8.68506 49.237 9.36091 49.237 10.1945C49.237 11.0282 48.5611 11.704 47.7275 11.704Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6407 5.89963L28.6385 5.90231L28.6407 5.89953L30.9729 3.0987C32.6077 1.13532 35.0304 0 37.5853 0C42.3374 0 46.1898 3.85232 46.1898 8.60452V20.6183C46.1898 40.7401 21.5283 39.9743 21.2275 39.9642H21.2754C25.6757 37.4763 28.6407 32.1996 28.6407 27.0645V5.89963ZM38.0985 11.1788C39.2031 11.1788 40.0985 10.2834 40.0985 9.17885C40.0985 8.07428 39.2031 7.17885 38.0985 7.17885C36.9939 7.17885 36.0985 8.07428 36.0985 9.17885C36.0985 10.2834 36.9939 11.1788 38.0985 11.1788Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M26.635 8.30811V26.6849C26.0534 32.5331 22.776 37.4763 18.3757 39.9642H0.149414L26.635 8.30811ZM16.7819 29.6623C17.3337 29.0376 18.2877 28.9785 18.9126 29.5304C19.5373 30.0822 19.5965 31.0361 19.0446 31.6609L11.7102 39.9641H7.72139C7.77053 39.8797 7.82827 39.7987 7.89538 39.7227L16.7819 29.6623Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M47.7275 11.704H46.1895V8.68506H47.7275C48.5611 8.68506 49.237 9.36091 49.237 10.1945C49.237 11.0282 48.5611 11.704 47.7275 11.704Z"/><path fill="#fff" fill-rule="evenodd" d="M28.6407 5.89963L28.6385 5.90231L28.6407 5.89953L30.9729 3.0987C32.6077 1.13532 35.0304 0 37.5853 0C42.3374 0 46.1898 3.85232 46.1898 8.60452V20.6183C46.1898 40.7401 21.5283 39.9743 21.2275 39.9642H21.2754C25.6757 37.4763 28.6407 32.1996 28.6407 27.0645V5.89963ZM38.0985 11.1788C39.2031 11.1788 40.0985 10.2834 40.0985 9.17885C40.0985 8.07428 39.2031 7.17885 38.0985 7.17885C36.9939 7.17885 36.0985 8.07428 36.0985 9.17885C36.0985 10.2834 36.9939 11.1788 38.0985 11.1788Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M26.635 8.30811V26.6849C26.0534 32.5331 22.776 37.4763 18.3757 39.9642H0.149414L26.635 8.30811ZM16.7819 29.6623C17.3337 29.0376 18.2877 28.9785 18.9126 29.5304C19.5373 30.0822 19.5965 31.0361 19.0446 31.6609L11.7102 39.9641H7.72139C7.77053 39.8797 7.82827 39.7987 7.89538 39.7227L16.7819 29.6623Z" clip-rule="evenodd" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/bitcoin.svg
+++ b/app/client/src/assets/icons/ads/app-icons/bitcoin.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.3542 50.0001C33.1477 50.0001 42.7083 40.4395 42.7083 28.6459C42.7083 16.8523 33.1477 7.29175 21.3542 7.29175C9.56059 7.29175 0 16.8523 0 28.6459C0 40.4395 9.56059 50.0001 21.3542 50.0001ZM27.6431 30.1616C27.3379 29.6421 26.9343 29.2385 26.4191 28.9508C26.0637 28.7463 25.5474 28.5537 24.877 28.3842C25.5014 28.1709 26.0133 27.9041 26.3917 27.5738C26.7777 27.2512 27.0697 26.8717 27.2676 26.4463C27.4699 26.0209 27.5716 25.5714 27.5683 25.0978C27.5693 24.447 27.3801 23.8488 26.9994 23.2997C26.6155 22.7561 26.0664 22.3383 25.3489 22.0451C25.0766 21.9346 24.7463 21.8471 24.3853 21.7771L24.3895 19.2462L21.956 19.2449L21.9573 21.6106L20.3933 21.6105L20.3942 19.247L17.9618 19.2468L17.962 21.6092L14.2467 21.61L14.2491 23.5983L14.8145 23.5973C15.1951 23.5951 15.4478 23.6291 15.5845 23.698C15.7136 23.768 15.8087 23.8631 15.8667 23.9758C15.9236 24.0917 15.9455 24.3674 15.9455 24.7895L15.9472 32.8053C15.9473 33.2231 15.9276 33.4943 15.8686 33.6146C15.8106 33.736 15.7166 33.8257 15.5864 33.8924C15.4497 33.9547 15.1982 33.9897 14.8154 33.9875L14.2499 33.9885L14.249 35.9758L17.961 35.9761L17.959 38.3406L20.3925 38.3398L20.3923 35.973L21.7802 35.9764C21.8382 35.9753 21.8983 35.9742 21.9574 35.9742L21.9543 38.3377L24.3889 38.3379L24.3865 35.7721C24.7966 35.6923 25.1532 35.5917 25.4616 35.4714C26.307 35.1335 26.9511 34.6447 27.4071 34.0005C27.8654 33.3607 28.1026 32.6597 28.1015 31.8952C28.1003 31.2598 27.9461 30.679 27.6431 30.1616ZM21.0697 27.4269C21.8944 27.4269 22.5057 27.3581 22.9016 27.2225C23.2976 27.0825 23.5906 26.8747 23.7897 26.5991C23.9876 26.3203 24.0827 25.9954 24.0882 25.6378C24.086 25.2572 23.9919 24.9356 23.8015 24.6688C23.6167 24.4008 23.34 24.2072 22.9823 24.0923C22.628 23.9764 21.9925 23.9227 21.0716 23.9248L19.4945 23.9225L19.497 27.4267L21.0697 27.4269ZM23.1731 29.7665C23.5745 29.9163 23.8698 30.1416 24.0689 30.4348C24.2701 30.7345 24.3664 31.091 24.3665 31.5176C24.3665 32.0185 24.2244 32.4494 23.9433 32.807C23.6601 33.1602 23.321 33.3965 22.9229 33.508C22.5161 33.6173 22.0108 33.6807 21.4049 33.6807L20.3571 33.6806C20.0082 33.6816 19.7928 33.6587 19.7162 33.6237C19.6342 33.5876 19.5817 33.5219 19.5445 33.4235C19.516 33.3491 19.4985 33.0866 19.4985 32.6492L19.496 29.5343L21.3564 29.5355C22.1701 29.5334 22.7772 29.6111 23.1731 29.7665Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M43.303 36.8839C47.4266 32.9906 50.0001 27.4729 50.0001 21.3542C50.0001 9.56059 40.4395 0 28.6459 0C22.5272 0 17.0095 2.57346 13.1162 6.69706C15.6791 5.73469 18.4552 5.20833 21.3543 5.20833C34.2984 5.20833 44.7918 15.7017 44.7918 28.6458C44.7918 31.5449 44.2654 34.321 43.303 36.8839Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M21.3542 50.0001C33.1477 50.0001 42.7083 40.4395 42.7083 28.6459C42.7083 16.8523 33.1477 7.29175 21.3542 7.29175C9.56059 7.29175 0 16.8523 0 28.6459C0 40.4395 9.56059 50.0001 21.3542 50.0001ZM27.6431 30.1616C27.3379 29.6421 26.9343 29.2385 26.4191 28.9508C26.0637 28.7463 25.5474 28.5537 24.877 28.3842C25.5014 28.1709 26.0133 27.9041 26.3917 27.5738C26.7777 27.2512 27.0697 26.8717 27.2676 26.4463C27.4699 26.0209 27.5716 25.5714 27.5683 25.0978C27.5693 24.447 27.3801 23.8488 26.9994 23.2997C26.6155 22.7561 26.0664 22.3383 25.3489 22.0451C25.0766 21.9346 24.7463 21.8471 24.3853 21.7771L24.3895 19.2462L21.956 19.2449L21.9573 21.6106L20.3933 21.6105L20.3942 19.247L17.9618 19.2468L17.962 21.6092L14.2467 21.61L14.2491 23.5983L14.8145 23.5973C15.1951 23.5951 15.4478 23.6291 15.5845 23.698C15.7136 23.768 15.8087 23.8631 15.8667 23.9758C15.9236 24.0917 15.9455 24.3674 15.9455 24.7895L15.9472 32.8053C15.9473 33.2231 15.9276 33.4943 15.8686 33.6146C15.8106 33.736 15.7166 33.8257 15.5864 33.8924C15.4497 33.9547 15.1982 33.9897 14.8154 33.9875L14.2499 33.9885L14.249 35.9758L17.961 35.9761L17.959 38.3406L20.3925 38.3398L20.3923 35.973L21.7802 35.9764C21.8382 35.9753 21.8983 35.9742 21.9574 35.9742L21.9543 38.3377L24.3889 38.3379L24.3865 35.7721C24.7966 35.6923 25.1532 35.5917 25.4616 35.4714C26.307 35.1335 26.9511 34.6447 27.4071 34.0005C27.8654 33.3607 28.1026 32.6597 28.1015 31.8952C28.1003 31.2598 27.9461 30.679 27.6431 30.1616ZM21.0697 27.4269C21.8944 27.4269 22.5057 27.3581 22.9016 27.2225C23.2976 27.0825 23.5906 26.8747 23.7897 26.5991C23.9876 26.3203 24.0827 25.9954 24.0882 25.6378C24.086 25.2572 23.9919 24.9356 23.8015 24.6688C23.6167 24.4008 23.34 24.2072 22.9823 24.0923C22.628 23.9764 21.9925 23.9227 21.0716 23.9248L19.4945 23.9225L19.497 27.4267L21.0697 27.4269ZM23.1731 29.7665C23.5745 29.9163 23.8698 30.1416 24.0689 30.4348C24.2701 30.7345 24.3664 31.091 24.3665 31.5176C24.3665 32.0185 24.2244 32.4494 23.9433 32.807C23.6601 33.1602 23.321 33.3965 22.9229 33.508C22.5161 33.6173 22.0108 33.6807 21.4049 33.6807L20.3571 33.6806C20.0082 33.6816 19.7928 33.6587 19.7162 33.6237C19.6342 33.5876 19.5817 33.5219 19.5445 33.4235C19.516 33.3491 19.4985 33.0866 19.4985 32.6492L19.496 29.5343L21.3564 29.5355C22.1701 29.5334 22.7772 29.6111 23.1731 29.7665Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M43.303 36.8839C47.4266 32.9906 50.0001 27.4729 50.0001 21.3542C50.0001 9.56059 40.4395 0 28.6459 0C22.5272 0 17.0095 2.57346 13.1162 6.69706C15.6791 5.73469 18.4552 5.20833 21.3543 5.20833C34.2984 5.20833 44.7918 15.7017 44.7918 28.6458C44.7918 31.5449 44.2654 34.321 43.303 36.8839Z" clip-rule="evenodd" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/burger.svg
+++ b/app/client/src/assets/icons/ads/app-icons/burger.svg
@ -1,6 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.0835 40.5V42.5833C2.0835 44.8854 3.94808 46.75 6.25016 46.75H43.7502C46.0522 46.75 47.9168 44.8854 47.9168 42.5833V40.5H2.0835Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.0835 21.75C2.0835 12.2583 6.31474 3 25.0002 3C43.7502 3 47.9168 12.2583 47.9168 21.75H2.0835ZM8.3335 15.5C8.3335 16.65 9.26683 17.5833 10.4168 17.5833C11.5668 17.5833 12.5002 16.65 12.5002 15.5C12.5002 14.35 11.5668 13.4167 10.4168 13.4167C9.26683 13.4167 8.3335 14.35 8.3335 15.5ZM16.6668 11.3333C15.5168 11.3333 14.5835 10.4 14.5835 9.25C14.5835 8.1 15.5168 7.16667 16.6668 7.16667C17.8168 7.16667 18.7502 8.1 18.7502 9.25C18.7502 10.4 17.8168 11.3333 16.6668 11.3333ZM22.9168 15.5C22.9168 16.65 23.8502 17.5833 25.0002 17.5833C26.1502 17.5833 27.0835 16.65 27.0835 15.5C27.0835 14.35 26.1502 13.4167 25.0002 13.4167C23.8502 13.4167 22.9168 14.35 22.9168 15.5ZM33.3335 11.3333C32.1835 11.3333 31.2502 10.4 31.2502 9.25C31.2502 8.1 32.1835 7.16667 33.3335 7.16667C34.4835 7.16667 35.4168 8.1 35.4168 9.25C35.4168 10.4 34.4835 11.3333 33.3335 11.3333ZM37.5002 15.5C37.5002 16.65 38.4335 17.5833 39.5835 17.5833C40.7335 17.5833 41.6668 16.65 41.6668 15.5C41.6668 14.35 40.7335 13.4167 39.5835 13.4167C38.4335 13.4167 37.5002 14.35 37.5002 15.5Z" fill="white"/>
-<path d="M47.9167 32.1667H43.75L37.5 36.3334L31.25 32.1667H2.08333C0.933333 32.1667 0 33.1001 0 34.2501V36.3334C0 37.4834 0.933333 38.4167 2.08333 38.4167H47.9167C49.0667 38.4167 50 37.4834 50 36.3334V34.2501C50 33.1001 49.0667 32.1667 47.9167 32.1667Z" fill="white"/>
-<path opacity="0.6" d="M45.0938 26.2208C44.0979 27.2145 43.3146 27.9999 41.6583 27.9999C40.0042 27.9999 39.2188 27.2166 38.225 26.2208C37.1583 25.1562 35.8354 23.8333 33.3167 23.8333C30.8021 23.8333 29.4792 25.1583 28.4146 26.2208C27.4208 27.2145 26.6354 27.9999 24.9854 27.9999C23.3354 27.9999 22.55 27.2166 21.5562 26.2208C20.4917 25.1562 19.1688 23.8333 16.6562 23.8333C14.1417 23.8333 12.8188 25.1583 11.7542 26.2228C10.7625 27.2166 9.97917 27.9999 8.32917 27.9999C6.67917 27.9999 5.89375 27.2166 4.9 26.2208C3.8375 25.1583 2.51458 23.8333 0 23.8333V25.9166C1.65 25.9166 2.43542 26.6999 3.42917 27.6958C4.49167 28.7583 5.81458 30.0833 8.32917 30.0833C10.8417 30.0833 12.1646 28.7583 13.2292 27.6958C14.2229 26.702 15.0083 25.9166 16.6583 25.9166C18.3083 25.9166 19.0917 26.6999 20.0854 27.6937C21.15 28.7583 22.4729 30.0833 24.9875 30.0833C27.5021 30.0833 28.825 28.7583 29.8896 27.6958C30.8833 26.702 31.6687 25.9166 33.3187 25.9166C34.975 25.9166 35.7604 26.702 36.7542 27.6958C37.8208 28.7603 39.1437 30.0833 41.6604 30.0833C44.1792 30.0833 45.5042 28.7583 46.5687 27.6958C47.5604 26.6999 48.3458 25.9166 50 25.9166V23.8333C47.4833 23.8333 46.1583 25.1562 45.0938 26.2208Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M2.0835 40.5V42.5833C2.0835 44.8854 3.94808 46.75 6.25016 46.75H43.7502C46.0522 46.75 47.9168 44.8854 47.9168 42.5833V40.5H2.0835Z"/><path fill="#fff" fill-rule="evenodd" d="M2.0835 21.75C2.0835 12.2583 6.31474 3 25.0002 3C43.7502 3 47.9168 12.2583 47.9168 21.75H2.0835ZM8.3335 15.5C8.3335 16.65 9.26683 17.5833 10.4168 17.5833C11.5668 17.5833 12.5002 16.65 12.5002 15.5C12.5002 14.35 11.5668 13.4167 10.4168 13.4167C9.26683 13.4167 8.3335 14.35 8.3335 15.5ZM16.6668 11.3333C15.5168 11.3333 14.5835 10.4 14.5835 9.25C14.5835 8.1 15.5168 7.16667 16.6668 7.16667C17.8168 7.16667 18.7502 8.1 18.7502 9.25C18.7502 10.4 17.8168 11.3333 16.6668 11.3333ZM22.9168 15.5C22.9168 16.65 23.8502 17.5833 25.0002 17.5833C26.1502 17.5833 27.0835 16.65 27.0835 15.5C27.0835 14.35 26.1502 13.4167 25.0002 13.4167C23.8502 13.4167 22.9168 14.35 22.9168 15.5ZM33.3335 11.3333C32.1835 11.3333 31.2502 10.4 31.2502 9.25C31.2502 8.1 32.1835 7.16667 33.3335 7.16667C34.4835 7.16667 35.4168 8.1 35.4168 9.25C35.4168 10.4 34.4835 11.3333 33.3335 11.3333ZM37.5002 15.5C37.5002 16.65 38.4335 17.5833 39.5835 17.5833C40.7335 17.5833 41.6668 16.65 41.6668 15.5C41.6668 14.35 40.7335 13.4167 39.5835 13.4167C38.4335 13.4167 37.5002 14.35 37.5002 15.5Z" clip-rule="evenodd"/><path fill="#fff" d="M47.9167 32.1667H43.75L37.5 36.3334L31.25 32.1667H2.08333C0.933333 32.1667 0 33.1001 0 34.2501V36.3334C0 37.4834 0.933333 38.4167 2.08333 38.4167H47.9167C49.0667 38.4167 50 37.4834 50 36.3334V34.2501C50 33.1001 49.0667 32.1667 47.9167 32.1667Z"/><path fill="#fff" d="M45.0938 26.2208C44.0979 27.2145 43.3146 27.9999 41.6583 27.9999C40.0042 27.9999 39.2188 27.2166 38.225 26.2208C37.1583 25.1562 35.8354 23.8333 33.3167 23.8333C30.8021 23.8333 29.4792 25.1583 28.4146 26.2208C27.4208 27.2145 26.6354 27.9999 24.9854 27.9999C23.3354 27.9999 22.55 27.2166 21.5562 26.2208C20.4917 25.1562 19.1688 23.8333 16.6562 23.8333C14.1417 23.8333 12.8188 25.1583 11.7542 26.2228C10.7625 27.2166 9.97917 27.9999 8.32917 27.9999C6.67917 27.9999 5.89375 27.2166 4.9 26.2208C3.8375 25.1583 2.51458 23.8333 0 23.8333V25.9166C1.65 25.9166 2.43542 26.6999 3.42917 27.6958C4.49167 28.7583 5.81458 30.0833 8.32917 30.0833C10.8417 30.0833 12.1646 28.7583 13.2292 27.6958C14.2229 26.702 15.0083 25.9166 16.6583 25.9166C18.3083 25.9166 19.0917 26.6999 20.0854 27.6937C21.15 28.7583 22.4729 30.0833 24.9875 30.0833C27.5021 30.0833 28.825 28.7583 29.8896 27.6958C30.8833 26.702 31.6687 25.9166 33.3187 25.9166C34.975 25.9166 35.7604 26.702 36.7542 27.6958C37.8208 28.7603 39.1437 30.0833 41.6604 30.0833C44.1792 30.0833 45.5042 28.7583 46.5687 27.6958C47.5604 26.6999 48.3458 25.9166 50 25.9166V23.8333C47.4833 23.8333 46.1583 25.1562 45.0938 26.2208Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/bus.svg
+++ b/app/client/src/assets/icons/ads/app-icons/bus.svg
@ -1,8 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M41.0491 6.4543C37.1128 5.27669 33.0604 4.52929 28.963 4.22522C22.1421 3.72192 15.2874 4.50221 8.75414 6.52563C7.03043 7.02355 5.84013 8.5967 5.82959 10.3909V14.2962V38.9632C5.82959 40.6038 6.66772 41.812 8.08988 42.2489C8.30106 42.3087 8.51779 42.3463 8.7708 42.3902L8.77083 42.3902L8.77128 42.3903C8.8386 42.402 8.90848 42.4141 8.98151 42.4272V44.2592C8.98151 45.7933 10.2252 47.0369 11.7593 47.0369H14.2418C15.7759 47.0369 17.0196 45.7933 17.0196 44.2592V42.4317H32.9798V44.2592C32.9798 45.7933 34.2234 47.0369 35.7576 47.0369H38.2713C39.8054 47.0369 41.0491 45.7933 41.0491 44.2592V42.4228L41.3879 42.3693C43.0538 42.1628 44.272 40.6967 44.1698 39.0212V10.6806C44.2831 8.70416 42.9713 6.92774 41.0491 6.4543ZM24.2864 26.8638H9.93556C9.93556 26.8638 8.96814 26.5562 8.96814 25.6289V12.0359C8.96814 11.1131 9.11971 10.9214 10.0247 10.6985C14.6874 9.50038 19.477 8.86576 24.2908 8.80821L24.2864 26.8638ZM24.2908 8.80821V8.7993C24.7367 8.7993 26.6046 8.7993 27.0504 8.82605C31.4603 8.9831 35.8401 9.61839 40.1129 10.7208C40.8663 10.9214 41.0045 11.1175 41.0045 11.9111V18.8614V25.8116C41.0045 26.4982 40.202 26.8638 40.202 26.8638H24.2908V8.80821Z" fill="white"/>
-<rect x="17.8667" y="34.9106" width="14.2661" height="2.6749" fill="#B2B2B2"/>
-<circle cx="37.483" cy="36.6939" r="2.6749" fill="#B2B2B2"/>
-<circle cx="12.5172" cy="36.6939" r="2.6749" fill="#B2B2B2"/>
-<path opacity="0.6" d="M48.6281 14.7154C48.3485 14.4306 46.6287 14.2699 46.2296 14.2695C46.1702 14.265 46.1106 14.265 46.0513 14.2695V21.4427C46.1106 21.4473 46.1702 21.4473 46.2296 21.4427C47.0566 21.4428 49.0666 20.7762 49.0739 19.9492V15.7764C49.0725 15.3775 48.9121 14.9956 48.6281 14.7154Z" fill="white"/>
-<path opacity="0.6" d="M1.46957 14.7154C1.7492 14.4306 3.46892 14.2699 3.86806 14.2695C3.92741 14.265 3.98703 14.265 4.04639 14.2695V21.4427C3.98703 21.4473 3.92741 21.4473 3.86806 21.4427C3.04104 21.4428 1.03109 20.7762 1.02375 19.9492V15.7764C1.02514 15.3775 1.1856 14.9956 1.46957 14.7154Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M41.0491 6.4543C37.1128 5.27669 33.0604 4.52929 28.963 4.22522C22.1421 3.72192 15.2874 4.50221 8.75414 6.52563C7.03043 7.02355 5.84013 8.5967 5.82959 10.3909V14.2962V38.9632C5.82959 40.6038 6.66772 41.812 8.08988 42.2489C8.30106 42.3087 8.51779 42.3463 8.7708 42.3902L8.77083 42.3902L8.77128 42.3903C8.8386 42.402 8.90848 42.4141 8.98151 42.4272V44.2592C8.98151 45.7933 10.2252 47.0369 11.7593 47.0369H14.2418C15.7759 47.0369 17.0196 45.7933 17.0196 44.2592V42.4317H32.9798V44.2592C32.9798 45.7933 34.2234 47.0369 35.7576 47.0369H38.2713C39.8054 47.0369 41.0491 45.7933 41.0491 44.2592V42.4228L41.3879 42.3693C43.0538 42.1628 44.272 40.6967 44.1698 39.0212V10.6806C44.2831 8.70416 42.9713 6.92774 41.0491 6.4543ZM24.2864 26.8638H9.93556C9.93556 26.8638 8.96814 26.5562 8.96814 25.6289V12.0359C8.96814 11.1131 9.11971 10.9214 10.0247 10.6985C14.6874 9.50038 19.477 8.86576 24.2908 8.80821L24.2864 26.8638ZM24.2908 8.80821V8.7993C24.7367 8.7993 26.6046 8.7993 27.0504 8.82605C31.4603 8.9831 35.8401 9.61839 40.1129 10.7208C40.8663 10.9214 41.0045 11.1175 41.0045 11.9111V18.8614V25.8116C41.0045 26.4982 40.202 26.8638 40.202 26.8638H24.2908V8.80821Z" clip-rule="evenodd"/><rect width="14.266" height="2.675" x="17.867" y="34.911" fill="#B2B2B2"/><circle cx="37.483" cy="36.694" r="2.675" fill="#B2B2B2"/><circle cx="12.517" cy="36.694" r="2.675" fill="#B2B2B2"/><path fill="#fff" d="M48.6281 14.7154C48.3485 14.4306 46.6287 14.2699 46.2296 14.2695C46.1702 14.265 46.1106 14.265 46.0513 14.2695V21.4427C46.1106 21.4473 46.1702 21.4473 46.2296 21.4427C47.0566 21.4428 49.0666 20.7762 49.0739 19.9492V15.7764C49.0725 15.3775 48.9121 14.9956 48.6281 14.7154Z" opacity=".6"/><path fill="#fff" d="M1.46957 14.7154C1.7492 14.4306 3.46892 14.2699 3.86806 14.2695C3.92741 14.265 3.98703 14.265 4.04639 14.2695V21.4427C3.98703 21.4473 3.92741 21.4473 3.86806 21.4427C3.04104 21.4428 1.03109 20.7762 1.02375 19.9492V15.7764C1.02514 15.3775 1.1856 14.9956 1.46957 14.7154Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/call.svg
+++ b/app/client/src/assets/icons/ads/app-icons/call.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M49.1609 40.7531L37.0886 28.6808L33.105 32.6644L45.1773 44.7367L49.1609 40.7531Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M31.6953 34.0741C30.9206 34.8489 29.6644 34.8489 28.8896 34.0741L15.5578 20.7423C14.7806 19.9651 14.7806 18.7049 15.5578 17.9276L3.68819 6.05859C-1.44167 12.0382 -1.2411 21.0482 4.42062 26.7099L23.1164 45.4139C28.5495 50.8468 37.4489 51.5673 43.7681 46.146L31.6953 34.0741Z" fill="white"/>
-<path opacity="0.6" d="M20.9469 12.5388L8.99584 0.586426L5.01123 4.57104L16.9632 16.5224L20.9469 12.5388Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M49.1609 40.7531L37.0886 28.6808L33.105 32.6644L45.1773 44.7367L49.1609 40.7531Z" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M31.6953 34.0741C30.9206 34.8489 29.6644 34.8489 28.8896 34.0741L15.5578 20.7423C14.7806 19.9651 14.7806 18.7049 15.5578 17.9276L3.68819 6.05859C-1.44167 12.0382 -1.2411 21.0482 4.42062 26.7099L23.1164 45.4139C28.5495 50.8468 37.4489 51.5673 43.7681 46.146L31.6953 34.0741Z" clip-rule="evenodd"/><path fill="#fff" d="M20.9469 12.5388L8.99584 0.586426L5.01123 4.57104L16.9632 16.5224L20.9469 12.5388Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/car.svg
+++ b/app/client/src/assets/icons/ads/app-icons/car.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M8.90674 7.35558L5.55518 19.2071H10.0658C10.4092 18.0752 10.7723 16.685 11.1424 15.2675C11.6847 13.191 12.2422 11.0561 12.7755 9.58944C13.266 8.445 14.1652 7.5458 15.5549 7.30056H33.8942C35.2838 7.5458 36.1013 8.445 36.6735 9.58944C37.1231 10.9382 37.634 12.8522 38.1449 14.7662C38.5688 16.3541 38.9927 17.942 39.3816 19.2071H43.8939L40.5423 7.35558C39.2344 4.98496 37.436 3.51354 35.2288 2.77783H14.2202C12.0131 3.51354 10.1329 4.98496 8.90674 7.35558Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.83052 21.0591H44.1692H47.5616C48.3969 21.0591 49.0739 21.7362 49.0739 22.5714C49.0739 23.4066 48.3969 24.0837 47.5616 24.0837H45.9676L47.2661 26.0555C47.859 26.9558 48.1772 28.0092 48.1818 29.0873L48.2446 43.7741C48.2511 45.3128 47.0056 46.5637 45.4668 46.5637H44.0041C42.47 46.5637 41.2264 45.3201 41.2264 43.7859V40.5963H8.77336V43.7859C8.77336 45.32 7.5297 46.5637 5.99558 46.5637H4.53291C2.99415 46.5637 1.74858 45.3128 1.75516 43.7741L1.81792 29.0873C1.82253 28.0092 2.14068 26.9558 2.73359 26.0555L4.03211 24.0837H2.43808C1.60286 24.0837 0.925781 23.4066 0.925781 22.5714C0.925781 21.7362 1.60286 21.0591 2.43807 21.0591H5.83052ZM38.9925 27.6805C37.3576 27.6805 36.0497 28.9884 36.0497 30.6233C36.0497 32.2582 37.3576 33.5662 38.9925 33.5662C40.5457 33.5662 41.8536 32.2582 41.8536 30.6233C41.8536 28.9884 40.5457 27.6805 38.9925 27.6805ZM11.0072 27.6805C12.6421 27.6805 13.9501 28.9884 13.9501 30.6233C13.9501 32.2582 12.6421 33.5662 11.0072 33.5662C9.45405 33.5662 8.14612 32.2582 8.14612 30.6233C8.14612 28.9884 9.45405 27.6805 11.0072 27.6805Z" fill="white"/>
-<rect x="17.5923" y="29.6296" width="14.8148" height="2.77778" fill="#B2B2B2"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M8.90674 7.35558L5.55518 19.2071H10.0658C10.4092 18.0752 10.7723 16.685 11.1424 15.2675C11.6847 13.191 12.2422 11.0561 12.7755 9.58944C13.266 8.445 14.1652 7.5458 15.5549 7.30056H33.8942C35.2838 7.5458 36.1013 8.445 36.6735 9.58944C37.1231 10.9382 37.634 12.8522 38.1449 14.7662C38.5688 16.3541 38.9927 17.942 39.3816 19.2071H43.8939L40.5423 7.35558C39.2344 4.98496 37.436 3.51354 35.2288 2.77783H14.2202C12.0131 3.51354 10.1329 4.98496 8.90674 7.35558Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M5.83052 21.0591H44.1692H47.5616C48.3969 21.0591 49.0739 21.7362 49.0739 22.5714C49.0739 23.4066 48.3969 24.0837 47.5616 24.0837H45.9676L47.2661 26.0555C47.859 26.9558 48.1772 28.0092 48.1818 29.0873L48.2446 43.7741C48.2511 45.3128 47.0056 46.5637 45.4668 46.5637H44.0041C42.47 46.5637 41.2264 45.3201 41.2264 43.7859V40.5963H8.77336V43.7859C8.77336 45.32 7.5297 46.5637 5.99558 46.5637H4.53291C2.99415 46.5637 1.74858 45.3128 1.75516 43.7741L1.81792 29.0873C1.82253 28.0092 2.14068 26.9558 2.73359 26.0555L4.03211 24.0837H2.43808C1.60286 24.0837 0.925781 23.4066 0.925781 22.5714C0.925781 21.7362 1.60286 21.0591 2.43807 21.0591H5.83052ZM38.9925 27.6805C37.3576 27.6805 36.0497 28.9884 36.0497 30.6233C36.0497 32.2582 37.3576 33.5662 38.9925 33.5662C40.5457 33.5662 41.8536 32.2582 41.8536 30.6233C41.8536 28.9884 40.5457 27.6805 38.9925 27.6805ZM11.0072 27.6805C12.6421 27.6805 13.9501 28.9884 13.9501 30.6233C13.9501 32.2582 12.6421 33.5662 11.0072 33.5662C9.45405 33.5662 8.14612 32.2582 8.14612 30.6233C8.14612 28.9884 9.45405 27.6805 11.0072 27.6805Z" clip-rule="evenodd"/><rect width="14.815" height="2.778" x="17.592" y="29.63" fill="#B2B2B2"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/card.svg
+++ b/app/client/src/assets/icons/ads/app-icons/card.svg
@ -1,5 +1 @@
-<svg width="44" height="30" viewBox="0 0 44 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M43.8596 24.8291V11.9299H0V24.8291C0 27.3524 2.04547 29.3978 4.56869 29.3977H39.2909C41.8141 29.3977 43.8596 27.3523 43.8596 24.8291ZM31.5789 24.6909C32.0583 24.6909 32.5077 24.5627 32.8947 24.3388C33.2818 24.5627 33.7312 24.6909 34.2105 24.6909C35.6639 24.6909 36.8421 23.5127 36.8421 22.0593C36.8421 20.6059 35.6639 19.4277 34.2105 19.4277C33.7312 19.4277 33.2818 19.5559 32.8947 19.7798C32.5077 19.5559 32.0583 19.4277 31.5789 19.4277C30.1256 19.4277 28.9474 20.6059 28.9474 22.0593C28.9474 23.5127 30.1256 24.6909 31.5789 24.6909ZM14.6199 20.1872H5.48246V18.4328H14.6199V20.1872ZM5.48246 23.8422H20.1024V22.0878H5.48246V23.8422Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M32.8949 24.3674C33.6815 23.9124 34.2107 23.0619 34.2107 22.0879C34.2107 21.1138 33.6815 20.2634 32.8949 19.8083C32.1083 20.2634 31.5791 21.1138 31.5791 22.0879C31.5791 23.0619 32.1083 23.9124 32.8949 24.3674Z" fill="white"/>
-<path d="M4.56869 0.157959H39.2909C41.8141 0.157959 43.8596 2.13745 43.8596 4.57928V6.29831H0V4.57936C0 2.13745 2.04547 0.157959 4.56869 0.157959Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="44" height="30" fill="none" viewBox="0 0 44 30"><path fill="#fff" fill-rule="evenodd" d="M43.8596 24.8291V11.9299H0V24.8291C0 27.3524 2.04547 29.3978 4.56869 29.3977H39.2909C41.8141 29.3977 43.8596 27.3523 43.8596 24.8291ZM31.5789 24.6909C32.0583 24.6909 32.5077 24.5627 32.8947 24.3388C33.2818 24.5627 33.7312 24.6909 34.2105 24.6909C35.6639 24.6909 36.8421 23.5127 36.8421 22.0593C36.8421 20.6059 35.6639 19.4277 34.2105 19.4277C33.7312 19.4277 33.2818 19.5559 32.8947 19.7798C32.5077 19.5559 32.0583 19.4277 31.5789 19.4277C30.1256 19.4277 28.9474 20.6059 28.9474 22.0593C28.9474 23.5127 30.1256 24.6909 31.5789 24.6909ZM14.6199 20.1872H5.48246V18.4328H14.6199V20.1872ZM5.48246 23.8422H20.1024V22.0878H5.48246V23.8422Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M32.8949 24.3674C33.6815 23.9124 34.2107 23.0619 34.2107 22.0879C34.2107 21.1138 33.6815 20.2634 32.8949 19.8083C32.1083 20.2634 31.5791 21.1138 31.5791 22.0879C31.5791 23.0619 32.1083 23.9124 32.8949 24.3674Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" d="M4.56869 0.157959H39.2909C41.8141 0.157959 43.8596 2.13745 43.8596 4.57928V6.29831H0V4.57936C0 2.13745 2.04547 0.157959 4.56869 0.157959Z"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/cat.svg
+++ b/app/client/src/assets/icons/ads/app-icons/cat.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M31.9355 10.798C31.9355 10.798 36.4468 3.72082 44.6363 2V29.1204L31.9355 10.798Z" fill="white"/>
-<path opacity="0.6" d="M18.7007 10.798C18.7007 10.798 14.1894 3.72082 5.99994 2V29.1204L18.7007 10.798Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.3182 9.23413C14.649 9.23413 6 17.8832 6 28.5523V32.5196V34.9338V36.8905V39.7623C6 44.7831 10.0701 48.8532 15.0909 48.8532H43.075C43.9373 48.8532 44.6364 48.1542 44.6364 47.2919V28.5523C44.6364 17.8832 35.9873 9.23413 25.3182 9.23413ZM25.318 41.7854L19.3099 37.0727C18.5725 35.8248 18.5007 34.5139 19.1142 33.4767C19.7273 32.4398 20.9248 31.8448 22.4004 31.8448H28.2355C29.7107 31.8448 30.9087 32.4394 31.5218 33.4767C32.1353 34.5139 32.0638 35.8244 31.3265 37.0723L25.318 41.7854ZM17.3636 25.1432C17.3636 24.5156 17.8724 24.0069 18.5 24.0069C19.1276 24.0069 19.6364 24.5156 19.6364 25.1432V28.5523C19.6364 29.1799 19.1276 29.6887 18.5 29.6887C17.8724 29.6887 17.3636 29.1799 17.3636 28.5523V25.1432ZM31 25.1432C31 24.5156 31.5088 24.0069 32.1364 24.0069C32.764 24.0069 33.2727 24.5156 33.2727 25.1432V28.5523C33.2727 29.1799 32.764 29.6887 32.1364 29.6887C31.5088 29.6887 31 29.1799 31 28.5523V25.1432ZM34.3869 38.036L39.1212 39.9326L38.2241 42.0208L33.496 40.1269L34.3869 38.036ZM41.6317 33.7768L34.4313 33.3998L34.3869 35.6721L41.5873 36.049L41.6317 33.7768ZM16.4728 37.7339L11.4874 39.9511L12.3504 42.0538L17.3636 39.8248L16.4728 37.7339ZM9.06626 33.4934L16.4284 33.0978L16.4728 35.3701L9.1106 35.7657L9.06626 33.4934Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M31.9355 10.798C31.9355 10.798 36.4468 3.72082 44.6363 2V29.1204L31.9355 10.798Z" opacity=".6"/><path fill="#fff" d="M18.7007 10.798C18.7007 10.798 14.1894 3.72082 5.99994 2V29.1204L18.7007 10.798Z" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M25.3182 9.23413C14.649 9.23413 6 17.8832 6 28.5523V32.5196V34.9338V36.8905V39.7623C6 44.7831 10.0701 48.8532 15.0909 48.8532H43.075C43.9373 48.8532 44.6364 48.1542 44.6364 47.2919V28.5523C44.6364 17.8832 35.9873 9.23413 25.3182 9.23413ZM25.318 41.7854L19.3099 37.0727C18.5725 35.8248 18.5007 34.5139 19.1142 33.4767C19.7273 32.4398 20.9248 31.8448 22.4004 31.8448H28.2355C29.7107 31.8448 30.9087 32.4394 31.5218 33.4767C32.1353 34.5139 32.0638 35.8244 31.3265 37.0723L25.318 41.7854ZM17.3636 25.1432C17.3636 24.5156 17.8724 24.0069 18.5 24.0069C19.1276 24.0069 19.6364 24.5156 19.6364 25.1432V28.5523C19.6364 29.1799 19.1276 29.6887 18.5 29.6887C17.8724 29.6887 17.3636 29.1799 17.3636 28.5523V25.1432ZM31 25.1432C31 24.5156 31.5088 24.0069 32.1364 24.0069C32.764 24.0069 33.2727 24.5156 33.2727 25.1432V28.5523C33.2727 29.1799 32.764 29.6887 32.1364 29.6887C31.5088 29.6887 31 29.1799 31 28.5523V25.1432ZM34.3869 38.036L39.1212 39.9326L38.2241 42.0208L33.496 40.1269L34.3869 38.036ZM41.6317 33.7768L34.4313 33.3998L34.3869 35.6721L41.5873 36.049L41.6317 33.7768ZM16.4728 37.7339L11.4874 39.9511L12.3504 42.0538L17.3636 39.8248L16.4728 37.7339ZM9.06626 33.4934L16.4284 33.0978L16.4728 35.3701L9.1106 35.7657L9.06626 33.4934Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/chat.svg
+++ b/app/client/src/assets/icons/ads/app-icons/chat.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M30.8486 44.8612C38.2427 41.2319 43.2386 33.5859 43.1041 24.7644C43.0393 20.5173 41.771 16.562 39.6252 13.2246C45.6119 15.6003 49.8641 21.3692 49.9971 28.2386C50.023 29.5789 49.8891 30.8835 49.6131 32.1349C49.1457 34.2537 48.8679 45.0665 48.8679 45.0665C48.8679 45.0665 34.5096 45.0925 33.1692 45.0665C32.38 45.0512 31.6053 44.9816 30.8486 44.8612Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.00384 24.7082C1.21927 13.5865 10.2973 4.83251 21.4198 5.00243C32.2758 5.16815 41.0452 13.9377 41.2108 24.7938C41.3803 35.9161 32.6263 44.9938 21.5048 45.2092C19.8721 45.2408 2.37962 45.2092 2.37962 45.2092C2.37962 45.2092 2.04115 32.0361 1.47181 29.4549C1.13548 27.9305 0.972301 26.3409 1.00384 24.7082ZM10.4734 28.8605C12.3918 28.8605 13.9469 27.3054 13.9469 25.3871C13.9469 23.4688 12.3918 21.9137 10.4734 21.9137C8.55514 21.9137 7.00004 23.4688 7.00004 25.3871C7.00004 27.3054 8.55514 28.8605 10.4734 28.8605ZM24.3671 25.3871C24.3671 27.3054 22.812 28.8605 20.8937 28.8605C18.9754 28.8605 17.4203 27.3054 17.4203 25.3871C17.4203 23.4688 18.9754 21.9137 20.8937 21.9137C22.812 21.9137 24.3671 23.4688 24.3671 25.3871ZM31.3139 28.8605C33.2322 28.8605 34.7873 27.3054 34.7873 25.3871C34.7873 23.4688 33.2322 21.9137 31.3139 21.9137C29.3956 21.9137 27.8405 23.4688 27.8405 25.3871C27.8405 27.3054 29.3956 28.8605 31.3139 28.8605Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M30.8486 44.8612C38.2427 41.2319 43.2386 33.5859 43.1041 24.7644C43.0393 20.5173 41.771 16.562 39.6252 13.2246C45.6119 15.6003 49.8641 21.3692 49.9971 28.2386C50.023 29.5789 49.8891 30.8835 49.6131 32.1349C49.1457 34.2537 48.8679 45.0665 48.8679 45.0665C48.8679 45.0665 34.5096 45.0925 33.1692 45.0665C32.38 45.0512 31.6053 44.9816 30.8486 44.8612Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M1.00384 24.7082C1.21927 13.5865 10.2973 4.83251 21.4198 5.00243C32.2758 5.16815 41.0452 13.9377 41.2108 24.7938C41.3803 35.9161 32.6263 44.9938 21.5048 45.2092C19.8721 45.2408 2.37962 45.2092 2.37962 45.2092C2.37962 45.2092 2.04115 32.0361 1.47181 29.4549C1.13548 27.9305 0.972301 26.3409 1.00384 24.7082ZM10.4734 28.8605C12.3918 28.8605 13.9469 27.3054 13.9469 25.3871C13.9469 23.4688 12.3918 21.9137 10.4734 21.9137C8.55514 21.9137 7.00004 23.4688 7.00004 25.3871C7.00004 27.3054 8.55514 28.8605 10.4734 28.8605ZM24.3671 25.3871C24.3671 27.3054 22.812 28.8605 20.8937 28.8605C18.9754 28.8605 17.4203 27.3054 17.4203 25.3871C17.4203 23.4688 18.9754 21.9137 20.8937 21.9137C22.812 21.9137 24.3671 23.4688 24.3671 25.3871ZM31.3139 28.8605C33.2322 28.8605 34.7873 27.3054 34.7873 25.3871C34.7873 23.4688 33.2322 21.9137 31.3139 21.9137C29.3956 21.9137 27.8405 23.4688 27.8405 25.3871C27.8405 27.3054 29.3956 28.8605 31.3139 28.8605Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/chinese-remnibi.svg
+++ b/app/client/src/assets/icons/ads/app-icons/chinese-remnibi.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.3542 50.0001C33.1477 50.0001 42.7083 40.4395 42.7083 28.6459C42.7083 16.8523 33.1477 7.29175 21.3542 7.29175C9.56059 7.29175 0 16.8523 0 28.6459C0 40.4395 9.56059 50.0001 21.3542 50.0001ZM29.0031 19.7917C29.0985 19.7917 29.1868 19.8431 29.234 19.9257C29.2813 20.0082 29.2807 20.1106 29.2326 20.1925L26.0746 25.5514H27.8432C27.9897 25.5514 28.109 25.6708 28.109 25.8172V27.5464C28.109 27.6929 27.9897 27.8122 27.8432 27.8122H24.7328L23.3922 30.0945H27.4282C27.5748 30.0945 27.6941 30.2136 27.6941 30.3603V32.1008C27.6941 32.2473 27.5749 32.3666 27.4282 32.3666H22.8763V38.177C22.8763 38.3234 22.7571 38.4428 22.6104 38.4428H20.1807C20.0342 38.4428 19.9149 38.3237 19.9149 38.177V32.3666H15.4947C15.3483 32.3666 15.2289 32.2475 15.2289 32.1008V30.3603C15.2289 30.2138 15.3483 30.0945 15.4947 30.0945H19.4066L18.0586 27.8122H14.8919C14.7453 27.8122 14.626 27.6931 14.626 27.5464V25.8171C14.626 25.6707 14.7452 25.5513 14.8919 25.5513H16.7257L13.5782 20.1924C13.5299 20.1102 13.5295 20.0082 13.5768 19.9259C13.6236 19.8434 13.7121 19.7919 13.8074 19.7919H16.6771C16.7747 19.7919 16.8642 19.8452 16.9108 19.931L21.3946 28.2131L25.8913 19.9308C25.9377 19.845 26.0272 19.7917 26.1247 19.7917H29.0031Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M43.303 36.8839C47.4266 32.9906 50.0001 27.4729 50.0001 21.3542C50.0001 9.56059 40.4395 0 28.6459 0C22.5272 0 17.0095 2.57346 13.1162 6.69706C15.6791 5.73469 18.4552 5.20833 21.3543 5.20833C34.2984 5.20833 44.7918 15.7017 44.7918 28.6458C44.7918 31.5449 44.2654 34.321 43.303 36.8839Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M21.3542 50.0001C33.1477 50.0001 42.7083 40.4395 42.7083 28.6459C42.7083 16.8523 33.1477 7.29175 21.3542 7.29175C9.56059 7.29175 0 16.8523 0 28.6459C0 40.4395 9.56059 50.0001 21.3542 50.0001ZM29.0031 19.7917C29.0985 19.7917 29.1868 19.8431 29.234 19.9257C29.2813 20.0082 29.2807 20.1106 29.2326 20.1925L26.0746 25.5514H27.8432C27.9897 25.5514 28.109 25.6708 28.109 25.8172V27.5464C28.109 27.6929 27.9897 27.8122 27.8432 27.8122H24.7328L23.3922 30.0945H27.4282C27.5748 30.0945 27.6941 30.2136 27.6941 30.3603V32.1008C27.6941 32.2473 27.5749 32.3666 27.4282 32.3666H22.8763V38.177C22.8763 38.3234 22.7571 38.4428 22.6104 38.4428H20.1807C20.0342 38.4428 19.9149 38.3237 19.9149 38.177V32.3666H15.4947C15.3483 32.3666 15.2289 32.2475 15.2289 32.1008V30.3603C15.2289 30.2138 15.3483 30.0945 15.4947 30.0945H19.4066L18.0586 27.8122H14.8919C14.7453 27.8122 14.626 27.6931 14.626 27.5464V25.8171C14.626 25.6707 14.7452 25.5513 14.8919 25.5513H16.7257L13.5782 20.1924C13.5299 20.1102 13.5295 20.0082 13.5768 19.9259C13.6236 19.8434 13.7121 19.7919 13.8074 19.7919H16.6771C16.7747 19.7919 16.8642 19.8452 16.9108 19.931L21.3946 28.2131L25.8913 19.9308C25.9377 19.845 26.0272 19.7917 26.1247 19.7917H29.0031Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M43.303 36.8839C47.4266 32.9906 50.0001 27.4729 50.0001 21.3542C50.0001 9.56059 40.4395 0 28.6459 0C22.5272 0 17.0095 2.57346 13.1162 6.69706C15.6791 5.73469 18.4552 5.20833 21.3543 5.20833C34.2984 5.20833 44.7918 15.7017 44.7918 28.6458C44.7918 31.5449 44.2654 34.321 43.303 36.8839Z" clip-rule="evenodd" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/cloud.svg
+++ b/app/client/src/assets/icons/ads/app-icons/cloud.svg
--- a/app/client/src/assets/icons/ads/app-icons/coding.svg
+++ b/app/client/src/assets/icons/ads/app-icons/coding.svg
@ -1,3 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.9438 37.926L20.7036 36.959L25.4635 22.926L28.7036 23.893L23.9438 37.926ZM3.70361 49.0742H46.2962V13.889H33.3332V0.926025H3.70361V49.0742ZM19.7031 36.7767L17.351 38.926L10.7036 31.426L17.3515 23.926L19.7036 26.0748L14.9603 31.426L19.7031 36.7767ZM32.0557 38.926L29.7036 36.7768L34.4462 31.4264L29.7043 26.076L32.0563 23.926L38.7036 31.4258L32.0557 38.926Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M23.9438 37.926L20.7036 36.959L25.4635 22.926L28.7036 23.893L23.9438 37.926ZM3.70361 49.0742H46.2962V13.889H33.3332V0.926025H3.70361V49.0742ZM19.7031 36.7767L17.351 38.926L10.7036 31.426L17.3515 23.926L19.7036 26.0748L14.9603 31.426L19.7031 36.7767ZM32.0557 38.926L29.7036 36.7768L34.4462 31.4264L29.7043 26.076L32.0563 23.926L38.7036 31.4258L32.0557 38.926Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/couples.svg
+++ b/app/client/src/assets/icons/ads/app-icons/couples.svg
@ -1,7 +1 @@
-<svg width="50" height="52" viewBox="0 0 50 52" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M31.2998 18.9043C28.9769 18.9043 27.1393 20.8708 27.2966 23.1883L29.012 48.4633H47.0676L48.783 23.1883C48.9403 20.8708 47.1028 18.9043 44.7799 18.9043L41.5506 18.9043L38.7924 22.7523C38.423 23.2676 37.6566 23.2676 37.2872 22.7523L34.529 18.9043L31.2998 18.9043Z" fill="white"/>
-<circle cx="38.0402" cy="8.87341" r="7.02161" fill="white"/>
-<path d="M5.2409 20.9104C2.91018 20.9104 1.06989 22.8896 1.23914 25.2141L2.93195 48.4632H20.9875L22.6803 25.2141C22.8496 22.8896 21.0093 20.9104 18.6786 20.9104H5.2409Z" fill="white"/>
-<path d="M11.8538 4.86108C14.8595 4.86108 17.3467 7.25366 17.6349 10.4216C17.8173 12.3319 18.5471 14.2706 19.8244 16.1714C19.9876 16.4078 20.026 16.7104 19.9395 16.9846C19.8436 17.2588 19.6321 17.4763 19.3536 17.5804C16.8858 18.4599 14.3889 18.9043 11.9305 18.9043C9.47229 18.9043 6.99463 18.4599 4.56503 17.5804C4.29611 17.4858 4.09449 17.2778 3.9986 17.0129C3.89286 16.7481 3.9217 16.4645 4.06565 16.2186C5.18913 14.28 5.86154 12.3224 6.07277 10.4027C6.40874 7.2442 8.89601 4.86108 11.8538 4.86108Z" fill="white"/>
-<path d="M24.9996 31.8413C22.468 29.2957 18.3779 29.304 15.8564 31.8661C13.3355 34.4276 13.3354 38.5742 15.8563 41.1357C15.8563 41.1357 15.8563 41.1357 15.8564 41.1358L24.2837 49.7005L24.9986 50.4271L25.7136 49.7006L34.1429 41.1358C36.6638 38.5743 36.6638 34.4276 34.1429 31.8661C31.6213 29.304 27.5313 29.2957 24.9996 31.8413Z" fill="#B2B2B2" stroke="#404040" stroke-width="2.00617"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="52" fill="none" viewBox="0 0 50 52"><path fill="#fff" d="M31.2998 18.9043C28.9769 18.9043 27.1393 20.8708 27.2966 23.1883L29.012 48.4633H47.0676L48.783 23.1883C48.9403 20.8708 47.1028 18.9043 44.7799 18.9043L41.5506 18.9043L38.7924 22.7523C38.423 23.2676 37.6566 23.2676 37.2872 22.7523L34.529 18.9043L31.2998 18.9043Z"/><circle cx="38.04" cy="8.873" r="7.022" fill="#fff"/><path fill="#fff" d="M5.2409 20.9104C2.91018 20.9104 1.06989 22.8896 1.23914 25.2141L2.93195 48.4632H20.9875L22.6803 25.2141C22.8496 22.8896 21.0093 20.9104 18.6786 20.9104H5.2409Z"/><path fill="#fff" d="M11.8538 4.86108C14.8595 4.86108 17.3467 7.25366 17.6349 10.4216C17.8173 12.3319 18.5471 14.2706 19.8244 16.1714C19.9876 16.4078 20.026 16.7104 19.9395 16.9846C19.8436 17.2588 19.6321 17.4763 19.3536 17.5804C16.8858 18.4599 14.3889 18.9043 11.9305 18.9043C9.47229 18.9043 6.99463 18.4599 4.56503 17.5804C4.29611 17.4858 4.09449 17.2778 3.9986 17.0129C3.89286 16.7481 3.9217 16.4645 4.06565 16.2186C5.18913 14.28 5.86154 12.3224 6.07277 10.4027C6.40874 7.2442 8.89601 4.86108 11.8538 4.86108Z"/><path fill="#B2B2B2" stroke="#404040" stroke-width="2.006" d="M24.9996 31.8413C22.468 29.2957 18.3779 29.304 15.8564 31.8661C13.3355 34.4276 13.3354 38.5742 15.8563 41.1357C15.8563 41.1357 15.8563 41.1357 15.8564 41.1358L24.2837 49.7005L24.9986 50.4271L25.7136 49.7006L34.1429 41.1358C36.6638 38.5743 36.6638 34.4276 34.1429 31.8661C31.6213 29.304 27.5313 29.2957 24.9996 31.8413Z"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/cricket.svg
+++ b/app/client/src/assets/icons/ads/app-icons/cricket.svg
@ -1,4 +1 @@
-<svg width="59" height="58" viewBox="0 0 59 58" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M41.3122 17.8064C43.0922 19.5865 43.0977 22.4709 41.3244 24.2577L23.1852 42.5352C23.0247 42.341 22.8536 42.1527 22.6719 41.971C19.5527 38.8518 14.4774 38.8518 11.3582 41.971C8.239 45.0902 8.239 50.1655 11.3582 53.2847L4.4311 46.3576C2.45998 44.3865 2.45998 41.1907 4.4311 39.2195L30.2636 13.387C32.0942 11.5564 35.0622 11.5564 36.8928 13.387L44.3837 5.8961C45.6021 4.67766 47.5846 4.67766 48.8031 5.8961C50.0215 7.11453 50.0215 9.09708 48.8031 10.3155L41.3122 17.8064ZM11.9374 53.8103L11.9106 53.8371L11.3582 53.2847C11.5445 53.471 11.7379 53.6463 11.9374 53.8103Z" fill="white"/>
-<path opacity="0.6" d="M12.7725 51.8705C10.4331 49.5311 10.4331 45.7246 12.7725 43.3852C15.1119 41.0458 18.9184 41.0458 21.2578 43.3852C23.5972 45.7246 23.5972 49.5311 21.2578 51.8705C18.9184 54.2099 15.1119 54.2099 12.7725 51.8705Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="59" height="58" fill="none" viewBox="0 0 59 58"><path fill="#fff" fill-rule="evenodd" d="M41.3122 17.8064C43.0922 19.5865 43.0977 22.4709 41.3244 24.2577L23.1852 42.5352C23.0247 42.341 22.8536 42.1527 22.6719 41.971C19.5527 38.8518 14.4774 38.8518 11.3582 41.971C8.239 45.0902 8.239 50.1655 11.3582 53.2847L4.4311 46.3576C2.45998 44.3865 2.45998 41.1907 4.4311 39.2195L30.2636 13.387C32.0942 11.5564 35.0622 11.5564 36.8928 13.387L44.3837 5.8961C45.6021 4.67766 47.5846 4.67766 48.8031 5.8961C50.0215 7.11453 50.0215 9.09708 48.8031 10.3155L41.3122 17.8064ZM11.9374 53.8103L11.9106 53.8371L11.3582 53.2847C11.5445 53.471 11.7379 53.6463 11.9374 53.8103Z" clip-rule="evenodd"/><path fill="#fff" d="M12.7725 51.8705C10.4331 49.5311 10.4331 45.7246 12.7725 43.3852C15.1119 41.0458 18.9184 41.0458 21.2578 43.3852C23.5972 45.7246 23.5972 49.5311 21.2578 51.8705C18.9184 54.2099 15.1119 54.2099 12.7725 51.8705Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/diamond.svg
+++ b/app/client/src/assets/icons/ads/app-icons/diamond.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M8.02832 5.74609H22.0702L16.0526 13.7704L8.02832 5.74609ZM33.9472 13.7704L27.9296 5.74609H41.9715L33.9472 13.7704Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25 6.72314L30.8599 14.5352H19.1401L25 6.72314ZM25 46L18.2574 17.4648H31.7426L25 46ZM5.56348 7.42393L0 14.5352H12.6747L5.56348 7.42393ZM50 14.5352H37.3253L44.4348 7.42568L50 14.5352ZM27.7851 46L49.7883 17.4648H34.8367L27.7851 46ZM15.1633 17.4648L22.2168 46L0.209961 17.4648H15.1633Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M8.02832 5.74609H22.0702L16.0526 13.7704L8.02832 5.74609ZM33.9472 13.7704L27.9296 5.74609H41.9715L33.9472 13.7704Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M25 6.72314L30.8599 14.5352H19.1401L25 6.72314ZM25 46L18.2574 17.4648H31.7426L25 46ZM5.56348 7.42393L0 14.5352H12.6747L5.56348 7.42393ZM50 14.5352H37.3253L44.4348 7.42568L50 14.5352ZM27.7851 46L49.7883 17.4648H34.8367L27.7851 46ZM15.1633 17.4648L22.2168 46L0.209961 17.4648H15.1633Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/dog.svg
+++ b/app/client/src/assets/icons/ads/app-icons/dog.svg
@ -1,6 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M42.563 11.24V28.8299C42.9323 28.8885 43.3106 28.92 43.696 28.92C47.6592 28.92 49.92 20.7763 49.92 20.7763L42.563 11.24Z" fill="white"/>
-<path opacity="0.6" d="M0 20.7763C0 20.7763 2.26084 28.92 6.22398 28.92C6.60942 28.92 6.98776 28.8885 7.35704 28.8299V11.24L0 20.7763Z" fill="white"/>
-<path opacity="0.6" d="M24.9602 42.1536C24.5175 42.4769 24.0517 42.7673 23.5665 43.0212C22.3755 43.6445 21.0699 44.0452 19.7329 44.2039C21.1528 45.4147 22.9889 46.1296 24.9602 46.1296C26.9319 46.1296 28.7676 45.4147 30.1879 44.2039C28.8505 44.0452 27.5449 43.6445 26.3539 43.0212C25.8691 42.7673 25.403 42.4769 24.9602 42.1536Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.43701 9.4661C9.43701 6.45208 11.9477 4 15.0332 4H34.8867C37.9703 4 40.481 6.45015 40.4829 9.46184V34.5468C40.4829 38.8771 36.8759 42.4 32.4422 42.4C29.7624 42.4 26.4219 41.1132 24.9598 39.1391C23.498 41.1132 21.1201 42.4 18.4407 42.4C14.007 42.4 9.43701 38.8771 9.43701 34.5468V9.4661ZM17.2309 21.2857C17.6193 21.6724 18.1544 21.8945 18.7026 21.8945C19.2502 21.8945 19.7854 21.6724 20.1738 21.2857C20.5605 20.8973 20.7826 20.3605 20.7826 19.8145C20.7826 19.2669 20.5605 18.7301 20.1738 18.3433C19.7854 17.956 19.2502 17.7345 18.7026 17.7345C18.1544 17.7345 17.6193 17.956 17.2309 18.3433C16.8441 18.7301 16.6226 19.2669 16.6226 19.8145C16.6226 20.3621 16.8441 20.8973 17.2309 21.2857ZM24.9598 35.8309L20.5012 30.4779C19.8264 29.3358 19.7606 28.1361 20.3221 27.1868C20.8832 26.2378 21.9792 25.6933 23.3296 25.6933H26.5899C27.94 25.6933 29.0364 26.2374 29.5975 27.1868C30.159 28.1361 30.0936 29.3354 29.4188 30.4775L24.9598 35.8309ZM30.2707 21.2857C30.6575 21.6724 31.1943 21.8945 31.7408 21.8945C32.2884 21.8945 32.8247 21.6724 33.2114 21.2857C33.5987 20.8973 33.8208 20.361 33.8208 19.8145C33.8208 19.2669 33.5987 18.7301 33.2114 18.3433C32.8247 17.9566 32.2884 17.7345 31.7408 17.7345C31.1943 17.7345 30.6575 17.9566 30.2707 18.3433C29.8823 18.7301 29.6608 19.2669 29.6608 19.8145C29.6608 20.361 29.8823 20.8973 30.2707 21.2857Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M42.563 11.24V28.8299C42.9323 28.8885 43.3106 28.92 43.696 28.92C47.6592 28.92 49.92 20.7763 49.92 20.7763L42.563 11.24Z" opacity=".6"/><path fill="#fff" d="M0 20.7763C0 20.7763 2.26084 28.92 6.22398 28.92C6.60942 28.92 6.98776 28.8885 7.35704 28.8299V11.24L0 20.7763Z" opacity=".6"/><path fill="#fff" d="M24.9602 42.1536C24.5175 42.4769 24.0517 42.7673 23.5665 43.0212C22.3755 43.6445 21.0699 44.0452 19.7329 44.2039C21.1528 45.4147 22.9889 46.1296 24.9602 46.1296C26.9319 46.1296 28.7676 45.4147 30.1879 44.2039C28.8505 44.0452 27.5449 43.6445 26.3539 43.0212C25.8691 42.7673 25.403 42.4769 24.9602 42.1536Z" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M9.43701 9.4661C9.43701 6.45208 11.9477 4 15.0332 4H34.8867C37.9703 4 40.481 6.45015 40.4829 9.46184V34.5468C40.4829 38.8771 36.8759 42.4 32.4422 42.4C29.7624 42.4 26.4219 41.1132 24.9598 39.1391C23.498 41.1132 21.1201 42.4 18.4407 42.4C14.007 42.4 9.43701 38.8771 9.43701 34.5468V9.4661ZM17.2309 21.2857C17.6193 21.6724 18.1544 21.8945 18.7026 21.8945C19.2502 21.8945 19.7854 21.6724 20.1738 21.2857C20.5605 20.8973 20.7826 20.3605 20.7826 19.8145C20.7826 19.2669 20.5605 18.7301 20.1738 18.3433C19.7854 17.956 19.2502 17.7345 18.7026 17.7345C18.1544 17.7345 17.6193 17.956 17.2309 18.3433C16.8441 18.7301 16.6226 19.2669 16.6226 19.8145C16.6226 20.3621 16.8441 20.8973 17.2309 21.2857ZM24.9598 35.8309L20.5012 30.4779C19.8264 29.3358 19.7606 28.1361 20.3221 27.1868C20.8832 26.2378 21.9792 25.6933 23.3296 25.6933H26.5899C27.94 25.6933 29.0364 26.2374 29.5975 27.1868C30.159 28.1361 30.0936 29.3354 29.4188 30.4775L24.9598 35.8309ZM30.2707 21.2857C30.6575 21.6724 31.1943 21.8945 31.7408 21.8945C32.2884 21.8945 32.8247 21.6724 33.2114 21.2857C33.5987 20.8973 33.8208 20.361 33.8208 19.8145C33.8208 19.2669 33.5987 18.7301 33.2114 18.3433C32.8247 17.9566 32.2884 17.7345 31.7408 17.7345C31.1943 17.7345 30.6575 17.9566 30.2707 18.3433C29.8823 18.7301 29.6608 19.2669 29.6608 19.8145C29.6608 20.361 29.8823 20.8973 30.2707 21.2857Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/dollar.svg
+++ b/app/client/src/assets/icons/ads/app-icons/dollar.svg
@ -1,4 +1 @@
-<svg width="50" height="44" viewBox="0 0 50 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M39.8683 29.4675C40.7863 27.5467 41.4229 25.4947 41.7485 23.3726C43.5536 23.5856 45.2184 23.9185 46.6058 24.3629C49.3046 25.2177 49.9381 26.0993 49.9508 26.2996V26.313C49.9381 26.5133 49.3046 27.4349 46.4917 28.3164C44.6295 28.9005 42.3438 29.2924 39.8683 29.4675ZM35.318 35.7884C36.6427 34.505 37.7903 33.0732 38.7427 31.5305C41.8811 31.4108 44.8183 31.0031 47.1692 30.3484C48.1345 30.1093 49.0617 29.7508 49.9508 29.3325V32.4996H49.9381C49.9381 32.558 49.92 32.622 49.9014 32.6875L49.9014 32.6876C49.8819 32.7563 49.8619 32.8267 49.8619 32.894C49.8619 33.0614 49.2649 33.8741 46.5214 34.6629C43.9176 35.4039 40.4501 35.8102 36.7793 35.8102C36.2805 35.8102 35.7932 35.8027 35.318 35.7884ZM25.7793 41.2291C28.1583 40.5828 30.4543 39.529 32.5582 38.0629C33.901 38.1938 35.3005 38.2624 36.7147 38.2624C40.6587 38.2624 44.3985 37.7617 47.2576 36.8414C48.1894 36.5436 49.0829 36.1511 49.938 35.691V39.7512H49.9508C49.9508 39.9407 49.3637 40.8745 46.6705 41.7678C44.0922 42.6204 40.6332 43.0941 36.9572 43.0941C33.2684 43.0941 29.8222 42.6339 27.2694 41.8084C26.6743 41.614 26.1832 41.4182 25.7793 41.2291Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.9139 0.883329C32.8766 3.07157 38.1137 8.85336 39.5986 15.9601C39.8594 17.2851 39.9999 18.6503 39.9999 19.9953C40.0199 25.6366 37.6321 30.9968 33.4585 34.7911C25.2918 42.2191 12.6305 41.6369 5.20627 33.4661C-2.21798 25.2953 -1.63608 12.6276 6.53059 5.19959C10.2026 1.86704 15.0183 0.0200757 19.9946 0C22.0011 0 23.9876 0.301135 25.9139 0.883329ZM25.7767 21.8762C25.0466 19.3529 22.6817 17.6192 19.9994 17.6192C18.444 17.6192 17.1743 16.3963 17.1743 14.8793C17.1902 13.3467 18.444 12.1238 19.9994 12.1238C21.5549 12.1238 22.8246 13.3622 22.8246 14.8793C22.8246 15.7306 23.5388 16.4272 24.4117 16.4272C25.2847 16.4272 25.9989 15.7306 25.9989 14.8793C25.9989 12.2632 24.2213 9.95666 21.6342 9.24458V8.54799C21.6342 7.69659 20.92 7 20.0471 7C19.1741 7 18.4599 7.69659 18.4599 8.54799V9.21362C15.2697 10.0495 13.3651 13.2694 14.2063 16.3653C14.9047 18.9195 17.2695 20.6997 19.9836 20.6997C21.539 20.6997 22.8087 21.9226 22.8087 23.4396C22.8087 24.9567 21.5549 26.195 19.9994 26.195C18.444 26.195 17.1743 24.9721 17.1743 23.4551C17.1743 22.6037 16.4601 21.9071 15.5872 21.9071C14.7142 21.9071 14 22.6037 14 23.4551C14.0159 26.1022 15.8252 28.4087 18.444 29.1053V30.452C18.444 31.3034 19.1583 32 20.0312 32C20.9041 32 21.6183 31.3034 21.6183 30.452V29.0898C24.8244 28.2074 26.6655 24.9876 25.7767 21.8762Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="44" fill="none" viewBox="0 0 50 44"><path fill="#fff" fill-rule="evenodd" d="M39.8683 29.4675C40.7863 27.5467 41.4229 25.4947 41.7485 23.3726C43.5536 23.5856 45.2184 23.9185 46.6058 24.3629C49.3046 25.2177 49.9381 26.0993 49.9508 26.2996V26.313C49.9381 26.5133 49.3046 27.4349 46.4917 28.3164C44.6295 28.9005 42.3438 29.2924 39.8683 29.4675ZM35.318 35.7884C36.6427 34.505 37.7903 33.0732 38.7427 31.5305C41.8811 31.4108 44.8183 31.0031 47.1692 30.3484C48.1345 30.1093 49.0617 29.7508 49.9508 29.3325V32.4996H49.9381C49.9381 32.558 49.92 32.622 49.9014 32.6875L49.9014 32.6876C49.8819 32.7563 49.8619 32.8267 49.8619 32.894C49.8619 33.0614 49.2649 33.8741 46.5214 34.6629C43.9176 35.4039 40.4501 35.8102 36.7793 35.8102C36.2805 35.8102 35.7932 35.8027 35.318 35.7884ZM25.7793 41.2291C28.1583 40.5828 30.4543 39.529 32.5582 38.0629C33.901 38.1938 35.3005 38.2624 36.7147 38.2624C40.6587 38.2624 44.3985 37.7617 47.2576 36.8414C48.1894 36.5436 49.0829 36.1511 49.938 35.691V39.7512H49.9508C49.9508 39.9407 49.3637 40.8745 46.6705 41.7678C44.0922 42.6204 40.6332 43.0941 36.9572 43.0941C33.2684 43.0941 29.8222 42.6339 27.2694 41.8084C26.6743 41.614 26.1832 41.4182 25.7793 41.2291Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M25.9139 0.883329C32.8766 3.07157 38.1137 8.85336 39.5986 15.9601C39.8594 17.2851 39.9999 18.6503 39.9999 19.9953C40.0199 25.6366 37.6321 30.9968 33.4585 34.7911C25.2918 42.2191 12.6305 41.6369 5.20627 33.4661C-2.21798 25.2953 -1.63608 12.6276 6.53059 5.19959C10.2026 1.86704 15.0183 0.0200757 19.9946 0C22.0011 0 23.9876 0.301135 25.9139 0.883329ZM25.7767 21.8762C25.0466 19.3529 22.6817 17.6192 19.9994 17.6192C18.444 17.6192 17.1743 16.3963 17.1743 14.8793C17.1902 13.3467 18.444 12.1238 19.9994 12.1238C21.5549 12.1238 22.8246 13.3622 22.8246 14.8793C22.8246 15.7306 23.5388 16.4272 24.4117 16.4272C25.2847 16.4272 25.9989 15.7306 25.9989 14.8793C25.9989 12.2632 24.2213 9.95666 21.6342 9.24458V8.54799C21.6342 7.69659 20.92 7 20.0471 7C19.1741 7 18.4599 7.69659 18.4599 8.54799V9.21362C15.2697 10.0495 13.3651 13.2694 14.2063 16.3653C14.9047 18.9195 17.2695 20.6997 19.9836 20.6997C21.539 20.6997 22.8087 21.9226 22.8087 23.4396C22.8087 24.9567 21.5549 26.195 19.9994 26.195C18.444 26.195 17.1743 24.9721 17.1743 23.4551C17.1743 22.6037 16.4601 21.9071 15.5872 21.9071C14.7142 21.9071 14 22.6037 14 23.4551C14.0159 26.1022 15.8252 28.4087 18.444 29.1053V30.452C18.444 31.3034 19.1583 32 20.0312 32C20.9041 32 21.6183 31.3034 21.6183 30.452V29.0898C24.8244 28.2074 26.6655 24.9876 25.7767 21.8762Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/earth.svg
+++ b/app/client/src/assets/icons/ads/app-icons/earth.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M48.9822 27.9958C48.452 13.1576 36.1701 1.25639 21 1V6.00088C33.4072 6.25434 43.4503 15.919 43.9782 27.9958H48.9822Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M38.6516 21.5748H28.2583C27.6158 17.0079 25.9914 12.9107 24.4452 9.99585C30.4097 10.6175 35.929 15.9487 38.6516 21.5748ZM20.6162 10.1013C21.5351 10.1013 23.0168 11.7642 24.255 15.4793C24.8524 17.272 25.3311 19.3329 25.6795 21.5746H15.5528C15.9014 19.3327 16.3799 17.272 16.9775 15.4793C18.2159 11.7642 19.6974 10.1013 20.6162 10.1013ZM15.1334 35.1001C14.9671 33.2559 14.8793 31.332 14.8793 29.3631C14.8793 27.3942 14.9671 25.4703 15.1334 23.6261H26.0989C26.2651 25.4703 26.353 27.3942 26.353 29.3631C26.353 31.332 26.2651 33.2559 26.0989 35.1001H15.1334ZM20.6162 48.6267C19.6974 48.6267 18.2159 46.9638 16.9777 43.2487C16.3801 41.456 15.9016 39.3951 15.553 37.1532H25.6795C25.3308 39.3951 24.8524 41.4557 24.255 43.2487C23.0165 46.9638 21.5351 48.6267 20.6162 48.6267ZM1.81071 23.6263C1.28338 25.4486 1 27.3734 1 29.3633C1 31.3532 1.28338 33.2778 1.81071 35.1003H12.717C12.5551 33.2181 12.4733 31.2891 12.4733 29.3633C12.4733 27.4375 12.5553 25.5085 12.717 23.6263H1.81071ZM39.4215 23.6263H28.5153C28.6769 25.5085 28.759 27.4375 28.759 29.3633C28.759 31.2891 28.6769 33.2181 28.5153 35.1003H39.4215C39.9489 33.278 40.2323 31.3532 40.2323 29.3633C40.2323 27.3734 39.9489 25.4486 39.4215 23.6263ZM12.974 21.5748C13.6164 17.0078 15.5153 12.9106 17.0615 9.99585C10.4289 11.1005 5.30347 15.9488 2.58064 21.5748H12.974ZM2.58064 37.1532H12.974C13.6164 41.72 15.0418 45.7116 16.5881 48.6267C10.3093 47.6951 5.30347 42.7794 2.58064 37.1532ZM28.2583 37.1532C27.6158 41.7202 25.9914 45.7119 24.4452 48.6267C29.9247 47.4332 35.929 42.7794 38.6516 37.1532H28.2583Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M48.9822 27.9958C48.452 13.1576 36.1701 1.25639 21 1V6.00088C33.4072 6.25434 43.4503 15.919 43.9782 27.9958H48.9822Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M38.6516 21.5748H28.2583C27.6158 17.0079 25.9914 12.9107 24.4452 9.99585C30.4097 10.6175 35.929 15.9487 38.6516 21.5748ZM20.6162 10.1013C21.5351 10.1013 23.0168 11.7642 24.255 15.4793C24.8524 17.272 25.3311 19.3329 25.6795 21.5746H15.5528C15.9014 19.3327 16.3799 17.272 16.9775 15.4793C18.2159 11.7642 19.6974 10.1013 20.6162 10.1013ZM15.1334 35.1001C14.9671 33.2559 14.8793 31.332 14.8793 29.3631C14.8793 27.3942 14.9671 25.4703 15.1334 23.6261H26.0989C26.2651 25.4703 26.353 27.3942 26.353 29.3631C26.353 31.332 26.2651 33.2559 26.0989 35.1001H15.1334ZM20.6162 48.6267C19.6974 48.6267 18.2159 46.9638 16.9777 43.2487C16.3801 41.456 15.9016 39.3951 15.553 37.1532H25.6795C25.3308 39.3951 24.8524 41.4557 24.255 43.2487C23.0165 46.9638 21.5351 48.6267 20.6162 48.6267ZM1.81071 23.6263C1.28338 25.4486 1 27.3734 1 29.3633C1 31.3532 1.28338 33.2778 1.81071 35.1003H12.717C12.5551 33.2181 12.4733 31.2891 12.4733 29.3633C12.4733 27.4375 12.5553 25.5085 12.717 23.6263H1.81071ZM39.4215 23.6263H28.5153C28.6769 25.5085 28.759 27.4375 28.759 29.3633C28.759 31.2891 28.6769 33.2181 28.5153 35.1003H39.4215C39.9489 33.278 40.2323 31.3532 40.2323 29.3633C40.2323 27.3734 39.9489 25.4486 39.4215 23.6263ZM12.974 21.5748C13.6164 17.0078 15.5153 12.9106 17.0615 9.99585C10.4289 11.1005 5.30347 15.9488 2.58064 21.5748H12.974ZM2.58064 37.1532H12.974C13.6164 41.72 15.0418 45.7116 16.5881 48.6267C10.3093 47.6951 5.30347 42.7794 2.58064 37.1532ZM28.2583 37.1532C27.6158 41.7202 25.9914 45.7119 24.4452 48.6267C29.9247 47.4332 35.929 42.7794 38.6516 37.1532H28.2583Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/email.svg
+++ b/app/client/src/assets/icons/ads/app-icons/email.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 9.88973V43.5965H50V9.43213L25 28.8434L0 9.88973Z" fill="white"/>
-<path opacity="0.6" d="M25 26.332L50 7L0 7.41306L25 26.332Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M0 9.88973V43.5965H50V9.43213L25 28.8434L0 9.88973Z"/><path fill="#fff" d="M25 26.332L50 7L0 7.41306L25 26.332Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/euros.svg
+++ b/app/client/src/assets/icons/ads/app-icons/euros.svg
@ -1,4 +1 @@
-<svg width="51" height="51" viewBox="0 0 51 51" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.3542 51.0001C33.1477 51.0001 42.7083 41.4395 42.7083 29.6459C42.7083 17.8523 33.1477 8.29175 21.3542 8.29175C9.56059 8.29175 0 17.8523 0 29.6459C0 41.4395 9.56059 51.0001 21.3542 51.0001ZM22.5154 28.0855V25.1558H18.8747C19.0099 23.5154 20.3872 22.2214 22.062 22.2214H23.2349C24.8522 22.2214 26.1681 23.5373 26.1681 25.1546H29.0978C29.0978 21.9218 26.4677 19.2917 23.2349 19.2917H22.062C18.7714 19.2917 16.0792 21.8988 15.9399 25.1558H13V28.0855H15.9332V31.0199H13V33.9496H15.9399C16.0791 37.2065 18.7714 39.8136 22.062 39.8136H23.2349C26.4677 39.8136 29.0978 37.1835 29.0978 33.9507H26.1681C26.1681 35.5681 24.8522 36.8839 23.2349 36.8839H22.062C20.3872 36.8839 19.0099 35.5901 18.8747 33.9496H22.5154V31.0199H18.8629V28.0855H22.5154Z" fill="white"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M43.303 37.8839C47.4266 33.9906 50.0001 28.4729 50.0001 22.3542C50.0001 10.5606 40.4395 1 28.6459 1C22.5272 1 17.0095 3.57346 13.1162 7.69706C15.6791 6.73469 18.4552 6.20833 21.3543 6.20833C34.2984 6.20833 44.7918 16.7017 44.7918 29.6458C44.7918 32.5449 44.2654 35.321 43.303 37.8839Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="51" height="51" fill="none" viewBox="0 0 51 51"><path fill="#fff" fill-rule="evenodd" d="M21.3542 51.0001C33.1477 51.0001 42.7083 41.4395 42.7083 29.6459C42.7083 17.8523 33.1477 8.29175 21.3542 8.29175C9.56059 8.29175 0 17.8523 0 29.6459C0 41.4395 9.56059 51.0001 21.3542 51.0001ZM22.5154 28.0855V25.1558H18.8747C19.0099 23.5154 20.3872 22.2214 22.062 22.2214H23.2349C24.8522 22.2214 26.1681 23.5373 26.1681 25.1546H29.0978C29.0978 21.9218 26.4677 19.2917 23.2349 19.2917H22.062C18.7714 19.2917 16.0792 21.8988 15.9399 25.1558H13V28.0855H15.9332V31.0199H13V33.9496H15.9399C16.0791 37.2065 18.7714 39.8136 22.062 39.8136H23.2349C26.4677 39.8136 29.0978 37.1835 29.0978 33.9507H26.1681C26.1681 35.5681 24.8522 36.8839 23.2349 36.8839H22.062C20.3872 36.8839 19.0099 35.5901 18.8747 33.9496H22.5154V31.0199H18.8629V28.0855H22.5154Z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M43.303 37.8839C47.4266 33.9906 50.0001 28.4729 50.0001 22.3542C50.0001 10.5606 40.4395 1 28.6459 1C22.5272 1 17.0095 3.57346 13.1162 7.69706C15.6791 6.73469 18.4552 6.20833 21.3543 6.20833C34.2984 6.20833 44.7918 16.7017 44.7918 29.6458C44.7918 32.5449 44.2654 35.321 43.303 37.8839Z" clip-rule="evenodd" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/family.svg
+++ b/app/client/src/assets/icons/ads/app-icons/family.svg
@ -1,8 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.7036 23.148C28.7036 21.1025 30.3618 19.4443 32.4073 19.4443H35.6481L38.8888 23.9655L42.1295 19.4443H45.1104C47.2546 19.4443 48.9508 21.2595 48.8056 23.3988L47.2221 46.7296H31.5073L32.1508 34.5025C32.2689 32.2599 30.7744 30.3217 28.7036 29.78V23.148Z" fill="white"/>
-<circle cx="38.8887" cy="10.1851" r="6.48148" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.21505 25.2688C1.05882 23.1231 2.75755 21.2961 4.90898 21.2961H17.5925C19.638 21.2961 21.2962 22.9543 21.2962 24.9998V29.7799C19.2253 30.3217 17.7309 32.2599 17.8489 34.5024L18.4925 46.7295H2.77765L1.21505 25.2688Z" fill="white"/>
-<path d="M11.0132 6.48145C13.7877 6.48145 16.0836 8.68998 16.3496 11.6143C16.518 13.3776 17.1917 15.1671 18.3707 16.9217C18.5213 17.14 18.5568 17.4193 18.477 17.6723C18.3884 17.9255 18.1932 18.1263 17.9361 18.2224C15.6582 19.0342 13.3533 19.4444 11.084 19.4444C8.8149 19.4444 6.52783 19.0342 4.28512 18.2224C4.0369 18.135 3.85078 17.943 3.76227 17.6986C3.66466 17.4541 3.69128 17.1923 3.82416 16.9653C4.86122 15.1759 5.4819 13.3689 5.67689 11.5968C5.98701 8.68124 8.28295 6.48145 11.0132 6.48145Z" fill="white"/>
-<path opacity="0.6" d="M23.3723 31.4814C21.2413 31.4814 19.5499 33.2753 19.675 35.4026L20.3703 47.2222H29.6295L30.3248 35.4026C30.4499 33.2753 28.7585 31.4814 26.6275 31.4814H23.3723Z" fill="white"/>
-<circle opacity="0.6" cx="24.9999" cy="26.8518" r="2.77778" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M28.7036 23.148C28.7036 21.1025 30.3618 19.4443 32.4073 19.4443H35.6481L38.8888 23.9655L42.1295 19.4443H45.1104C47.2546 19.4443 48.9508 21.2595 48.8056 23.3988L47.2221 46.7296H31.5073L32.1508 34.5025C32.2689 32.2599 30.7744 30.3217 28.7036 29.78V23.148Z" clip-rule="evenodd"/><circle cx="38.889" cy="10.185" r="6.481" fill="#fff"/><path fill="#fff" fill-rule="evenodd" d="M1.21505 25.2688C1.05882 23.1231 2.75755 21.2961 4.90898 21.2961H17.5925C19.638 21.2961 21.2962 22.9543 21.2962 24.9998V29.7799C19.2253 30.3217 17.7309 32.2599 17.8489 34.5024L18.4925 46.7295H2.77765L1.21505 25.2688Z" clip-rule="evenodd"/><path fill="#fff" d="M11.0132 6.48145C13.7877 6.48145 16.0836 8.68998 16.3496 11.6143C16.518 13.3776 17.1917 15.1671 18.3707 16.9217C18.5213 17.14 18.5568 17.4193 18.477 17.6723C18.3884 17.9255 18.1932 18.1263 17.9361 18.2224C15.6582 19.0342 13.3533 19.4444 11.084 19.4444C8.8149 19.4444 6.52783 19.0342 4.28512 18.2224C4.0369 18.135 3.85078 17.943 3.76227 17.6986C3.66466 17.4541 3.69128 17.1923 3.82416 16.9653C4.86122 15.1759 5.4819 13.3689 5.67689 11.5968C5.98701 8.68124 8.28295 6.48145 11.0132 6.48145Z"/><path fill="#fff" d="M23.3723 31.4814C21.2413 31.4814 19.5499 33.2753 19.675 35.4026L20.3703 47.2222H29.6295L30.3248 35.4026C30.4499 33.2753 28.7585 31.4814 26.6275 31.4814H23.3723Z" opacity=".6"/><circle cx="25" cy="26.852" r="2.778" fill="#fff" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/flag.svg
+++ b/app/client/src/assets/icons/ads/app-icons/flag.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M48.1424 28.8396C47.5275 28.4896 46.9846 28.171 46.4321 27.8748C43.4679 26.2863 40.2922 25.9812 36.9725 26.5286C34.3255 27.0325 31.7321 27.7563 29.2231 28.6916C26.4799 29.6384 23.7414 30.6211 20.8589 31.1507C18.2321 31.7021 15.493 31.5623 12.9462 30.7468C11.6988 30.333 10.5284 29.7395 9.47751 28.9877C9.37377 28.8834 9.30236 28.7546 9.27093 28.6153C9.25539 28.5186 9.25539 28.4203 9.27093 28.3236C9.27093 21.1886 9.27093 11.2758 9.27093 4.14081C9.27093 3.97926 9.27093 3.81323 9.27093 3.56642C9.86186 3.90746 10.3423 4.2171 10.89 4.52224C13.5648 5.94635 16.6827 6.46764 19.7203 5.9986C22.2658 5.59369 24.7586 4.9394 27.1573 4.04657C30.3521 2.96511 33.499 1.7535 36.8572 1.19257C39.6677 0.743832 42.4638 0.784218 45.1157 1.91954C46.0766 2.33687 46.999 2.89331 47.9262 3.40487C48.0281 3.49347 48.1013 3.60695 48.1376 3.73245C48.1517 3.80214 48.1517 3.87367 48.1376 3.94336C48.1376 11.1621 48.1376 21.1587 48.1376 28.3774V28.8262L48.1424 28.8396Z" fill="white"/>
-<path opacity="0.6" d="M2.77783 3.24084C2.77783 1.96241 3.81421 0.926025 5.09265 0.926025C6.37108 0.926025 7.40746 1.9624 7.40746 3.24084V47.2223H2.77783V3.24084Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" d="M48.1424 28.8396C47.5275 28.4896 46.9846 28.171 46.4321 27.8748C43.4679 26.2863 40.2922 25.9812 36.9725 26.5286C34.3255 27.0325 31.7321 27.7563 29.2231 28.6916C26.4799 29.6384 23.7414 30.6211 20.8589 31.1507C18.2321 31.7021 15.493 31.5623 12.9462 30.7468C11.6988 30.333 10.5284 29.7395 9.47751 28.9877C9.37377 28.8834 9.30236 28.7546 9.27093 28.6153C9.25539 28.5186 9.25539 28.4203 9.27093 28.3236C9.27093 21.1886 9.27093 11.2758 9.27093 4.14081C9.27093 3.97926 9.27093 3.81323 9.27093 3.56642C9.86186 3.90746 10.3423 4.2171 10.89 4.52224C13.5648 5.94635 16.6827 6.46764 19.7203 5.9986C22.2658 5.59369 24.7586 4.9394 27.1573 4.04657C30.3521 2.96511 33.499 1.7535 36.8572 1.19257C39.6677 0.743832 42.4638 0.784218 45.1157 1.91954C46.0766 2.33687 46.999 2.89331 47.9262 3.40487C48.0281 3.49347 48.1013 3.60695 48.1376 3.73245C48.1517 3.80214 48.1517 3.87367 48.1376 3.94336C48.1376 11.1621 48.1376 21.1587 48.1376 28.3774V28.8262L48.1424 28.8396Z"/><path fill="#fff" d="M2.77783 3.24084C2.77783 1.96241 3.81421 0.926025 5.09265 0.926025C6.37108 0.926025 7.40746 1.9624 7.40746 3.24084V47.2223H2.77783V3.24084Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/football.svg
+++ b/app/client/src/assets/icons/ads/app-icons/football.svg
--- a/app/client/src/assets/icons/ads/app-icons/hat.svg
+++ b/app/client/src/assets/icons/ads/app-icons/hat.svg
@ -1,4 +1 @@
-<svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M46.44 34.56C46.019 32.5352 41.6957 16.0689 41.1522 14.0067C40.0224 9.72019 37.2265 9.71997 34.9004 9.71997C32.0681 9.71997 20.8447 9.72019 18.0124 9.72019C15.6864 9.72019 13.5483 9.72019 11.7607 14.0069C10.9171 16.0297 6.90078 32.5064 6.47998 34.5262L46.44 34.56Z" fill="white"/>
-<path opacity="0.6" d="M48.0591 44.28L5.93483 44.2417C3.18853 44.2393 0.0698242 36.72 0.0698242 36.72H53.9292C53.9292 36.72 50.8051 44.2824 48.0591 44.28Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="54" height="54" fill="none" viewBox="0 0 54 54"><path fill="#fff" d="M46.44 34.56C46.019 32.5352 41.6957 16.0689 41.1522 14.0067C40.0224 9.72019 37.2265 9.71997 34.9004 9.71997C32.0681 9.71997 20.8447 9.72019 18.0124 9.72019C15.6864 9.72019 13.5483 9.72019 11.7607 14.0069C10.9171 16.0297 6.90078 32.5064 6.47998 34.5262L46.44 34.56Z"/><path fill="#fff" d="M48.0591 44.28L5.93483 44.2417C3.18853 44.2393 0.0698242 36.72 0.0698242 36.72H53.9292C53.9292 36.72 50.8051 44.2824 48.0591 44.28Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/headphones.svg
+++ b/app/client/src/assets/icons/ads/app-icons/headphones.svg
@ -1,5 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M6.01367 24.2738C6.74397 24.1058 7.49701 24.0199 8.2592 24.0199H10.0313C10.5339 16.1173 17.0436 9 25.0001 9C32.9566 9 39.4663 16.1173 39.9689 24.0199H41.741C42.5032 24.0199 43.2562 24.1058 43.9865 24.2738C43.6057 14.0721 35.2509 5 25.0001 5C14.7493 5 6.39458 14.072 6.01367 24.2738Z" fill="white"/>
-<path d="M46.439 27.2514C45.1887 26.4458 43.7382 26.0199 42.2441 26.0199H38.7002V44.5111H42.2441C46.5208 44.5111 50 41.0318 50 36.7552V33.7757C50 31.126 48.6686 28.6869 46.439 27.2514Z" fill="white"/>
-<path d="M11.2998 26.0199H7.75586C6.26182 26.0199 4.81133 26.4457 3.56162 27.251C1.33145 28.6869 0 31.126 0 33.7758V36.7552C0 41.0318 3.4793 44.5111 7.75586 44.5111H11.2998V26.0199Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M6.01367 24.2738C6.74397 24.1058 7.49701 24.0199 8.2592 24.0199H10.0313C10.5339 16.1173 17.0436 9 25.0001 9C32.9566 9 39.4663 16.1173 39.9689 24.0199H41.741C42.5032 24.0199 43.2562 24.1058 43.9865 24.2738C43.6057 14.0721 35.2509 5 25.0001 5C14.7493 5 6.39458 14.072 6.01367 24.2738Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" d="M46.439 27.2514C45.1887 26.4458 43.7382 26.0199 42.2441 26.0199H38.7002V44.5111H42.2441C46.5208 44.5111 50 41.0318 50 36.7552V33.7757C50 31.126 48.6686 28.6869 46.439 27.2514Z"/><path fill="#fff" d="M11.2998 26.0199H7.75586C6.26182 26.0199 4.81133 26.4457 3.56162 27.251C1.33145 28.6869 0 31.126 0 33.7758V36.7552C0 41.0318 3.4793 44.5111 7.75586 44.5111H11.2998V26.0199Z"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/hospital.svg
+++ b/app/client/src/assets/icons/ads/app-icons/hospital.svg
@ -1,4 +1 @@
-<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 10.6992L49.9743 10.7198V47.2545H0V10.6992ZM28.0795 25.9297H36V32.0795H28.0703V40H21.9205V32.0795H14V25.9205H21.9205V18H28.0795V25.9297Z" fill="white"/>
-<path opacity="0.6" d="M15.6245 3H34.3597V8.69923H30.7213V6.69923H19.3537V8.69923H15.6245L15.6245 3Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" fill="none" viewBox="0 0 50 50"><path fill="#fff" fill-rule="evenodd" d="M0 10.6992L49.9743 10.7198V47.2545H0V10.6992ZM28.0795 25.9297H36V32.0795H28.0703V40H21.9205V32.0795H14V25.9205H21.9205V18H28.0795V25.9297Z" clip-rule="evenodd"/><path fill="#fff" d="M15.6245 3H34.3597V8.69923H30.7213V6.69923H19.3537V8.69923H15.6245L15.6245 3Z" opacity=".6"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/joystick.svg
+++ b/app/client/src/assets/icons/ads/app-icons/joystick.svg
@ -1,4 +1 @@
-<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M1.83134 25.6111C2.75457 30.0697 6.69657 33.5886 11.631 33.5886H12.2273L10.4374 37.3989C9.56839 38.8477 7.9788 39.748 6.28698 39.748C2.31627 39.748 -1.01655 37.3989 0.287228 32.1728L1.83134 25.6111Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M46.482 17.782L49.8336 32.0245C51.4996 37.2507 47.8045 39.5998 43.8338 39.5998C42.142 39.5998 40.5524 38.6995 39.6834 37.2507L37.102 31.7556H34.9948H15.0046H12.8484C6.38211 31.7556 1.61599 25.7111 3.12415 19.4232L3.51781 17.782C4.7511 12.5394 9.40122 10 13.3429 10H36.6572C42.0428 10 45.5794 13.9452 46.482 17.782ZM17.0516 22.3425H18.7247C19.5334 22.3425 20.1892 21.6867 20.1892 20.878C20.1892 20.0689 19.5334 19.4131 18.7247 19.4131H17.0516V17.74C17.0516 16.9313 16.3958 16.2756 15.5868 16.2756C14.778 16.2756 14.1223 16.9313 14.1223 17.74V19.4131H12.4492C11.6404 19.4131 10.9847 20.0689 10.9847 20.878C10.9847 21.6867 11.6404 22.3425 12.4492 22.3425H14.1223V24.0156C14.1223 24.8243 14.778 25.48 15.5868 25.48C16.3958 25.48 17.0516 24.8243 17.0516 24.0156V22.3425ZM31.2751 22.3425C30.4667 22.3425 29.8106 21.6863 29.8106 20.878C29.8106 20.0693 30.4671 19.4131 31.2751 19.4131C32.0838 19.4131 32.7399 20.0693 32.7399 20.878C32.7399 21.6863 32.0838 22.3425 31.2751 22.3425ZM32.9482 24.0156C32.9482 24.8239 33.6047 25.48 34.413 25.48C35.2214 25.48 35.8775 24.8239 35.8775 24.0156C35.8775 23.2072 35.2214 22.5507 34.413 22.5507C33.6047 22.5507 32.9482 23.2072 32.9482 24.0156ZM34.413 19.2049C33.6047 19.2049 32.9482 18.5487 32.9482 17.74C32.9482 16.9317 33.6047 16.2756 34.413 16.2756C35.2214 16.2756 35.8775 16.9317 35.8775 17.74C35.8775 18.5487 35.2214 19.2049 34.413 19.2049ZM36.0858 20.878C36.0858 21.6863 36.7423 22.3425 37.5506 22.3425C38.359 22.3425 39.0151 21.6863 39.0151 20.878C39.0151 20.0693 38.359 19.4131 37.5506 19.4131C36.7423 19.4131 36.0858 20.0693 36.0858 20.878Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="51" height="50" fill="none" viewBox="0 0 51 50"><path fill="#fff" fill-rule="evenodd" d="M1.83134 25.6111C2.75457 30.0697 6.69657 33.5886 11.631 33.5886H12.2273L10.4374 37.3989C9.56839 38.8477 7.9788 39.748 6.28698 39.748C2.31627 39.748 -1.01655 37.3989 0.287228 32.1728L1.83134 25.6111Z" clip-rule="evenodd" opacity=".6"/><path fill="#fff" fill-rule="evenodd" d="M46.482 17.782L49.8336 32.0245C51.4996 37.2507 47.8045 39.5998 43.8338 39.5998C42.142 39.5998 40.5524 38.6995 39.6834 37.2507L37.102 31.7556H34.9948H15.0046H12.8484C6.38211 31.7556 1.61599 25.7111 3.12415 19.4232L3.51781 17.782C4.7511 12.5394 9.40122 10 13.3429 10H36.6572C42.0428 10 45.5794 13.9452 46.482 17.782ZM17.0516 22.3425H18.7247C19.5334 22.3425 20.1892 21.6867 20.1892 20.878C20.1892 20.0689 19.5334 19.4131 18.7247 19.4131H17.0516V17.74C17.0516 16.9313 16.3958 16.2756 15.5868 16.2756C14.778 16.2756 14.1223 16.9313 14.1223 17.74V19.4131H12.4492C11.6404 19.4131 10.9847 20.0689 10.9847 20.878C10.9847 21.6867 11.6404 22.3425 12.4492 22.3425H14.1223V24.0156C14.1223 24.8243 14.778 25.48 15.5868 25.48C16.3958 25.48 17.0516 24.8243 17.0516 24.0156V22.3425ZM31.2751 22.3425C30.4667 22.3425 29.8106 21.6863 29.8106 20.878C29.8106 20.0693 30.4671 19.4131 31.2751 19.4131C32.0838 19.4131 32.7399 20.0693 32.7399 20.878C32.7399 21.6863 32.0838 22.3425 31.2751 22.3425ZM32.9482 24.0156C32.9482 24.8239 33.6047 25.48 34.413 25.48C35.2214 25.48 35.8775 24.8239 35.8775 24.0156C35.8775 23.2072 35.2214 22.5507 34.413 22.5507C33.6047 22.5507 32.9482 23.2072 32.9482 24.0156ZM34.413 19.2049C33.6047 19.2049 32.9482 18.5487 32.9482 17.74C32.9482 16.9317 33.6047 16.2756 34.413 16.2756C35.2214 16.2756 35.8775 16.9317 35.8775 17.74C35.8775 18.5487 35.2214 19.2049 34.413 19.2049ZM36.0858 20.878C36.0858 21.6863 36.7423 22.3425 37.5506 22.3425C38.359 22.3425 39.0151 21.6863 39.0151 20.878C39.0151 20.0693 38.359 19.4131 37.5506 19.4131C36.7423 19.4131 36.0858 20.0693 36.0858 20.878Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/laptop.svg
+++ b/app/client/src/assets/icons/ads/app-icons/laptop.svg
@ -1,4 +1 @@
-<svg width="54" height="50" viewBox="0 0 54 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M53.4343 39.3362C53.5078 39.3362 53.5777 39.3688 53.6252 39.4239C53.6726 39.479 53.694 39.553 53.6838 39.626L53.6838 39.6264C53.6726 39.6937 52.9206 44.226 47.1772 44.226H6.50934C0.751685 44.226 0.009848 39.6719 0.00270514 39.626C-0.00800915 39.553 0.0134194 39.479 0.0613786 39.4239C0.109338 39.3683 0.178726 39.3362 0.252195 39.3362H53.4343ZM23.144 42.6311H30.542V40.9301H23.144V42.6311Z" fill="#F9F9F9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.3454 37.3362H4.34033V6.36377H49.3454V37.3362ZM45.774 9.9352H7.91176V33.7648H45.774V9.9352Z" fill="#F9F9F9"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="54" height="50" fill="none" viewBox="0 0 54 50"><path fill="#F9F9F9" fill-rule="evenodd" d="M53.4343 39.3362C53.5078 39.3362 53.5777 39.3688 53.6252 39.4239C53.6726 39.479 53.694 39.553 53.6838 39.626L53.6838 39.6264C53.6726 39.6937 52.9206 44.226 47.1772 44.226H6.50934C0.751685 44.226 0.009848 39.6719 0.00270514 39.626C-0.00800915 39.553 0.0134194 39.479 0.0613786 39.4239C0.109338 39.3683 0.178726 39.3362 0.252195 39.3362H53.4343ZM23.144 42.6311H30.542V40.9301H23.144V42.6311Z" clip-rule="evenodd" opacity=".6"/><path fill="#F9F9F9" fill-rule="evenodd" d="M49.3454 37.3362H4.34033V6.36377H49.3454V37.3362ZM45.774 9.9352H7.91176V33.7648H45.774V9.9352Z" clip-rule="evenodd"/></svg>
--- a/app/client/src/assets/icons/ads/app-icons/lightning.svg
+++ b/app/client/src/assets/icons/ads/app-icons/lightning.svg
@ -1,5 +1 @@
-<svg width="66" height="67" viewBox="0 0 66 67" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M20.4481 22.9908C24.9194 17.6621 32.0543 15.8577 38.2962 17.8867L44.6844 15.1046C35.6084 9.45211 23.4886 11.1894 16.4213 19.6119C9.9914 27.2748 9.73682 38.0961 15.1225 45.9776L18.9963 42.2902C15.3948 36.3797 15.7589 28.5791 20.4481 22.9908Z" fill="white"/>
-<path opacity="0.6" d="M49.8803 47.6875C56.3089 40.0261 56.5647 29.208 51.1827 21.327L47.3011 25.0027C50.9069 30.914 50.5443 38.7183 45.8535 44.3086C41.4083 49.6062 34.3305 51.4204 28.1146 49.4478L21.6346 52.2055C30.7085 57.8451 42.8175 56.1046 49.8803 47.6875Z" fill="white"/>
-<path d="M45.1876 38.6713L37.0262 31.1121L50.9254 16.4441L20.6887 29.1387L28.646 36.732L15.3787 50.8447L45.1876 38.6713Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="66" height="67" fill="none" viewBox="0 0 66 67"><path fill="#fff" d="M20.4481 22.9908C24.9194 17.6621 32.0543 15.8577 38.2962 17.8867L44.6844 15.1046C35.6084 9.45211 23.4886 11.1894 16.4213 19.6119C9.9914 27.2748 9.73682 38.0961 15.1225 45.9776L18.9963 42.2902C15.3948 36.3797 15.7589 28.5791 20.4481 22.9908Z" opacity=".6"/><path fill="#fff" d="M49.8803 47.6875C56.3089 40.0261 56.5647 29.208 51.1827 21.327L47.3011 25.0027C50.9069 30.914 50.5443 38.7183 45.8535 44.3086C41.4083 49.6062 34.3305 51.4204 28.1146 49.4478L21.6346 52.2055C30.7085 57.8451 42.8175 56.1046 49.8803 47.6875Z" opacity=".6"/><path fill="#fff" d="M45.1876 38.6713L37.0262 31.1121L50.9254 16.4441L20.6887 29.1387L28.646 36.732L15.3787 50.8447L45.1876 38.6713Z"/></svg>
--- a/Show More
+++ b/Show More