diff --git a/circle.yml b/circle.yml
index bc40397d3952..df7307f7f0bb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -740,6 +740,9 @@ jobs:
           command: |
             CYPRESS_KONFIG_ENV=production \
             CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
+            PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
+            PERCY_PARALLEL_TOTAL=-1 \
+            yarn percy exec -- \
             yarn cypress:run --record --parallel --group 2x-desktop-gui
           working_directory: packages/desktop-gui
       - verify-mocha-results
@@ -749,38 +752,6 @@ jobs:
           path: /tmp/artifacts
       - store-npm-logs
 
-  desktop-gui-visual-tests:
-    <<: *defaults
-    parallelism: 1
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          command: yarn build-prod
-          working_directory: packages/desktop-gui
-      - run:
-          name: Desktop GUI server
-          command: yarn start
-          working_directory: packages/desktop-gui
-          background: true
-      - run:
-          # will use PERCY_TOKEN environment variable if available
-          # to tie Percy builds together, use environment variables
-          # https://docs.percy.io/docs/parallel-test-suites
-          # we can use workflow id and list number of jobs with Percy screenshots
-          # if we allow Percy snapshots in more jobs, use the same
-          # PERCY_* variables in all of them
-          command: |
-            CYPRESS_KONFIG_ENV=production \
-            PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
-            PERCY_PARALLEL_TOTAL=1 \
-            yarn percy exec -- \
-            yarn cypress:run --spec cypress/integration/settings_spec.js,cypress/integration/specs_list_spec.js
-          working_directory: packages/desktop-gui
-      - verify-mocha-results
-      # we don't really need any artifacts - we are only interested in visual screenshots
-      - store-npm-logs
-
   desktop-gui-component-tests:
     <<: *defaults
     parallelism: 1
@@ -807,7 +778,7 @@ jobs:
           command: |
             CYPRESS_KONFIG_ENV=production \
             PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
-            PERCY_PARALLEL_TOTAL=1 \
+            PERCY_PARALLEL_TOTAL=-1 \
             yarn percy exec -- \
             yarn cypress:run --spec 'src/**/*_spec.jsx'
           working_directory: packages/desktop-gui
@@ -866,6 +837,13 @@ jobs:
           command: node index.js
           working_directory: packages/launcher
 
+  finalize-percy:
+    <<: *defaults
+    steps:
+      - run:
+          name: "finalizes percy builds"
+          command: npx percy finalize --all
+
   build-binary:
     <<: *defaults
     shell: /bin/bash --login
@@ -1582,9 +1560,6 @@ linux-workflow: &linux-workflow
     - desktop-gui-integration-tests-2x:
         requires:
           - build
-    - desktop-gui-visual-tests:
-        requires:
-          - build
     - desktop-gui-component-tests:
         requires:
           - build
@@ -1597,6 +1572,13 @@ linux-workflow: &linux-workflow
     - run-launcher:
         requires:
           - build
+
+    - percy-finalize:
+        requires:
+          - desktop-gui-integration-tests-2x
+          - desktop-gui-component-tests
+          - cli-visual-tests
+
     # various testing scenarios, like building full binary
     # and testing it on a real project
     - test-against-staging: