diff --git a/public/locales/de-de.yaml b/public/locales/de-de.yaml
index 1d6dc07..c452e99 100644
--- a/public/locales/de-de.yaml
+++ b/public/locales/de-de.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Starten
       predownload: Update vorinstallieren
-      integrity: Dateien verifizieren und reparieren
 
 # Einstellungs Fenster
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: Launcher Ordner öffnen
         game: Spiel Ordner öffnen
+        repair_game: spiel-dateien reparieren
 
   # Verberssungen
   enhancements:
diff --git a/public/locales/en-us.yaml b/public/locales/en-us.yaml
index 84113c3..a0b2c59 100644
--- a/public/locales/en-us.yaml
+++ b/public/locales/en-us.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Launch
       predownload: Pre-download update
-      integrity: Verify and repair files
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: launcher folder
         game: game folder
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/public/locales/es-es.yaml b/public/locales/es-es.yaml
index 50b236e..159d5e7 100644
--- a/public/locales/es-es.yaml
+++ b/public/locales/es-es.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Jugar
       predownload: Pre-descargar actualización
-      integrity: Verificar y reparar archivos
 
 # Ventana de opciones
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: carpeta del launcher
         game: carpeta del juego
+        repair_game: repair game files
 
   # Mejoras
   enhancements:
diff --git a/public/locales/fr-fr.yaml b/public/locales/fr-fr.yaml
index 8b6700c..ba5e672 100644
--- a/public/locales/fr-fr.yaml
+++ b/public/locales/fr-fr.yaml
@@ -75,7 +75,6 @@ launcher:
     ready:
       launch: Lancer
       predownload: Pre-téléchargement de mise à jour
-      integrity: Vérifie et corrige les fichiers du jeu
 
 # Settings window
 settings:
@@ -137,6 +136,7 @@ settings:
         winecfg: winecfg
         launcher: Dossier du Launcher
         game: Dossier du jeu
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/public/locales/hu-hu.yaml b/public/locales/hu-hu.yaml
index 484af6e..fbc2417 100644
--- a/public/locales/hu-hu.yaml
+++ b/public/locales/hu-hu.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Indítás
       predownload: Frissítés előtöltése
-      integrity: Verify and repair files
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: launcher mappa
         game: játékmappa
+        repair_game: Játékfájlok javítása
 
   # Enhancements
   enhancements:
diff --git a/public/locales/id-id.yaml b/public/locales/id-id.yaml
index 128be42..60ff25e 100644
--- a/public/locales/id-id.yaml
+++ b/public/locales/id-id.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Luncurkan
       predownload: Pembaruan pra-unduh
-      integrity: Verify and repair files
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: folder peluncur
         game: folder game
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/public/locales/it-it.yaml b/public/locales/it-it.yaml
index 614868b..511f16c 100644
--- a/public/locales/it-it.yaml
+++ b/public/locales/it-it.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Avvia
       predownload: Pre-scarica aggiornamento
-      integrity: Verify and repair files
 
 # Settings window
 settings:
@@ -132,6 +131,7 @@ settings:
         winecfg: winecfg
         launcher: Cartella del launcher
         game: Cartella del gioco
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/public/locales/nb-no.yaml b/public/locales/nb-no.yaml
index 6299aa9..96e51ac 100644
--- a/public/locales/nb-no.yaml
+++ b/public/locales/nb-no.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Start
       predownload: Forhånds-nedlast oppdatering
-      integrity: Verify and repair files
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: launcher mappe
         game: spill mappe
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/public/locales/ru-ru.yaml b/public/locales/ru-ru.yaml
index aac8cde..1f5500d 100644
--- a/public/locales/ru-ru.yaml
+++ b/public/locales/ru-ru.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: Запустить
       predownload: Предзагрузить обновление
-      integrity: Проверить и исправить файлы
 
 # Окно настроек
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: папка лаунчера
         game: папка игры
+        repair_game: исправить файлы игры
 
   # Улучшения
   enhancements:
diff --git a/public/locales/uwu.yaml b/public/locales/uwu.yaml
index b9eee62..598aec4 100644
--- a/public/locales/uwu.yaml
+++ b/public/locales/uwu.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: launch (◕▿◕✿)
       predownload: pwe-downwoad update
-      integrity: vewify files & wepaiw
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: waunchew f-fowdew
         game: game f-fowdew
+        repair_game: wepaiw game fiwes
 
   # Enhancements
   enhancements:
diff --git a/public/locales/zh-cn.yaml b/public/locales/zh-cn.yaml
index 9be7095..850ea66 100644
--- a/public/locales/zh-cn.yaml
+++ b/public/locales/zh-cn.yaml
@@ -72,7 +72,6 @@ launcher:
     ready:
       launch: 启动
       predownload: 预下载更新
-      integrity: 验证并修复文件
 
 # Settings window
 settings:
@@ -133,6 +132,7 @@ settings:
         winecfg: winecfg
         launcher: 启动器文件夹
         game: 游戏文件夹
+        repair_game: repair game files
 
   # Enhancements
   enhancements:
