diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 6656e09cf..1701bd74f 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -3,16 +3,17 @@ name: Core
 on: [pull_request]
 
 permissions:
-  id-token: write      # for fetching the OIDC token
-  contents: read       # for actions/checkout
-  pull-requests: write # For dflook comments on PR
+  id-token: write       # for fetching the OIDC token
+  contents: read        # for actions/checkout
+  pull-requests: write  # For dflook comments on PR
 
 env:
   PULL_COMMENT: |
-    |core UI changes|[master diff](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/)|    |    |
-    |---------------|------------------------------------------------------------------------------------|----|----|
-    |Model T     |[device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/)|[click test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/)|[persistence test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/)|
-    |Model Safe 3|[device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_device_test/)|[click test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/)|[persistence test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_persistence_test/)|
+    |core UI changes|device test|click test|persistence test|
+    |---------------|-----------|----------|----------------|
+    |Model T        |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_device_test/master_diff.html)) |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_click_test/master_diff.html)) |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2T1-core_persistence_test/master_diff.html))||
+    |Model Safe 3   |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_device_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_device_test/master_diff.html)) |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_click_test/master_diff.html)) |[test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_persistence_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_persistence_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_persistence_test/master_index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T2B1-core_persistence_test/master_diff.html))||
+    |All            |[main](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/index.html)([screens](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/master_diff.html)) ||
 
 jobs:
   core_firmware:
@@ -178,7 +179,6 @@ jobs:
           - model: T2B1
     env:
       TREZOR_PROFILING: ${{ matrix.asan == 'noasan' && '1' || '0' }}
-      # MULTICORE: 4  # more could interfere with other jobs
       TREZOR_MODEL: ${{ matrix.model == 'T2T1' && 'T' || 'R' }}
       TREZOR_PYTEST_SKIP_ALTCOINS: ${{ matrix.coins == 'btconly' && '1' || '0' }}
       ADDRESS_SANITIZER: ${{ matrix.asan == 'asan' && '1' || '0' }}
@@ -581,8 +581,8 @@ jobs:
           path: core/htmlcov
           retention-days: 7
 
-  core_ui_master:
-    name: UI diff from master
+  core_ui_main:
+    name: UI diff from main branch
     runs-on: ubuntu-latest
     needs:
       - core_click_test
@@ -602,7 +602,7 @@ jobs:
       - run: "for F in screens_*.tar; do tar xvf $F; done"
       - run: nix-shell --run "poetry run python -m tests.ui_tests.reporting master-diff TT TR"
       - run: mv tests/ui_tests/reports/master_diff .
-      - name: Upload master diff
+      - name: Upload diff from main branch
         run: |
           aws s3 sync master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}
 
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
index c482d2aa8..c1195315c 100644
--- a/.github/workflows/legacy.yml
+++ b/.github/workflows/legacy.yml
@@ -3,14 +3,14 @@ name: Legacy
 on: [pull_request]
 
 permissions:
-  id-token: write      # for fetching the OIDC token
-  contents: read       # for actions/checkout
-  pull-requests: write # For dflook comments on PR
+  id-token: write       # for fetching the OIDC token
+  contents: read        # for actions/checkout
+  pull-requests: write  # For dflook comments on PR
 
 env:
   PULL_COMMENT: |
-    |legacy UI changes|[master diff](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/)|[device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/)|
-    |-----------------|------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
+    |legacy UI changes|[device test](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/index.html)([screens](https://data.trezor.io/dev/firmware/ui_report/${{ github.run_id }}/T1B1-legacy_device_test/differing_screens.html)) [main](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/)([screens](https://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}/master_diff.html))|
+    |-----------------|-----|
 
 jobs:
   legacy_firmware:
@@ -143,8 +143,8 @@ jobs:
       # see python_test for explanation of _PYTHON_SYSCONFIGDATA_NAME
       - run: nix-shell --arg fullDeps true --run "unset _PYTHON_SYSCONFIGDATA_NAME && cd HWI && poetry install && poetry run ./test/test_trezor.py --model_1 ../legacy/firmware/trezor.elf bitcoind"
 
-  legacy_ui_master:
-    name: UI diff from master
+  legacy_ui_main:
+    name: UI diff from main branch
     runs-on: ubuntu-latest
     needs:
       - legacy_device_test
@@ -162,7 +162,7 @@ jobs:
       - run: "for F in screens_*.tar; do tar xvf $F; done"
       - run: nix-shell --run "poetry run python -m tests.ui_tests.reporting master-diff T1"
       - run: mv tests/ui_tests/reports/master_diff .
-      - name: Upload master diff
+      - name: Upload main branch diff
         run: |
           aws s3 sync master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}
 
@@ -176,8 +176,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - run: |
           git fetch origin main
-          git diff --quiet origin/main...HEAD -- tests/ui_tests/fixtures.json
-          echo "FIXTURES_CHANGED=$?" >> $GITHUB_OUTPUT
+          git diff --quiet origin/main...HEAD -- tests/ui_tests/fixtures.json || echo "FIXTURES_CHANGED=$?" >> $GITHUB_OUTPUT
         id: check-fixtures-changed
       - uses: ./.github/actions/ui-comment
         if: ${{ steps.check-fixtures-changed.outputs.FIXTURES_CHANGED == '1' }}