diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
deleted file mode 100644
index 0aa0f6207..000000000
--- a/.gitlab/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-#syntax=docker/dockerfile:1.4
-
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE} as base-image
-
-FROM ghcr.io/friendsofshopware/shopware-cli:latest-php-8.2 as build
-ARG CI_JOB_TOKEN
-
-COPY --from=base-image /var/www/html /src
-WORKDIR /src
-
-COPY . /src/custom/plugins/SwagMigrationAssistant
-
-ENV COMPOSER_ALLOW_SUPERUSER=1
-
-RUN /src/vendor/bin/composer -d /src/custom/plugins/SwagMigrationAssistant require --no-update 'shopware/core:*' \
-    && /src/vendor/bin/composer require --no-plugins --no-scripts -o swag/migration-assistant \
-    && rm -Rf /src/var/cache/* \
-    && /usr/local/bin/entrypoint.sh shopware-cli project admin-build /src \
-    && /usr/local/bin/entrypoint.sh shopware-cli project storefront-build --skip-theme-compile /src \
-    && find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + \
-    && find . -name '.git' -type d -prune -exec rm -rf '{}' + \
-    && rm -Rf /src/public/bundles || true
-
-FROM base-image
-
-COPY --from=build --chown=www-data --link /src /var/www/html
-
-USER root
-RUN apk add --no-cache mysql-client
-
-USER www-data
-
-ADD .gitlab/post_install_migration_assistant.sh /usr/local/shopware/post_install.d/99_post_install_migration_assistant.sh
diff --git a/.gitlab/install_test_data.php b/.gitlab/install_test_data.php
deleted file mode 100644
index 2077805ba..000000000
--- a/.gitlab/install_test_data.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-echo 'SwagMigrationAssistant: install test data script with PHP version ' . phpversion() . PHP_EOL;
-
-function failAssert(bool $condition, string $message) {
-    if ($condition)
-        return;
-
-    echo "SwagMigrationAssistant: failed asserting with message " . $message . PHP_EOL;
-    exit($message);
-}
-
-$pluginPath = dirname(__DIR__);
-echo "SwagMigrationAssistant: plugin path=" . $pluginPath . PHP_EOL;
-
-$envFilePath = realpath($pluginPath . '/../../../.env');
-$env = parse_ini_file($envFilePath);
-failAssert($env !== false, 'SwagMigrationAssistant: could not parse env file at path=' . $envFilePath);
-
-// DATABASE_URL="mysql://app:app@127.0.0.1:3306/shopware"
-$databaseUrl = $env['DATABASE_URL'];
-if ($envDatabaseUrl = getenv('DATABASE_URL')) {
-    $databaseUrl = $envDatabaseUrl;
-}
-
-$matches = [];
-failAssert(preg_match('#//(.+?):(.+?)@(.+?)(?::(.+)/|/)(.+?)$#', $databaseUrl, $matches) === 1, 'SwagMigrationAssistant: could not parse DATABASE_URL');
-
-$user = $matches[1];
-$password = $matches[2];
-$host = $matches[3];
-$port = $matches[4];
-$dbName = $matches[5];
-
-echo "SwagMigrationAssistant: found DB host: " . $host . PHP_EOL;
-echo "SwagMigrationAssistant: found DB user: " . $user . PHP_EOL;
-
-$testDataPath = $pluginPath . '/tests/_fixtures/database/sw55.sql';
-echo "SwagMigrationAssistant: test data path: " . $testDataPath . PHP_EOL;
-failAssert(file_exists($testDataPath), 'test data sql file does not exists');
-
-// import test data
-// mysql -u"$user" -p"$password" --host "$host" < tests/_fixtures/database/sw55.sql
-$cmd = sprintf('mysql -u"%s" -p"%s" --host "%s" < %s', $user, $password, $host, $testDataPath);
-$output = [];
-$resultCode = 0;
-echo "SwagMigrationAssistant: executing mysql command..." . PHP_EOL;
-exec($cmd, $output, $resultCode);
-
-foreach ($output as $out) {
-    echo $out . PHP_EOL;
-}
-
-echo "SwagMigrationAssistant: finished with install test data script" . PHP_EOL;
-exit($resultCode);
diff --git a/.gitlab/post_install_migration_assistant.sh b/.gitlab/post_install_migration_assistant.sh
deleted file mode 100755
index 836133683..000000000
--- a/.gitlab/post_install_migration_assistant.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-# Be careful: there is no bash inside the alpine container by default, so bash syntax doesn't really work here
-
-# PHP to the rescue
-php ./custom/plugins/SwagMigrationAssistant/.gitlab/install_test_data.php
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss
index d415e6a11..f901d499b 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-assistant/swag-migration-assistant.scss
@@ -2,10 +2,12 @@
 
 .swag-migration-assistant {
     h4.swag-migration-assistant__headline {
-        font-size: 32px;
+        color: var(--color-text-primary-default);
+        font-size: var(--font-size-2xl);
+        font-weight: var(--font-weight-medium);
+        padding-top: var(--scale-size-10);
         text-align: center;
         margin: 0;
-        padding-top: var(--scale-size-10);
     }
 
     .swag-migration-assistant__paragraph {
@@ -23,7 +25,7 @@
     }
 
     .swag-migration-assistant__illustration {
-        width: 136px;
+        width: var(--scale-size-128);
         display: block;
         margin: 0 auto;
         padding-bottom: var(--scale-size-16);
@@ -32,15 +34,17 @@
     h5.swag-migration-assistant__title {
         font-weight: var(--font-weight-semibold);
         margin-bottom: var(--scale-size-8);
+        color: var(--color-text-primary-default);
     }
 
     .swag-migration-assistant__content {
         white-space: pre-line;
+        color: var(--color-text-secondary-default);
     }
 
     .swag-migration-assistant__content,
     .swag-migration-assistant__link a.link {
-        font-size: $font-size-xxs;
-        line-height: 22px;
+        font-size: var(--font-size-xs);
+        line-height: var(--font-line-height-xs);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss
index 10e990724..ff16731ad 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/swag-migration-confirm-warning.scss
@@ -3,7 +3,7 @@
 .swag-migration-confirm-warning {
     .swag-migration-confirm-warning__card {
         text-align: center;
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
 
     .swag-migration-confirm-warning__bubble {
@@ -11,7 +11,7 @@
         width: var(--scale-size-72);
         height: var(--scale-size-72);
         border-radius: var(--border-radius-round);
-        background-color: $color-pumpkin-spice-50;
+        background-color: var(--color-background-attention-default);
         flex-shrink: 0;
         display: flex;
         align-items: center;
@@ -19,13 +19,14 @@
     }
 
     .swag-migration-confirm-warning__bubble-icon {
-        color: $color-pumpkin-spice-500;
+        color: var(--color-icon-attention-default);
     }
 
     h5.swag-migration-confirm-warning__title {
-        font-size: 18px;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
-        line-height: 25px;
+        line-height: var(--font-line-height-s);
+        color: var(--color-text-primary-default);
     }
 
     .swag-migration-confirm-warning__alert {
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.html.twig b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.html.twig
index 1a32ff1cb..6fb496b5a 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.html.twig
@@ -31,7 +31,7 @@
         {% endblock %}
 
         {% block swag_migration_premapping_success_card %}
-            <mt-card v-if="!isLoading && isPremappingValid"
+            <mt-card v-if="!isLoading && isPremappingValid && premapping?.length > 0"
                      class="swag-migration-premapping__success-card"
                      position-identifier="swag-migration-premapping__success-card">
 
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss
index ef9012176..e38c480a4 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/swag-migration-premapping.scss
@@ -3,15 +3,23 @@
 .swag-migration-premapping {
     .swag-migration-premapping__success-card {
         text-align: center;
-        font-size: 14px;
+        font-size: var(--font-size-xs);
+
+        .mt-card__content {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            height: var(--scale-size-256);
+        }
     }
 
     .swag-migration-premapping__success-bubble {
-        margin: var(--scale-size-12) auto var(--scale-size-20) auto;
+        margin: 0 auto var(--scale-size-20) auto;
         width: var(--scale-size-72);
         height: var(--scale-size-72);
         border-radius: var(--border-radius-round);
-        background-color: $color-emerald-50;
+        background-color: var(--color-background-positive-default);
         flex-shrink: 0;
         display: flex;
         align-items: center;
@@ -19,39 +27,38 @@
     }
 
     .swag-migration-premapping__success-icon {
-        color: $color-emerald-500;
+        color: var(--color-icon-positive-default);
     }
 
     .swag-migration-premapping__success-title {
-        font-size: 18px;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
-        margin-bottom: 5px;
+        margin-bottom: var(--scale-size-4);
     }
 
     .swag-migration-premapping__success-caption {
-        color: $color-gray-500;
-        margin-bottom: 45px;
+        color: var(--color-text-secondary-default);
     }
 
     .swag-migration-premapping__loading-card {
         text-align: center;
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
 
     .swag-migration-premapping__loading-title {
-        font-size: 18px;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
-        margin-bottom: 5px;
+        margin-bottom: var(--scale-size-4);
     }
 
     .swag-migration-premapping__loading-caption {
-        color: $color-gray-500;
-        margin-bottom: 45px;
+        color: var(--color-text-secondary-default);
+        margin-bottom: var(--scale-size-48);
     }
 
     .sw-loader.swag-migration-premapping__loader {
         position: relative;
-        margin: var(--scale-size-12) auto 42px auto;
+        margin: var(--scale-size-12) auto var(--scale-size-40) auto;
 
         .sw-loader__container {
             transform: translate(-50%);
@@ -59,12 +66,12 @@
     }
 
     .swag-migration-premapping__alert {
-        max-width: 800px;
+        max-width: 60rem;
         margin-left: auto;
         margin-right: auto;
 
-        @media screen and (max-width: 1360px) {
-            max-width: 770px;
+        @media screen and (max-width: 85rem) {
+            max-width: calc(var(--scale-size-256) * 3);
         }
     }
 
@@ -75,30 +82,30 @@
     .swag-migration-premapping__unfilled-card {
         margin-top: var(--scale-size-40);
         text-align: center;
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
 
     .swag-migration-premapping__unfilled-title {
-        font-size: 18px;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
         margin-top: var(--scale-size-10);
-        margin-bottom: 5px;
+        margin-bottom: var(--scale-size-4);
     }
 
     .swag-migration-premapping__unfilled-caption {
-        color: $color-gray-500;
+        color: var(--color-text-secondary-default);
         margin-bottom: var(--scale-size-10);
     }
 
     .swag-migration-premapping__tab-card {
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
 
     .swag-migration-premapping__tab-card-item {
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
 
     .sw-grid__cell-label {
-        font-size: 14px;
+        font-size: var(--font-size-xs);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss
index a9da2eb60..6c9decd8a 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-progress-bar/swag-migration-progress-bar.scss
@@ -27,11 +27,11 @@
 
   .swag-migration-progress-bar__point {
     position: absolute;
-    display:flex;
+    display: flex;
     flex-direction: column;
     align-items: center;
     top: var(--scale-size-30);
-    font-size: 14px;
+    font-size: var(--font-size-xs);
     font-weight: var(--font-weight-semibold);
   }
 
@@ -51,27 +51,27 @@
   }
 
   .swag-migration-progress-bar__bubble--active {
-    background-color: $color-shopware-brand-50;
-    color: $color-shopware-brand-500;
+    background-color: var(--color-background-brand-default);
+    color: var(--color-icon-brand-default);
   }
 
   .swag-migration-progress-bar__bubble--disabled {
-    background-color: $color-gray-100;
+    background-color: var(--color-background-tertiary-default);
 
     .swag-migration-progress-bar__icon {
-      color: $color-gray-300;
+      color: var(--color-icon-secondary-default);
     }
   }
 
   .swag-migration-progress-bar__caption {
     margin-top: var(--scale-size-12);
-    font-size: 14px;
+    font-size: var(--font-size-xs);
     text-align: center;
   }
 
   .swag-migration-progress-bar__heading {
-    margin-bottom: 5px;
-    font-size: 14px;
+    margin-bottom: var(--scale-size-4);
+    font-size: var(--font-size-xs);
     text-align: center;
     font-weight: var(--font-weight-semibold);
   }
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.html.twig b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.html.twig
index 4803fd11b..fdee8eaec 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.html.twig
@@ -322,13 +322,13 @@
 
                 {% block swag_migration_shop_information_reset_migration_confirm_modal %}
                     <sw-modal v-if="showResetMigrationConfirmModal"
-                              class="swag-migration-shop-information__reset-confirm-modal"
+                              class="swag-migration-shop-information__confirm-modal"
                               :title="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.title')"
                               :is-loading="confirmModalIsLoading"
                               @modal-close="onCloseResetModal">
 
                         {% block swag_migration_shop_information_reset_migration_confirm_modal_icon %}
-                            <div class="swag-migration-shop-information__reset-confirm-modal-icon-wrapper">
+                            <div class="swag-migration-shop-information__confirm-modal-icon-wrapper">
                                 <mt-icon class="swag-migration-shop-information__confirm-modal-icon"
                                          name="regular-trophy"
                                          color="#37D046"
@@ -337,19 +337,19 @@
                         {% endblock %}
 
                         {% block swag_migration_shop_information_reset_migration_confirm_modal_header %}
-                            <p class="swag-migration-shop-information__reset-confirm-modal-header"
+                            <p class="swag-migration-shop-information__confirm-modal-header"
                                v-html="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.header')">
                             </p>
                         {% endblock %}
 
                         {% block swag_migration_shop_information_reset_migration_confirm_modal_content %}
-                            <p class="swag-migration-shop-information__reset-confirm-modal-content"
+                            <p class="swag-migration-shop-information__confirm-modal-content"
                                v-html="$tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.content')">
                             </p>
                         {% endblock %}
 
                         {% block swag_migration_shop_information_reset_migration_confirm_modal_content_hint %}
-                            <p class="swag-migration-shop-information__reset-confirm-modal-content-hint">
+                            <p class="swag-migration-shop-information__confirm-modal-content-hint">
                                 {{ $tc('swag-migration.index.shopInfoCard.resetMigrationConfirmDialog.contentHint') }}
                             </p>
                         {% endblock %}
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.scss b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.scss
index 91ef860c7..a3828f3fd 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/swag-migration-shop-information.scss
@@ -1,32 +1,31 @@
 @import "~scss/variables";
 
 .swag-migration-shop-information {
-
     .swag-migration-shop-information__connection {
         display: grid;
-        grid-gap: 8px;
-        grid-template-columns: (112px - 8px) 1fr min-content;
+        grid-gap: var(--scale-size-8);
+        grid-template-columns: var(--scale-size-96) 1fr min-content;
 
-        @media screen and (max-width: 650px) {
+        @media screen and (max-width: 40rem) {
             grid-template-columns: 1fr;
         }
     }
 
     .swag-migration-shop-information__shop-domain {
-        font-size: $font-size-xxs;
+        font-size: var(--font-size-2xs);
         white-space: nowrap;
     }
 
     .swag-migration-shop-information__shop-domain-prefix {
-        color: $color-pumpkin-spice-300;
+        color: var(--color-text-attention-default);
     }
 
     .swag-migration-shop-information__shop-domain-prefix--is-ssl {
-        color: $color-emerald-500;
+        color: var(--color-text-positive-default);
     }
 
     .swag-migration-shop-information__connection-name {
-        font-size: $font-size-m;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
         margin-bottom: var(--scale-size-4);
     }
@@ -51,13 +50,13 @@
 
     .swag-migration-shop-information__connection-status-text {
         margin: auto 0;
-        font-size: 12px;
+        font-size: var(--font-size-2xs);
         font-weight: var(--font-weight-semibold);
     }
 
     .swag-migration-shop-information__metadata {
-        color: $color-darkgray-200;
-        font-size: 14px;
+        color: var(--color-text-secondary-default);
+        font-size: var(--font-size-xs);
     }
 
     .swag-migration-shop-information__metadata-columns {
@@ -87,37 +86,37 @@
     }
 }
 
-.swag-migration-shop-information__reset-confirm-modal {
-    .swag-migration-shop-information__reset-confirm-modal-icon-wrapper {
+.swag-migration-shop-information__confirm-modal {
+    .swag-migration-shop-information__confirm-modal-icon-wrapper {
         width: var(--scale-size-72);
         height: var(--scale-size-72);
         border-radius: var(--border-radius-round);
-        background-color: $color-emerald-50;
+        background-color: var(--color-background-positive-default);
         display: flex;
         align-items: center;
         justify-content: center;
         margin: 0 auto var(--scale-size-40) auto;
     }
 
-    .swag-migration-shop-information__reset-confirm-modal-header {
-        font-weight: $font-weight-semi-bold;
-        font-size: $font-size-m;
+    .swag-migration-shop-information__confirm-modal-header {
+        font-weight: var(--font-weight-semibold);
+        font-size: var(--font-size-s);
         text-align: center;
     }
 
-    .swag-migration-shop-information__reset-confirm-modal-content {
-        font-size: $font-size-xxs;
+    .swag-migration-shop-information__confirm-modal-content {
+        font-size: var(--font-size-xs);
         text-align: center;
         padding-top: var(--scale-size-20);
-        max-width: 500px;
+        max-width: calc(var(--scale-size-256) * 2);
         margin: auto;
     }
 
-    .swag-migration-shop-information__reset-confirm-modal-content-hint {
+    .swag-migration-shop-information__confirm-modal-content-hint {
         text-align: center;
         padding-top: var(--scale-size-32);
         padding-bottom: var(--scale-size-20);
-        font-weight: $font-weight-semi-bold;
-        font-size: $font-size-xxs;
+        font-weight: var(--font-weight-semibold);
+        font-size: var(--font-size-xs);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/index.ts b/src/Resources/app/administration/src/module/swag-migration/component/index.ts
index 436915950..18d6a6db6 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/index.ts
+++ b/src/Resources/app/administration/src/module/swag-migration/component/index.ts
@@ -6,7 +6,6 @@ import './card';
 import './loading-screen';
 
 Shopware.Component.register('swag-migration-dashboard-card', () => import('./swag-migration-dashboard-card'));
-Shopware.Component.register('swag-migration-expand-div', () => import('./swag-migration-expand-div'));
 Shopware.Component.extend('swag-migration-grid-extended', 'sw-grid', () => import('./swag-migration-grid-extended'));
 Shopware.Component.register('swag-migration-grid-selection', () => import('./swag-migration-grid-selection'));
 Shopware.Component.register('swag-migration-settings-icon', () => import('./swag-migration-settings-icon'));
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-loading-screen/swag-migration-loading-screen.scss b/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-loading-screen/swag-migration-loading-screen.scss
index 2f0f82253..c7ef43d3b 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-loading-screen/swag-migration-loading-screen.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-loading-screen/swag-migration-loading-screen.scss
@@ -4,18 +4,18 @@
 
     .swag-migration-loading-screen__header {
         text-align: center;
-        margin: 5px auto 50px auto;
+        margin: var(--scale-size-4) auto var(--scale-size-48) auto;
     }
 
     .swag-migration-loading-screen__title {
-        font-size: 18px;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
-        padding-bottom: 5px;
+        padding-bottom: var(--scale-size-4);
     }
 
     .swag-migration-loading-screen__caption {
-        font-size: 14px;
-        color: $color-gray-500;
+        font-size: var(--font-size-xs);
+        color: var(--color-text-secondary-default);
     }
 
     .swag-migration-loading-screen__progress-bar-group {
@@ -29,13 +29,13 @@
 
     .swag-migration-loading-screen__progress-bar-title {
         text-align: center;
-        margin: 15px auto var(--scale-size-10) auto;
-        font-size: $font-size-xxs;
+        margin: var(--scale-size-14) auto var(--scale-size-10) auto;
+        font-size: var(--font-size-2xs);
     }
 
     .sw-loader.swag-migration-loading-screen__loader {
         position: relative;
-        margin: 50px auto 50px auto;
+        margin: var(--scale-size-48) auto var(--scale-size-48) auto;
 
         .sw-loader__container {
             transform: translate(-50%);
@@ -43,19 +43,19 @@
     }
 
     .swag-migration-loading-screen__hint {
-        margin-top: 59px;
+        margin-top: var(--scale-size-56);
         margin-bottom: 0;
     }
 
     .swag-migration-loading-screen__alert-icon {
-        color: $color-emerald-500;
+        color: var(--color-text-positive-default);
         position: absolute;
         display: block;
-        left: 15px;
+        left: var(--scale-size-14);
         top: var(--scale-size-14);
     }
 
     .swag-migration-loading-screen__notice {
-        margin-top: 50px;
+        margin-top: var(--scale-size-48);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/swag-migration-result-screen.scss b/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/swag-migration-result-screen.scss
index ed840110d..ff03f0ed8 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/swag-migration-result-screen.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/swag-migration-result-screen.scss
@@ -3,25 +3,25 @@
 .swag-migration-result-screen {
     .swag-migration-result-screen__content {
         text-align: center;
-        font-size: 12pt;
+        font-size: var(--font-size-2xs);
     }
 
     .swag-migration-result-screen__title {
-        margin-bottom: 5px;
-        font-size: $font-size-m;
-        font-weight: $font-weight-semi-bold;
+        margin-bottom: var(--scale-size-4);
+        font-size: var(--font-size-m);
+        font-weight: var(--font-weight-semibold);
     }
 
     .swag-migration-result-screen__caption {
-        margin: 0 135px var(--scale-size-24) 135px;
-        font-size: $font-size-xxs;
-        color: $color-darkgray-200;
+        margin: 0 var(--scale-size-128) var(--scale-size-24) var(--scale-size-128);
+        font-size: var(--font-size-2xs);
+        color: var(--color-text-secondary-default);
     }
 
     a.swag-migration-result-screen__link {
-        font-size: $font-size-xxs;
-        font-weight: $font-weight-semi-bold;
-        color: $color-shopware-brand-500;
+        font-size: var(--font-size-2xs);
+        font-weight: var(--font-weight-semibold);
+        color: var(--color-text-brand-default);
         text-decoration: none;
     }
 
@@ -30,7 +30,7 @@
         width: var(--scale-size-72);
         height: var(--scale-size-72);
         border-radius: var(--border-radius-round);
-        background-color: $color-emerald-50;
+        background-color: var(--color-background-positive-default);
         flex-shrink: 0;
         display: flex;
         align-items: center;
@@ -38,7 +38,7 @@
     }
 
     .swag-migration-result-screen__icon {
-        color: $color-emerald-500;
+        color: var(--color-icon-positive-default);
     }
 }
 
@@ -49,23 +49,23 @@
 
     .swag-migration-result-survey__content {
         text-align: center;
-        font-size: $font-size-xxs;
+        font-size: var(--font-size-2xs);
     }
 
     .swag-migration-result-survey__title {
-        margin-bottom: 5px;
-        font-size: $font-size-xxs;
-        font-weight: $font-weight-semi-bold;
+        margin-bottom: var(--scale-size-4);
+        font-size: var(--font-size-2xs);
+        font-weight: var(--font-weight-semibold);
     }
 
     .swag-migration-result-survey__caption {
-        margin: var(--scale-size-10) 60px var(--scale-size-24) 60px;
-        font-size: $font-size-xxs;
-        color: $color-darkgray-200;
+        margin: var(--scale-size-10) var(--scale-size-56) var(--scale-size-24) var(--scale-size-56);
+        font-size: var(--font-size-2xs);
+        color: var(--color-text-secondary-default);
     }
 
     .swag-migration-result-survey__external-icon {
-        margin-left: 5px;
+        margin-left: var(--scale-size-4);
     }
 
     .swag-migration-result-survey__icon {
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-dashboard-card/swag-migration-dashboard-card.scss b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-dashboard-card/swag-migration-dashboard-card.scss
index e4f57badc..5a06c0537 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-dashboard-card/swag-migration-dashboard-card.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-dashboard-card/swag-migration-dashboard-card.scss
@@ -6,27 +6,29 @@
     }
 
     .swag-migration-dashboard-card__title {
-        font-size: 24px;
+        font-size: var(--font-size-xl);
+        font-weight: var(--font-weight-semibold);
+        color: var(--color-text-primary-default);
     }
 
     .swag-migration-dashboard-card__headline {
-        font-size: $font-size-m;
-        font-weight: var(--font-weight-semibold);
+        font-size: var(--font-size-m);
+        font-weight: var(--font-weight-medium);
         margin-bottom: var(--scale-size-10);
     }
 
     .swag-migration-dashboard-card__information {
-        font-size: $font-size-xxs;
+        font-size: var(--font-size-2xs);
         font-weight: normal;
-        width: 440px;
-        margin-bottom: var(--scale-size-26);
-        line-height: 22px;
+        width: calc(var(--scale-size-224) * 2);
+        margin-bottom: var(--scale-size-10);
+        line-height: var(--font-line-height-xs);
     }
 
     .swag-migration-dashboard-card__wrapper {
         grid-template-columns: 1fr 1fr;
         place-items: stretch;
-        gap: 0 15px;
+        gap: 0 var(--scale-size-14);
         width: 100%;
         display: grid;
     }
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/index.ts b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/index.ts
deleted file mode 100644
index 637fdd992..000000000
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import template from './swag-migration-expand-div.html.twig';
-import './swag-migration-expand-div.scss';
-
-/**
- * @private
- * @sw-package fundamentals@after-sales
- */
-export default Shopware.Component.wrapComponentConfig({
-    template,
-
-    props: {
-        expandTitle: {
-            type: String,
-            default: '',
-            required: false,
-        },
-        collapseTitle: {
-            type: String,
-            default: '',
-            required: false,
-        },
-    },
-
-    data() {
-        return {
-            isExpanded: false,
-        };
-    },
-
-    methods: {
-        onClick() {
-            this.isExpanded = !this.isExpanded;
-        },
-    },
-});
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.html.twig b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.html.twig
deleted file mode 100644
index 3c9d2fcd9..000000000
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{% block swag_migration_expand_div %}
-    <div class="swag-migration-expand-div">
-        <div class="swag-migration-expand-div__title">
-            <button class="swag-migration-expand-div__link"
-               @click="onClick">
-                <div v-if="isExpanded">
-                    {{ expandTitle }}
-                    <mt-icon class="swag-migration-expand-div__icon"
-                             name="regular-chevron-circle-up"
-                             size="16px" />
-                </div>
-                <div v-else>
-                    {{ collapseTitle }}
-                    <mt-icon class="swag-migration-expand-div__icon"
-                             name="regular-chevron-circle-down"
-                             size="16px" />
-                </div>
-            </button>
-        </div>
-
-        <div v-if="isExpanded"
-             class="swag-migration-expand-div__slot">
-            <slot>
-
-                {% block swag_migration_expand_div_slot %}
-                {% endblock %}
-            </slot>
-        </div>
-    </div>
-{% endblock %}
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.scss b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.scss
deleted file mode 100644
index b141ecc82..000000000
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-expand-div/swag-migration-expand-div.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@import "~scss/variables";
-
-.swag-migration-expand-div {
-    .swag-migration-expand-div__title {
-        margin: 0 auto;
-        max-width: 800px;
-        text-align: center;
-        font-size: 14px;
-        line-height: 0.5;
-        color: $color-shopware-brand-500;
-        cursor: pointer;
-        display:grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        grid-column-gap: 20px;
-        white-space: nowrap;
-
-        &::before, &::after {
-            content: '';
-            height: 5px;
-            border-bottom: 1px solid $color-gray-300;
-            width: 100%;
-        }
-    }
-
-    .swag-migration-expand-div__icon {
-        margin-left: var(--scale-size-4);
-    }
-}
\ No newline at end of file
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/index.ts b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/index.ts
index 6304abd93..5f1ce1757 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/index.ts
+++ b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/index.ts
@@ -67,14 +67,14 @@ export default Shopware.Component.wrapComponentConfig({
         mountedComponent() {
             this.$nextTick(() => {
                 // select first tab
-                if (this.tabItems !== undefined && this.tabItems.length > 0) {
+                if (this.tabItems[0]?.name) {
                     this.selectedNumber = this.tabItems[0].name;
 
                     setTimeout(() => {
                         if (this.$refs.swTabs) {
                             this.$refs.swTabs.setActiveItem(this.tabItems[0]);
                         }
-                    });
+                    }, 100);
                 }
             });
         },
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.html.twig b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.html.twig
index b48ebde01..64805fff1 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.html.twig
@@ -7,7 +7,6 @@
             position-identifier="swag-migration-tab-card"
         >
             <template #tabs>
-
                 {% block swag_migration_tab_card_item_tab %}
                     <sw-tabs
                         ref="swTabs"
@@ -41,7 +40,7 @@
             </template>
 
             <template
-                v-for="(item, index) in items"
+                v-for="(item) in items"
                 :key="getKey(item)"
             >
                 <swag-migration-tab-card-item ref="contentContainer">
diff --git a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.scss b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.scss
index 7b0565dc5..b3dc37da2 100644
--- a/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/component/swag-migration-tab-card/swag-migration-tab-card.scss
@@ -1,6 +1,14 @@
 @import "~scss/variables";
 
 .swag-migration-tab-card {
+    .mt-card {
+        min-height: var(--scale-size-256);
+
+        &__tabs {
+            margin: 0 var(--scale-size-16);
+        }
+    }
+
     .sw-tabs {
         width: 100%;
     }
@@ -10,15 +18,15 @@
     }
 
     .swag-migration-tab-card__invalid-badge {
-        background-color: $color-crimson-500;
-        color: #ffffff;
+        background-color: var(--color-interaction-critical-default);
+        color: var(--color-static-white);
         border-radius: var(--border-radius-m);
         height: var(--scale-size-16);
-        line-height: 16px;
-        font-size: 12px;
-        text-align: center;
-        padding: 0 var(--scale-size-8);
+        line-height: var(--font-line-height-2xs);
+        font-size: var(--font-size-2xs);
+        padding: var(--scale-size-2) var(--scale-size-10);
         margin-left: var(--scale-size-2);
+        text-align: center;
     }
 
     .sw-tabs-item__error-badge {
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.html.twig b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.html.twig
index 1b23a94c6..8b129b513 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.html.twig
@@ -65,15 +65,19 @@
             {% endblock %}
         </mt-card>
 
-        <mt-card v-else
-                 class="swag-migration-data-selector"
-                 position-identifier="swag-migration-data-selector-no-data">
-
+        <mt-card
+            v-else
+            class="swag-migration-data-selector"
+            position-identifier="swag-migration-data-selector-no-data"
+        >
             {% block swag_migration_data_selector_no_data %}
                 <div class="swag-migration-index-data-selector__no-data">
                     <p class="swag-migration-index-data-selector__no-data-label">
                         {{ $tc('swag-migration.index.selectDataCard.noData') }}
                     </p>
+                    <p class="swag-migration-index-data-selector__no-data-sub-label">
+                        {{ $tc('swag-migration.index.selectDataCard.noDataSubline') }}
+                    </p>
                 </div>
             {% endblock %}
         </mt-card>
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.scss
index a9cf7f5fa..ba801c60d 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-data-selector/swag-migration-data-selector.scss
@@ -2,47 +2,41 @@
 
 .swag-migration-data-selector {
     .swag-migration-data-selector__warning {
-        max-width: 800px;
+        max-width: 60rem;
         margin: 0 auto var(--scale-size-40) auto;
-        color: $color-darkgray-200;
-
-        @media screen and (max-width: 1360px) {
-            max-width: 770px;
-        }
-    }
-
-    .swag-migration-index-data-selector__tou {
-        font-size: $font-size-xxs;
-        display: block;
-        margin: var(--scale-size-20) 38px var(--scale-size-20) 38px;
     }
 
     .swag-migration-index-data-selector__no-data {
-        background-color: $color-gray-50;
-        height: 230px;
-        line-height: 230px;
-        text-align: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        height: var(--scale-size-192);
         width: 100%;
 
         .swag-migration-index-data-selector__no-data-label {
-            font-size: 18px;
+            font-size: var(--font-size-m);
             font-weight: var(--font-weight-semibold);
-            letter-spacing: 0.1px;
+        }
+
+        .swag-migration-index-data-selector__no-data-sub-label {
+            margin-top: var(--scale-size-4);
+            font-size: var(--font-size-xs);
+            color: var(--color-text-secondary-default);
         }
     }
 
     .sw-grid-row.is--disabled .sw-grid__cell-content {
-        color: $color-gray-500;
+        color: var(--color-text-primary-disabled);
     }
 
     .swag-migration-data-selector__help-text {
-        margin-left: 5px;
+        margin-left: var(--scale-size-4);
     }
 
     .swag-migration-data-selector__help-text-placeholder {
         width: var(--scale-size-14);
         height: var(--scale-size-14);
-        margin-left: 5px;
+        margin-left: var(--scale-size-4);
     }
-
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-data/swag-migration-history-detail-data.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-data/swag-migration-history-detail-data.scss
index 692e2c020..ca3d14d08 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-data/swag-migration-history-detail-data.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-data/swag-migration-history-detail-data.scss
@@ -1,7 +1,7 @@
 
 .swag-migration-history-detail-data {
     .swag-migration-history-detail-data__loading-placeholder {
-        height: 100px;
+        height: var(--scale-size-96);
     }
 
     .swag-migration-history-detail-data__no-data {
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-errors/swag-migration-history-detail-errors.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-errors/swag-migration-history-detail-errors.scss
index 1034cb12f..1d1bec427 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-errors/swag-migration-history-detail-errors.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail-errors/swag-migration-history-detail-errors.scss
@@ -6,12 +6,12 @@
     }
 
     .swag-migration-history-detail-errors__loading-placeholder {
-        height: 100px;
+        height: var(--scale-size-96);
     }
 
     .swag-migration-history-detail-errors__description {
         margin-top: var(--scale-size-16);
-        font-size: $font-size-xxs;
-        color: $color-gray-500;
+        font-size: var(--font-size-2xs);
+        color: var(--color-text-secondary-default);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail/swag-migration-history-detail.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail/swag-migration-history-detail.scss
index fb7c28f04..c8ccb10eb 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail/swag-migration-history-detail.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history-detail/swag-migration-history-detail.scss
@@ -2,38 +2,38 @@
 
 .swag-migration-history-detail__modal {
     .swag-migration-history-detail__loading-placeholder {
-        height: 100px;
+        height: var(--scale-size-96);
     }
 
     .swag-migration-history-detail__header {
         display: grid;
-        grid-template-columns: 80px 1fr min-content;
+        grid-template-columns: var(--scale-size-80) 1fr min-content;
     }
 
     .swag-migration-history-detail__connection-info {
         padding-left: var(--scale-size-16);
-        line-height: 22px;
-        font-size: $font-size-xxs;
+        line-height: var(--font-line-height-xs);
+        font-size: var(--font-size-2xs);
     }
 
     .swag-migration-history-detail__connection-name {
-        font-size: $font-size-m;
+        font-size: var(--font-size-m);
         font-weight: var(--font-weight-semibold);
-        line-height: 25px;
+        line-height: var(--font-line-height-s);
     }
 
     .swag-migration-history-detail__shop-domain-prefix {
-        color: $color-pumpkin-spice-300;
+        color: var(--color-icon-attention-default);
     }
 
     .swag-migration-shop-information__shop-domain-prefix--is-ssl {
-        color: $color-emerald-500;
+        color: var(--color-text-positive-default);
     }
 
     .swag-migration-history-detail__run-info {
         white-space: nowrap;
-        font-size: 12px;
-        line-height: 19px;
+        font-size: var(--font-size-2xs);
+        line-height: var(--font-line-height-2xs);
         padding-right: var(--scale-size-16);
     }
 
@@ -47,15 +47,15 @@
     }
 
     .swag-migration-history-detail__run-status-value {
-        color: $color-darkgray-200;
+        color: var(--color-text-secondary-default);
     }
 
     .swag-migration-history-detail__run-status-value--finished {
-        color: $color-emerald-500;
+        color: var(--color-text-positive-default);
     }
 
     .swag-migration-history-detail__run-status-value--aborted {
-        color: $color-crimson-500;
+        color: var(--color-text-critical-default);
     }
 
     .sw-tabs__custom-content {
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.html.twig b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.html.twig
index 028e1d5dc..a1c838d9c 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.html.twig
@@ -1,22 +1,24 @@
 {% block swag_migration_history %}
-    <mt-card class="swag-migration-history"
-             :is-loading="isLoading"
-             :large="true"
-             position-identifier="swag-migration-history">
+    <mt-card
+        class="swag-migration-history"
+        :is-loading="isLoading"
+        :large="true"
+        position-identifier="swag-migration-history"
+    >
         <template #grid>
-
             {% block swag_migration_history_grid %}
-                <sw-data-grid v-if="migrationRuns.length > 0"
-                              identifier="swag-migration-history"
-                              :data-source="migrationRuns"
-                              :columns="migrationColumns"
-                              :show-selection="false"
-                              :show-settings="true"
-                              :allow-column-edit="true"
-                              :sort-by="sortBy"
-                              :sort-direction="sortDirection"
-                              @column-sort="onSortColumn">
-
+                <sw-data-grid
+                    v-if="migrationRuns.length > 0"
+                    identifier="swag-migration-history"
+                    :data-source="migrationRuns"
+                    :columns="migrationColumns"
+                    :show-selection="false"
+                    :show-settings="true"
+                    :allow-column-edit="true"
+                    :sort-by="sortBy"
+                    :sort-direction="sortDirection"
+                    @column-sort="onSortColumn"
+                >
                     {% block swag_migration_history_grid_column_status %}
                         <template #column-step="{ item }">
                             <mt-icon v-if="item.step === 'finished'"
@@ -89,6 +91,9 @@
                     <p class="swag-migration-history__no-data-label">
                         {{ $tc('swag-migration.history.noData') }}
                     </p>
+                    <p class="swag-migration-history__no-data-sub-label">
+                        {{ $tc('swag-migration.history.noDataSubline') }}
+                    </p>
                 </div>
             {% endblock %}
 
@@ -129,7 +134,6 @@
 
                     {% block swag_migration_history_run_clear_confirm_modal_footer %}
                         <template #modal-footer>
-
                             {% block swag_migration_history_run_clear_confirm_modal_abort %}
                                 <mt-button size="small"
                                            variant="secondary"
@@ -147,13 +151,10 @@
                                     {{ $tc('global.default.delete') }}
                                 </mt-button>
                             {% endblock %}
-
                         </template>
                     {% endblock %}
-
                 </sw-modal>
             {% endblock %}
-
         </template>
     </mt-card>
 {% endblock %}
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.scss
index fc7aa407a..9334b740f 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-history/swag-migration-history.scss
@@ -2,28 +2,34 @@
 
 .swag-migration-history {
     .swag-migration-history__status-icon--finished {
-        color: $color-emerald-500;
+        color: var(--color-text-positive-default);
     }
 
     .swag-migration-history__status-icon--aborted {
-        color: $color-crimson-500;
+        color: var(--color-text-critical-default);
     }
 
     .swag-migration-history__status-icon--loading {
-        color: $color-gray-500;
+        color: var(--color-text-primary-disabled);
     }
 
     .swag-migration-history__no-data {
-        background-color: $color-gray-50;
-        height: 230px;
-        line-height: 230px;
-        text-align: center;
+        height: var(--scale-size-256);
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
         width: 100%;
 
         .swag-migration-history__no-data-label {
-            font-size: 18px;
+            font-size: var(--font-size-m);
             font-weight: var(--font-weight-semibold);
-            letter-spacing: 0.1px;
+        }
+
+        .swag-migration-history__no-data-sub-label {
+            margin-top: var(--scale-size-4);
+            font-size: var(--font-size-xs);
+            color: var(--color-text-secondary-default);
         }
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-main-page/swag-migration-main-page.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-main-page/swag-migration-main-page.scss
index db9d76cbc..156ad15d4 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-main-page/swag-migration-main-page.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-main-page/swag-migration-main-page.scss
@@ -2,12 +2,11 @@
 
 .swag-migration-index-main-page {
     .swag-migration-index-main-page__warning {
-        max-width: 800px;
+        max-width: 60rem;
         margin: 0 auto var(--scale-size-40) auto;
-        color: $color-darkgray-200;
 
-        @media screen and (max-width: 1360px) {
-            max-width: 770px;
+        @media screen and (max-width: 85rem) {
+            max-width: calc(var(--scale-size-256) * 3);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.scss b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.scss
index 2e64a608a..88fe4a0fd 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/swag-migration-process-screen/swag-migration-process-screen.scss
@@ -1,28 +1,28 @@
 .swag-migration-process-screen {
     .swag-migration-process-screen__step-display {
         position: absolute;
-        padding-right: 50px;
+        padding-right: var(--scale-size-48);
         top: var(--scale-size-40);
-        left: calc(50% - 450px);
+        left: calc(50% - 28rem);
         transform: translate(-100%, 0);
 
-        @media screen and (max-width: 1600px) {
+        @media screen and (max-width: 100rem) {
             position: static;
             transform: none;
             padding: 0 0 var(--scale-size-10) 0;
-            margin: 13px 0 var(--scale-size-16) 0;
+            margin: var(--scale-size-14) 0 var(--scale-size-16) 0;
             text-align: center;
 
             .sw-step-item {
                 display: inline-flex;
                 flex-direction: column;
                 margin-top: 0;
-                width: 84px;
+                width: var(--scale-size-80);
 
                 &:before {
-                    width: 84px;
-                    height: 1px;
-                    top: 15px;
+                    width: var(--scale-size-80);
+                    height: var(--scale-size-2);
+                    top: var(--scale-size-14);
                     transform: translate(-50%, 0);
                     z-index: -1;
                 }
@@ -35,12 +35,12 @@
             }
         }
 
-        @media screen and (max-width: 780px) {
+        @media screen and (max-width: 48rem) {
             .sw-step-item {
-                width: 52px;
+                width: var(--scale-size-56);
 
                 &:before {
-                    width: 52px;
+                    width: var(--scale-size-56);
                 }
 
                 .sw-step-item__description {
@@ -57,14 +57,14 @@
     }
 
     .swag-migration-process-screen__confirm-warning {
-        margin-top: 33px;
+        margin-top: var(--scale-size-32);
     }
 
     .sw-card {
         .sw-card__title {
             margin-bottom: var(--scale-size-12);
-            font-size: 18px;
-            line-height: 24px;
+            font-size: var(--font-size-m);
+            line-height: var(--font-line-height-xs);
 
             width: unset;
             position: unset;
@@ -76,7 +76,6 @@
 }
 
 .swag-migration-index-modal-abort-migration-confirm-dialog {
-
     .sw-modal__body {
         padding: var(--scale-size-32);
     }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-create/swag-migration-wizard-page-connection-create.scss b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-create/swag-migration-wizard-page-connection-create.scss
index cb9dcd5fa..08fd498a5 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-create/swag-migration-wizard-page-connection-create.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-create/swag-migration-wizard-page-connection-create.scss
@@ -3,19 +3,19 @@
 .swag-migration-wizard-page-create-profile {
     .sw-select-result__result-item-text > span > i,
     .sw-single-select__selection-text > span > i {
-        color: $color-gray-500;
+        color: var(--color-text-secondary-default);
+        font-size: var(--font-size-2xs);
         font-style: normal;
-        font-size: 12px;
     }
 
     .swag-migration-wizard-create-connection__install-profile-link-wrapper {
-        grid-template-columns: 1fr 24px;
+        grid-template-columns: 1fr var(--scale-size-24);
         width: 100%;
         display: grid;
     }
 
     .is--active .sw-icon {
-        color: $color-shopware-brand-500;
+        color: var(--color-icon-brand-default);
     }
 
     .sw-select-result__result-item-text {
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/index.ts b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/index.ts
index 4e043996c..5ae7720d8 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/index.ts
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/index.ts
@@ -60,7 +60,7 @@ export default Shopware.Component.wrapComponentConfig({
             immediate: true,
             handler(newConnectionId: string) {
                 this.selectedConnectionId = newConnectionId;
-                this.onConnectionSelected();
+                this.onConnectionSelected(newConnectionId);
             },
         },
     },
@@ -76,21 +76,18 @@ export default Shopware.Component.wrapComponentConfig({
 
             return this.migrationConnectionRepository.search(criteria, this.context).then((items) => {
                 this.connections = items;
-                this.onConnectionSelected();
+                this.onConnectionSelected(items[0]?.id ?? '');
             });
         },
 
-        onConnectionSelected() {
+        onConnectionSelected(newId: string) {
             const connection = this.connections.find((con) => {
-                return con.id === this.selectedConnectionId;
+                return con.id === newId;
             });
 
-            if (connection) {
-                this.$emit('onChildRouteReadyChanged', true);
-                this.$emit('onConnectionSelected', connection);
-            } else {
-                this.$emit('onChildRouteReadyChanged', false);
-            }
+            this.selectedConnectionId = newId;
+            this.$emit('onChildRouteReadyChanged', !!connection);
+            this.$emit('onConnectionSelected', connection);
         },
     },
 });
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/swag-migration-wizard-page-connection-select.html.twig b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/swag-migration-wizard-page-connection-select.html.twig
index 3b52f63c6..929e0f12a 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/swag-migration-wizard-page-connection-select.html.twig
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-connection-select/swag-migration-wizard-page-connection-select.html.twig
@@ -18,11 +18,13 @@
                 {% block swag_migration_wizard_page_select_profile_selection %}
                     <div class="swag-migration-wizard__form">
                         <mt-select
-                                         v-model:model-value="selectedConnectionId"
-                                         :options="connections"
-                                         :label="$tc('swag-migration.wizard.pages.connectionSelect.connectionLabel')"
-                                         :placeholder="$tc('swag-migration.wizard.pages.connectionSelect.connectionPlaceholder')"
-                                         @update:model-value="onConnectionSelected"
+                            :model-value="selectedConnectionId"
+                            label-property="name"
+                            value-property="id"
+                            :options="connections"
+                            :label="$tc('swag-migration.wizard.pages.connectionSelect.connectionLabel')"
+                            :placeholder="$tc('swag-migration.wizard.pages.connectionSelect.connectionPlaceholder')"
+                            @update:model-value="onConnectionSelected"
                         />
                     </div>
                 {% endblock %}
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-credentials-error/swag-migration-wizard-page-credentials-error.scss b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-credentials-error/swag-migration-wizard-page-credentials-error.scss
index cf4e374fa..dd140dcbd 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-credentials-error/swag-migration-wizard-page-credentials-error.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-credentials-error/swag-migration-wizard-page-credentials-error.scss
@@ -2,7 +2,7 @@
 
 .swag-migration-wizard-page-credentials-error {
     .swag-migration-wizard__description-hint {
-        font-size: $font-size-xxs;
+        font-size: var(--font-size-2xs);
         margin: var(--scale-size-20) auto var(--scale-size-20);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-profile-installation/swag-migration-wizard-page-profile-installation.scss b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-profile-installation/swag-migration-wizard-page-profile-installation.scss
index c32e10c5c..8711a7510 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-profile-installation/swag-migration-wizard-page-profile-installation.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard-page-profile-installation/swag-migration-wizard-page-profile-installation.scss
@@ -2,7 +2,7 @@
 
 .swag-migration-wizard-page-profile-installation {
     .swag-migration-wizard__content {
-        margin: var(--scale-size-8) auto 0px auto;
+        margin: var(--scale-size-8) auto 0 auto;
     }
 
     .swag-migration-wizard-profile-installation__plugin-icon {
@@ -12,16 +12,16 @@
 
     .swag-migration-wizard-profile-installation__wrapper {
         grid-template-columns: 1fr 1fr;
-        gap: 0 35px;
+        gap: 0 var(--scale-size-36);
         place-items: stretch;
         width: 100%;
         display: grid;
     }
 
     .swag-migration-wizard-profile-installation__inner_wrapper {
-        grid-template-columns: 80px 1fr;
+        grid-template-columns: var(--scale-size-80) 1fr;
         place-items: stretch;
-        gap: 0 15px;
+        gap: 0 var(--scale-size-14);
         width: 100%;
         display: grid;
         margin-bottom: var(--scale-size-30);
@@ -30,42 +30,42 @@
     .swag-migration-wizard-profile-installation__available_version_list {
         display: flex;
         flex-wrap: wrap;
-        gap: 5px;
+        gap: var(--scale-size-4);
     }
 
     .swag-migration-wizard-profile-installation__version_box {
-        background-color: $color-gray-100;
+        background-color: var(--color-background-tertiary-default);
         padding-left: var(--scale-size-8);
         padding-right: var(--scale-size-8);
         border-radius: var(--border-radius-2xs);
         font-weight: var(--font-weight-semibold);
-        font-size: 12px;
+        font-size: var(--font-size-2xs);
     }
 
     .swag-migration-wizard-profile-installation__last_version_box {
-        background-color: $color-gray-100;
+        background-color: var(--color-background-tertiary-default);
         padding-left: var(--scale-size-8);
         padding-right: var(--scale-size-8);
         border-radius: var(--border-radius-2xs);
         font-weight: var(--font-weight-semibold);
-        font-size: 12px;
+        font-size: var(--font-size-2xs);
     }
 
     .swag-migration-wizard-profile-installation__profile_headline {
-        font-size: $font-size-s;
+        font-size: var(--font-size-s);
         font-weight: var(--font-weight-semibold);
     }
 
     .swag-migration-wizard-profile-installation__profile_manufacturer {
-        font-size: 12px;
-        font-weight: var(--font-weight-semibold);
-        color: $color-gray-500;
+        font-size: var(--font-size-s);
+        font-weight: var(--font-weight-medium);
+        color: var(--color-text-secondary-default);
         margin-bottom: var(--scale-size-8);
     }
 
     .swag-migration-wizard-profile-installation__available_version_headline {
-        font-size: 12px;
-        margin-bottom: 5px;
+        font-size: var(--font-size-2xs);
+        margin-bottom: var(--scale-size-4);
     }
 
     .swag-migration-wizard-profile-installation__footer {
@@ -73,25 +73,25 @@
     }
 
     .swag-migration-wizard-profile-installation__installed_box {
-        font-size: $font-size-xxs;
+        font-size: var(--font-size-2xs);
         font-weight: var(--font-weight-semibold);
+        color: var(--color-text-positive-default);
         position: relative;
-        color: $color-emerald-500;
     }
 
     .swag-migration-wizard-profile-installation__installed_title {
         position: absolute;
-        top: 1px;
+        top: var(--scale-size-2);
         left: var(--scale-size-20);
     }
 
     .swag-migration-wizard-profile-installation__availability-headline {
-        font-size: 12px;
+        font-size: var(--font-size-2xs);
         font-weight: var(--font-weight-semibold);
         margin-bottom: var(--scale-size-20);
     }
 
     .swag-migration-wizard-profile-installation__plugins {
-        margin-top: 35px;
+        margin-top: var(--scale-size-36);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/index.ts b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/index.ts
index 91b91624b..97e201407 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/index.ts
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/index.ts
@@ -642,7 +642,7 @@ export default Shopware.Component.wrapComponentConfig({
             this.childIsLoading = value;
         },
 
-        onConnectionSelected(value: MigrationConnection) {
+        onConnectionSelected(value: MigrationConnection | null) {
             this.connection = value;
         },
     },
diff --git a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/swag-migration-wizard.scss b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/swag-migration-wizard.scss
index c834fd0bc..5d17010ef 100644
--- a/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/swag-migration-wizard.scss
+++ b/src/Resources/app/administration/src/module/swag-migration/page/wizard/swag-migration-wizard/swag-migration-wizard.scss
@@ -1,15 +1,15 @@
 @import "~scss/variables";
 
 .swag-migration-wizard__modal {
-    font-size: $font-size-xxs;
+    font-size: var(--font-size-2xs);
 
     .swag-migration-wizard__placeholder {
-        height: 500px;
+        height: calc(var(--scale-size-256) * 2);
     }
 
     .swag-migration-wizard__content {
-        max-width: 520px;
-        margin: var(--scale-size-8) auto 60px auto;
+        max-width: calc(var(--scale-size-256) * 2);
+        margin: var(--scale-size-8) auto var(--scale-size-64) auto;
 
         .swag-migration-wizard__form {
             width: 80%;
@@ -18,6 +18,11 @@
 
     .swag-migration-wizard__content-information {
         text-align: center;
+
+        .text-left {
+            color: var(--color-text-primary-default);
+            font-weight: var(--font-weight-medium);
+        }
     }
 
     h3.swag-migration-wizard__information-header {
@@ -29,18 +34,18 @@
 
         a {
             font-weight: var(--font-weight-semibold);
-            font-size: 12px;
+            font-size: var(--font-size-2xs);
             text-decoration: none;
         }
     }
 
     .swag-migration-wizard__illustration {
-        width: 219px;
+        width: var(--scale-size-224);
         margin-bottom: var(--scale-size-40);
     }
 
     .swag-migration-wizard__plugin {
-        width: 84px;
+        width: var(--scale-size-80);
         margin-bottom: var(--scale-size-24);
         margin-top: var(--scale-size-10);
     }
@@ -52,8 +57,8 @@
     .swag-migration-wizard-page-credentials__steps {
         padding-left: var(--scale-size-20);
         text-align: left;
-        font-size: 14px;
-        line-height: 20px;
+        font-size: var(--font-size-xs);
+        line-height: var(--font-line-height-xs);
 
         a {
             font-weight: var(--font-weight-semibold);
@@ -80,7 +85,7 @@
         width: var(--scale-size-72);
         height: var(--scale-size-72);
         border-radius: var(--border-radius-round);
-        background-color: $color-emerald-50;
+        background-color: var(--color-text-positive-default);
         flex-shrink: 0;
         display: flex;
         align-items: center;
@@ -88,31 +93,32 @@
     }
 
     .swag-migration-wizard__bubble--success {
-        background-color: $color-emerald-50;
+        background-color: var(--color-background-positive-default);
     }
 
     .swag-migration-wizard__bubble--warning {
-        background-color: $color-pumpkin-spice-50;
+        background-color: var(--color-background-attention-default);
     }
 
     .swag-migration-wizard__success-icon {
-        color: $color-emerald-500;
+        color: var(--color-icon-positive-default);
     }
 
     .swag-migration-wizard__warning-icon {
-        color: $color-pumpkin-spice-500;
+        color: var(--color-icon-attention-default);
     }
 
     .sw-url-input-ssl-switch__field {
-        grid-template-columns: 24px 1fr;
+        grid-template-columns: var(--scale-size-24) 1fr;
     }
 
     .swag-migration-wizard__description {
-        line-height: 22px;
+        line-height: var(--font-line-height-xs);
     }
 
     .swag-migration-wizard__headline {
-        font-size: 32px;
-        font-weight: normal;
+        color: var(--color-text-primary);
+        font-size: var(--font-size-xl);
+        font-weight: var(--font-weight-medium);
     }
 }
diff --git a/src/Resources/app/administration/src/module/swag-migration/snippet/de-DE.json b/src/Resources/app/administration/src/module/swag-migration/snippet/de-DE.json
index cfa1602b4..2bd5e863b 100644
--- a/src/Resources/app/administration/src/module/swag-migration/snippet/de-DE.json
+++ b/src/Resources/app/administration/src/module/swag-migration/snippet/de-DE.json
@@ -332,7 +332,8 @@
           "product_stream_filter_inheritance": "Dynamische Produktgruppen-Filter",
           "country_state": "Bundesländer"
         },
-        "noData": "Es wurden keine Daten zum Migrieren gefunden."
+        "noData": "Es wurden keine Daten zum Migrieren gefunden.",
+        "noDataSubline": "Bitte überprüfe Deine Verbindung oder wähle ein anderes Profil."
       },
       "confirmWarningCard": {
         "currencyMismatch": {
@@ -611,6 +612,7 @@
         "contentHint": "Willst Du die Daten wirklich löschen?"
       },
       "noData": "Es wurden keine Migrationen gefunden.",
+      "noDataSubline": "Beginne eine Migration, um Inhalte zu sehen.",
       "detailPage": {
         "title": "Details zur Migration",
         "timestamp": "Startzeitpunkt:",
diff --git a/src/Resources/app/administration/src/module/swag-migration/snippet/en-GB.json b/src/Resources/app/administration/src/module/swag-migration/snippet/en-GB.json
index 4b07bf135..d30929a2a 100644
--- a/src/Resources/app/administration/src/module/swag-migration/snippet/en-GB.json
+++ b/src/Resources/app/administration/src/module/swag-migration/snippet/en-GB.json
@@ -332,7 +332,8 @@
           "product_stream_filter_inheritance": "Dynamic product group filters",
           "country_state": "Country states"
         },
-        "noData": "Nothing found to migrate."
+        "noData": "Nothing found to migrate.",
+        "noDataSubline": "Please check your connection or try another profile."
       },
       "confirmWarningCard": {
         "currencyMismatch": {
@@ -611,6 +612,7 @@
         "contentHint": "Do you really want to delete the data?"
       },
       "noData": "No migrations found.",
+      "noDataSubline": "Start a migration to see content.",
       "detailPage": {
         "title": "Migration details",
         "timestamp": "Start time:",
diff --git a/src/Resources/app/administration/stylelint.config.mjs b/src/Resources/app/administration/stylelint.config.mjs
index 58bd78dec..af520c608 100644
--- a/src/Resources/app/administration/stylelint.config.mjs
+++ b/src/Resources/app/administration/stylelint.config.mjs
@@ -4,11 +4,11 @@ import defineConfig from 'stylelint-define-config';
 export default defineConfig({
     plugins: ['@shopware-ag/stylelint-plugin-meteor'],
     rules: {
-        'meteor/prefer-sizing-token': [true, { severity: 'warning' }],
-        'meteor/prefer-background-token': [true, { severity: 'warning' }],
-        'meteor/prefer-color-token': [true, { severity: 'warning' }],
-        'meteor/no-primitive-token': [true, { severity: 'warning' }],
-        'meteor/prefer-font-token': [true, { severity: 'warning' }],
-        'meteor/prefer-border-token': [true, { severity: 'warning' }],
+        'meteor/prefer-sizing-token': [true, { severity: 'error' }],
+        'meteor/prefer-background-token': [true, { severity: 'error' }],
+        'meteor/prefer-color-token': [true, { severity: 'error' }],
+        'meteor/no-primitive-token': [true, { severity: 'error' }],
+        'meteor/prefer-font-token': [true, { severity: 'error' }],
+        'meteor/prefer-border-token': [true, { severity: 'error' }],
     },
 });