diff --git a/src/index.svelte b/src/index.svelte
index 826a7a8..0dfe840 100644
--- a/src/index.svelte
+++ b/src/index.svelte
@@ -16,7 +16,6 @@
     import GearIcon from './assets/images/gear.png';
     import GearActiveIcon from './assets/images/gear-active.png';
     import DownloadIcon from './assets/images/cloud-download.png';
-    import WrenchIcon from './assets/images/wrench.png';
 
     const launcher = new Launcher(onMount);
 
@@ -145,10 +144,6 @@
 
         <img src={GearActiveIcon} class="active" alt="Settings">
     </div>
-    
-    <button class="button hint--left hint--small" aria-label="{typeof $locale === 'string' ? $_('launcher.states.ready.integrity') : ''}" id="integrity">
-        <img src={WrenchIcon} alt="Integrity" />
-    </button>
 
     <button class="button hint--left hint--small" aria-label="{typeof $locale === 'string' ? $_('launcher.states.ready.predownload') : ''}" id="predownload">
         <img src={DownloadIcon} alt="Download" />
diff --git a/src/settings.svelte b/src/settings.svelte
index 503f6c1..3b0ebb2 100644
--- a/src/settings.svelte
+++ b/src/settings.svelte
@@ -295,6 +295,16 @@
                             background: true
                         });
                     }} />
+
+                    <!-- svelte-ignore missing-declaration -->
+                    <Button
+                        lang="settings.general.items.buttons.repair_game"
+                        click={async () => {
+                            await IPC.write('check-files-integrity');
+
+                            Neutralino.app.exit();
+                        }}
+                    />
                 </div>
             </div>
 
diff --git a/src/ts/Launcher.ts b/src/ts/Launcher.ts
index d09a4dc..175bb68 100644
--- a/src/ts/Launcher.ts
+++ b/src/ts/Launcher.ts
@@ -127,6 +127,23 @@ export default class Launcher
 
                                     record.pop();
                                 }
+
+                                else if (record.data === 'check-files-integrity')
+                                {
+                                    this.state!.launchButton.style['display'] = 'none';
+                                    this.state!.settingsButton.style['display'] = 'none';
+
+                                    import('./launcher/states/CheckIntegrity').then((module) => {
+                                        module.default(this).then(() => {
+                                            this.state!.update().then(() => {
+                                                this.state!.launchButton.style['display'] = 'block';
+                                                this.state!.settingsButton.style['display'] = 'block';
+                                            });
+                                        });
+                                    });
+
+                                    record.pop();
+                                }
                             });
                         });
 
diff --git a/src/ts/launcher/State.ts b/src/ts/launcher/State.ts
index c9026fe..ed0f523 100644
--- a/src/ts/launcher/State.ts
+++ b/src/ts/launcher/State.ts
@@ -27,7 +27,6 @@ export default class State
     public launchButton: HTMLElement;
     public pauseButton: HTMLElement;
     public predownloadButton: HTMLElement;
-    public integrityButton: HTMLElement;
     public settingsButton: HTMLElement;
 
     protected _state: LauncherState = 'game-launch-available';
@@ -57,7 +56,6 @@ export default class State
         this.launchButton = <HTMLElement>document.getElementById('launch');
         this.pauseButton = <HTMLElement>document.getElementById('pause');
         this.predownloadButton = <HTMLElement>document.getElementById('predownload');
-        this.integrityButton = <HTMLElement>document.getElementById('integrity');
         this.settingsButton = <HTMLElement>document.getElementById('settings');
 
         this.launchButton.onclick = () => {
@@ -98,21 +96,6 @@ export default class State
                 });
         };
 
-        this.integrityButton.onclick = () => {
-            this.launchButton.style['display'] = 'none';
-            this.integrityButton.style['display'] = 'none';
-            this.settingsButton.style['display'] = 'none';
-
-            import('./states/CheckIntegrity').then((module) => {
-                module.default(this.launcher).then(() => {
-                    this.update().then(() => {
-                        this.launchButton.style['display'] = 'block';
-                        this.settingsButton.style['display'] = 'block';
-                    });
-                });
-            });
-        };
-
         this.update().then(async () => {
             // Close splash screen
             IPC.write('launcher-loaded');
@@ -256,7 +239,6 @@ export default class State
 
         this.launcher.progressBar!.hide();
         this.predownloadButton.style['display'] = 'none';
-        this.integrityButton.style['display'] = 'none';
 
         this.launchButton.classList.remove('button-blue');
         this.launchButton.setAttribute('aria-label', '');
@@ -290,8 +272,6 @@ export default class State
                 break;
             
             case 'game-launch-available':
-                this.integrityButton.style['display'] = 'block';
-
                 this.launchButton.textContent = dictionary['ready']['launch'];
 
                 break;
diff --git a/src/ts/launcher/states/CheckIntegrity.ts b/src/ts/launcher/states/CheckIntegrity.ts
index f800e1f..403c5d1 100644
--- a/src/ts/launcher/states/CheckIntegrity.ts
+++ b/src/ts/launcher/states/CheckIntegrity.ts
@@ -367,8 +367,12 @@ export default (launcher: Launcher): Promise<void> => {
                                 resolve();
                             });
                         }
+
+                        else resolve();
                     });
                 }
+
+                else resolve();
             })
             .catch(() => {
                 debugThread.log('No pkg_version file provided');