diff --git a/packages/admin-ui/src/lib/core/src/components/job-queue-link/job-queue-link.component.html b/packages/admin-ui/src/lib/core/src/components/job-queue-link/job-queue-link.component.html
index d9f8a8646c..6c75be1f07 100644
--- a/packages/admin-ui/src/lib/core/src/components/job-queue-link/job-queue-link.component.html
+++ b/packages/admin-ui/src/lib/core/src/components/job-queue-link/job-queue-link.component.html
@@ -6,7 +6,7 @@
 >
     <ng-container *ngIf="activeJobCount; else noJobs">
         <clr-icon shape="hourglass" class="has-badge"></clr-icon>
-        {{ 'common.jobs-in-progress' | translate: { count: activeJobCount } }}
+        {{ 'system.jobs-in-progress' | translate: { count: activeJobCount } }}
     </ng-container>
     <ng-template #noJobs>
         <clr-icon shape="hourglass"></clr-icon>
diff --git a/packages/admin-ui/src/lib/settings/src/components/job-list/job-list.component.html b/packages/admin-ui/src/lib/settings/src/components/job-list/job-list.component.html
index e3ec8d6dd6..239ef584c3 100644
--- a/packages/admin-ui/src/lib/settings/src/components/job-list/job-list.component.html
+++ b/packages/admin-ui/src/lib/settings/src/components/job-list/job-list.component.html
@@ -13,7 +13,7 @@
                     name="hide-settled"
                     (change)="refresh()"
                 />
-                <label>{{ 'settings.hide-settled-jobs' | translate }}</label>
+                <label>{{ 'system.hide-settled-jobs' | translate }}</label>
             </clr-checkbox-wrapper>
         </clr-checkbox-container>
     </vdr-ab-left>
@@ -32,7 +32,7 @@
         >
             <ng-template ng-label-tmp ng-option-tmp let-item="item">
                 <ng-container *ngIf="item.name === 'all'; else others">
-                    {{ 'settings.all-job-queues' | translate }}
+                    {{ 'system.all-job-queues' | translate }}
                 </ng-container>
                 <ng-template #others>
                     <vdr-chip [colorFrom]="item.name">{{ item.name }}</vdr-chip>
@@ -52,11 +52,11 @@
     (itemsPerPageChange)="setItemsPerPage($event)"
 >
     <vdr-dt-column></vdr-dt-column>
-    <vdr-dt-column>{{ 'settings.job-queue-name' | translate }}</vdr-dt-column>
+    <vdr-dt-column>{{ 'system.job-queue-name' | translate }}</vdr-dt-column>
     <vdr-dt-column>{{ 'common.created-at' | translate }}</vdr-dt-column>
-    <vdr-dt-column>{{ 'settings.job-state' | translate }}</vdr-dt-column>
-    <vdr-dt-column>{{ 'settings.job-duration' | translate }}</vdr-dt-column>
-    <vdr-dt-column>{{ 'settings.job-result' | translate }}</vdr-dt-column>
+    <vdr-dt-column>{{ 'system.job-state' | translate }}</vdr-dt-column>
+    <vdr-dt-column>{{ 'system.job-duration' | translate }}</vdr-dt-column>
+    <vdr-dt-column>{{ 'system.job-result' | translate }}</vdr-dt-column>
     <ng-template let-job="item">
         <td class="left align-middle">
             <vdr-entity-info [entity]="job"></vdr-entity-info>
@@ -66,7 +66,7 @@
                 <button
                     class="btn btn-link btn-icon"
                     vdrDropdownTrigger
-                    [title]="'settings.job-data' | translate"
+                    [title]="'system.job-data' | translate"
                 >
                     <clr-icon shape="details"></clr-icon>
                 </button>
@@ -88,7 +88,7 @@
             <vdr-dropdown *ngIf="hasResult(job)">
                 <button class="btn btn-link btn-sm details-button" vdrDropdownTrigger>
                     <clr-icon shape="details"></clr-icon>
-                    {{ 'settings.job-result' | translate }}
+                    {{ 'system.job-result' | translate }}
                 </button>
                 <vdr-dropdown-menu>
                     <div class="result-detail">
@@ -99,7 +99,7 @@
             <vdr-dropdown *ngIf="job.error">
                 <button class="btn btn-link btn-sm details-button" vdrDropdownTrigger>
                     <clr-icon shape="exclamation-circle"></clr-icon>
-                    {{ 'settings.job-error' | translate }}
+                    {{ 'system.job-error' | translate }}
                 </button>
                 <vdr-dropdown-menu>
                     <div class="result-detail">
diff --git a/packages/admin-ui/src/lib/settings/src/components/shipping-method-test-result/shipping-method-test-result.component.html b/packages/admin-ui/src/lib/settings/src/components/shipping-method-test-result/shipping-method-test-result.component.html
index 6530af877e..0876491070 100644
--- a/packages/admin-ui/src/lib/settings/src/components/shipping-method-test-result/shipping-method-test-result.component.html
+++ b/packages/admin-ui/src/lib/settings/src/components/shipping-method-test-result/shipping-method-test-result.component.html
@@ -11,7 +11,7 @@
     </div>
     <div class="card-block">
         <div class="result-details" [class.stale]="testDataUpdated">
-            <vdr-labeled-data [label]="'settings.elibigle' | translate">
+            <vdr-labeled-data [label]="'settings.eligible' | translate">
                 <div class="eligible-icon">
                     <clr-icon
                         shape="success-standard"
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/en.json b/packages/admin-ui/src/lib/static/i18n-messages/en.json
index 08999482d0..d14f3bbe03 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/en.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/en.json
@@ -155,7 +155,6 @@
     "guest": "Guest",
     "hide-custom-fields": "Hide custom fields",
     "items-per-page-option": "{ count } per page",
-    "jobs-in-progress": "{ count } {count, plural, one {job} other {jobs}} in progress",
     "language": "Language",
     "launch-extension": "Launch extension",
     "live-update": "Live update",
@@ -588,7 +587,6 @@
     "add-countries-to-zone-success": "Added { countryCount } {countryCount, plural, one {country} other {countries}} to zone \"{ zoneName }\"",
     "add-products-to-test-order": "Add products to the test order",
     "administrator": "Administrator",
-    "all-job-queues": "All job queues",
     "catalog": "Catalog",
     "channel": "Channel",
     "channel-token": "Channel token",
@@ -610,17 +608,10 @@
     "default-shipping-zone": "Default shipping zone",
     "default-tax-zone": "Default tax zone",
     "delete": "Delete",
-    "elibigle": "Eligible",
+    "eligible": "Eligible",
     "email-address": "Email address",
     "filter-by-member-name": "Filter by country",
     "first-name": "First name",
-    "hide-settled-jobs": "Hide settled jobs",
-    "job-data": "Job data",
-    "job-duration": "Duration",
-    "job-error": "Job error",
-    "job-queue-name": "Queue name",
-    "job-result": "Job result",
-    "job-state": "Job state",
     "last-name": "Last name",
     "no-eligible-shipping-methods": "No eligible shipping methods",
     "order": "Order",
@@ -653,5 +644,16 @@
     "update-zone": "Update zone",
     "view-zone-members": "View members",
     "zone": "Zone"
+  },
+  "system": {
+    "all-job-queues": "All job queues",
+    "hide-settled-jobs": "Hide settled jobs",
+    "job-data": "Job data",
+    "job-duration": "Duration",
+    "job-error": "Job error",
+    "job-queue-name": "Queue name",
+    "job-result": "Job result",
+    "job-state": "Job state",
+    "jobs-in-progress": "{ count } {count, plural, one {job} other {jobs}} in progress"
   }
 }
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pl.json b/packages/admin-ui/src/lib/static/i18n-messages/pl.json
index 2aab48e632..570ad47080 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/pl.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/pl.json
@@ -151,7 +151,6 @@
     "guest": "Gość",
     "hide-custom-fields": "Ukryj pola dodatkowe",
     "items-per-page-option": "{ count } na stronę",
-    "jobs-in-progress": "{ count } {count, plural, one {zadanie} other {zadań}} w trakcie",
     "language": "Język",
     "launch-extension": "Uruchom rozszerzenie",
     "live-update": "Aktualizacja live",
@@ -580,7 +579,6 @@
     "add-countries-to-zone-success": "Dodano { countryCount } {countryCount, plural, one {kraj} other {kraje}} do strefy \"{ zoneName }\"",
     "add-products-to-test-order": "Dodaj produkty do testowanego zamówienia",
     "administrator": "Administrator",
-    "all-job-queues": "Kolejka wszystkich zadań",
     "catalog": "Katalog",
     "channel": "Kanał",
     "channel-token": "Token kanału",
@@ -601,16 +599,10 @@
     "default-shipping-zone": "Domyślna strefa zakupowa",
     "default-tax-zone": "Domyślna strefa podatkowa",
     "delete": "Usuń",
-    "elibigle": "Wybieralny",
+    "eligible": "Wybieralny",
     "email-address": "Email",
     "first-name": "Imię",
-    "hide-settled-jobs": "Ukryj rozliczone zlecenia",
-    "job-data": "Dane zlecenia",
-    "job-duration": "Czas trwania",
-    "job-error": "Błąd zlecenia",
-    "job-queue-name": "Nazwa kolejki",
-    "job-result": "Rezultat zlecenia",
-    "job-state": "Status zlecenia",
+
     "last-name": "Nazwisko",
     "no-eligible-shipping-methods": "Brak pasujących metod wysyłki",
     "order": "Zamówienie",
@@ -642,5 +634,16 @@
     "track-inventory-default": "Śledź domyślnie magazyn",
     "update": "Aktualizuj",
     "zone": "Strefa"
+  },
+  "system": {
+    "all-job-queues": "Kolejka wszystkich zadań",
+    "hide-settled-jobs": "Ukryj rozliczone zlecenia",
+    "job-data": "Dane zlecenia",
+    "job-duration": "Czas trwania",
+    "job-error": "Błąd zlecenia",
+    "job-queue-name": "Nazwa kolejki",
+    "job-result": "Rezultat zlecenia",
+    "job-state": "Status zlecenia",
+    "jobs-in-progress": "{ count } {count, plural, one {zadanie} other {zadań}} w trakcie"
   }
 }
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh.json b/packages/admin-ui/src/lib/static/i18n-messages/zh.json
index fa8ff37396..50be03650f 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/zh.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/zh.json
@@ -151,7 +151,6 @@
     "guest": "游客",
     "hide-custom-fields": "隐藏客户化字段",
     "items-per-page-option": "每页显示 { count } 条",
-    "jobs-in-progress": "{ count }个任务正在运行",
     "language": "语言",
     "launch-extension": "启动扩展插件",
     "log-out": "退出",
@@ -256,9 +255,6 @@
     "facet-value-form-values-do-not-match": "表单中商品特征值数量与实际不符",
     "product-variant-form-values-do-not-match": "表单中商品规格数量与实际不符"
   },
-  "job": {
-    "reindex": "重建索引"
-  },
   "lang": {
     "aa": "阿法尔语",
     "ab": "阿布哈兹语",
@@ -594,7 +590,7 @@
     "default-shipping-zone": "默认配送区域",
     "default-tax-zone": "默认销售区域",
     "delete": "删除",
-    "elibigle": "符合条件",
+    "eligible": "符合条件",
     "email-address": "电子邮件",
     "first-name": "名",
     "last-name": "姓",
@@ -628,5 +624,8 @@
     "track-inventory-default": "默认跟踪库存",
     "update": "修改",
     "zone": "销售区域"
+  },
+  "system": {
+    "jobs-in-progress": "{ count }个任务正在运行"
   }
-}
\ No newline at end of file
+}