diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index be6e33e3..2181decf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,7 @@ repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
     rev: v2.3.0
     hooks:
+      - id: check-merge-conflict
       - id: check-yaml
       - id: check-toml
       - id: mixed-line-ending
@@ -18,7 +19,6 @@ repos:
           - '--no-ensure-ascii'
       - id: check-builtin-literals
       - id: check-docstring-first
-      - id: check-merge-conflict
   - repo: local
     hooks:
       - id: collect-phrases
@@ -27,7 +27,7 @@ repos:
           - commit
           - merge-commit
         language: system
-        files: ^frontend/
+        files: ^frontend/src/
         types_or: [javascript, jsx, ts, tsx] # uses https://github.com/pre-commit/identify
         entry: bash -c 'cd frontend/static/locales && python3 collect_phrases.py'
   - repo: local
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 0b15fa0c..21ca5d04 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -33,7 +33,8 @@ const App = (): JSX.Element => {
 
   useEffect(() => {
     window.addEventListener('torStatus', (event) => {
-      setTorStatus(event?.detail);
+      // UX improv: delay the "Conencted" status by 10 secs to avoid long waits for first requests
+      setTimeout(() => setTorStatus(event?.detail), event?.detail === '"Done"' ? 10000 : 0);
     });
   }, []);
 
diff --git a/frontend/src/basic/SettingsPage/index.tsx b/frontend/src/basic/SettingsPage/index.tsx
index 7e23403a..ecd22d35 100644
--- a/frontend/src/basic/SettingsPage/index.tsx
+++ b/frontend/src/basic/SettingsPage/index.tsx
@@ -26,7 +26,13 @@ const SettingsPage = ({
   return (
     <Paper
       elevation={12}
-      sx={{ padding: '0.6em', width: '18em', maxHeight: `${maxHeight}em`, overflow: 'auto' }}
+      sx={{
+        padding: '0.6em',
+        width: '18em',
+        maxHeight: `${maxHeight}em`,
+        overflow: 'auto',
+        overflowX: 'clip',
+      }}
     >
       <Grid container>
         <Grid item>
diff --git a/frontend/src/components/Dialogs/Profile.tsx b/frontend/src/components/Dialogs/Profile.tsx
index b242c004..3c8b580a 100644
--- a/frontend/src/components/Dialogs/Profile.tsx
+++ b/frontend/src/components/Dialogs/Profile.tsx
@@ -81,15 +81,6 @@ const ProfileDialog = ({
     });
   }, []);
 
-  const copyTokenHandler = () => {
-    const robotToken = systemClient.getItem('robot_token');
-
-    if (robotToken) {
-      systemClient.copyToClipboard(robotToken);
-      setRobot({ ...robot, copiedToken: true });
-    }
-  };
-
   const copyReferralCodeHandler = () => {
     systemClient.copyToClipboard(`http://${host}/robot/${robot.referralCode}`);
   };
@@ -238,36 +229,6 @@ const ProfileDialog = ({
             </ListItem>
           )}
 
-          <ListItem>
-            <ListItemIcon>
-              <PasswordIcon />
-            </ListItemIcon>
-
-            <ListItemText secondary={t('Your token (will not remain here)')}>
-              {systemClient.getItem('robot_token') ? (
-                <TextField
-                  disabled
-                  sx={{ width: '100%', maxWidth: '450px' }}
-                  label={t('Back it up!')}
-                  value={systemClient.getItem('robot_token')}
-                  variant='filled'
-                  size='small'
-                  InputProps={{
-                    endAdornment: (
-                      <Tooltip disableHoverListener enterTouchDelay={0} title={t('Copied!') || ''}>
-                        <IconButton onClick={copyTokenHandler}>
-                          <ContentCopy color='inherit' />
-                        </IconButton>
-                      </Tooltip>
-                    ),
-                  }}
-                />
-              ) : (
-                t('Cannot remember')
-              )}
-            </ListItemText>
-          </ListItem>
-
           <Divider />
 
           <EnableTelegramDialog
diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
index 7fdc5704..1ac61937 100644
--- a/frontend/static/locales/ca.json
+++ b/frontend/static/locales/ca.json
@@ -238,8 +238,6 @@
   "Inactive order": "Ordre inactiva",
   "No active orders": "No hi ha ordres actives",
   "You do not have previous orders": "No tens ordres prèvies",
-  "Your token (will not remain here)": "El teu token (no romandrà aquí)",
-  "Cannot remember": "No es pot recordar",
   "Telegram enabled": "Telegram activat",
   "Enable Telegram Notifications": "Notificar en Telegram",
   "Use stealth invoices": "Factures sigil·loses",
diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
index 85631e89..7d60610f 100644
--- a/frontend/static/locales/cs.json
+++ b/frontend/static/locales/cs.json
@@ -238,8 +238,6 @@
   "Inactive order": "Neaktivní nabídka",
   "No active orders": "Žádné aktivní nabídky",
   "You do not have previous orders": "Nemáš předchozí objednávky",
-  "Your token (will not remain here)": "Tvůj token (nezůstane zde)",
-  "Cannot remember": "Nepamatuje si",
   "Telegram enabled": "Telegram povolen",
   "Enable Telegram Notifications": "Povolit Telegram notifikace",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
index cc168bbc..66c2efb2 100644
--- a/frontend/static/locales/de.json
+++ b/frontend/static/locales/de.json
@@ -238,8 +238,6 @@
   "Inactive order": "Inaktive Order",
   "No active orders": "Keine aktive Order",
   "You do not have previous orders": "Du hast keine vorherige Order",
-  "Your token (will not remain here)": "Dein Token (wird hier nicht gespeichert)",
-  "Cannot remember": "Kann mich nicht erinnern",
   "Telegram enabled": "Telegram aktiviert",
   "Enable Telegram Notifications": "Telegram-Benachrichtigungen aktivieren",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
index 990d4b21..c41ac091 100644
--- a/frontend/static/locales/en.json
+++ b/frontend/static/locales/en.json
@@ -238,8 +238,6 @@
   "Inactive order": "Inactive order",
   "No active orders": "No active orders",
   "You do not have previous orders": "You do not have previous orders",
-  "Your token (will not remain here)": "Your token (will not remain here)",
-  "Cannot remember": "Cannot remember",
   "Telegram enabled": "Telegram enabled",
   "Enable Telegram Notifications": "Enable Telegram Notifications",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
index de14af4f..b2519c16 100644
--- a/frontend/static/locales/es.json
+++ b/frontend/static/locales/es.json
@@ -238,8 +238,6 @@
   "Inactive order": "Orden inactiva",
   "No active orders": "No hay órdenes activas",
   "You do not have previous orders": "No tienes órdenes previas",
-  "Your token (will not remain here)": "Tu token (no permanecerá aquí)",
-  "Cannot remember": "Se olvidó",
   "Telegram enabled": "Telegram activado",
   "Enable Telegram Notifications": "Notificar en Telegram",
   "Use stealth invoices": "Facturas sigilosas",
diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
index 812ddb65..3cac6489 100644
--- a/frontend/static/locales/eu.json
+++ b/frontend/static/locales/eu.json
@@ -238,8 +238,6 @@
   "Inactive order": "Eskaera ez aktiboa",
   "No active orders": "Eskaera aktiborik ez",
   "You do not have previous orders": "Ez duzu aurretik eskaerarik",
-  "Your token (will not remain here)": "Zure tokena (ez da hemen mantenduko)",
-  "Cannot remember": "Ahaztu da",
   "Telegram enabled": "Telegram baimendua",
   "Enable Telegram Notifications": "Baimendu Telegram Jakinarazpenak",
   "Use stealth invoices": "Erabili ezkutuko fakturak",
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
index ac3c9b1d..26a11a65 100644
--- a/frontend/static/locales/fr.json
+++ b/frontend/static/locales/fr.json
@@ -238,8 +238,6 @@
   "Inactive order": "Inactive order",
   "No active orders": "Aucun ordre actif",
   "You do not have previous orders": "You do not have previous orders",
-  "Your token (will not remain here)": "Votre jeton (ne restera pas ici)",
-  "Cannot remember": "Impossible de se souvenir",
   "Telegram enabled": "Telegram activé",
   "Enable Telegram Notifications": "Activer les notifications Telegram",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
index 0e6234be..5bf2949f 100644
--- a/frontend/static/locales/it.json
+++ b/frontend/static/locales/it.json
@@ -238,8 +238,6 @@
   "Inactive order": "Ordine inattivo",
   "No active orders": "Nessun ordine attivo",
   "You do not have previous orders": "Non hai ordini precedenti",
-  "Your token (will not remain here)": "Il tuo gettone (Non resterà qui)",
-  "Cannot remember": "Dimenticato",
   "Telegram enabled": "Telegram attivato",
   "Enable Telegram Notifications": "Attiva notifiche Telegram",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
index e56b843e..85604cc0 100644
--- a/frontend/static/locales/pl.json
+++ b/frontend/static/locales/pl.json
@@ -238,8 +238,6 @@
   "Inactive order": "Inactive order",
   "No active orders": "Brak aktywnych zamówień",
   "You do not have previous orders": "You do not have previous orders",
-  "Your token (will not remain here)": "Twój token (nie pozostanie tutaj)",
-  "Cannot remember": "niemożliwe do zapamiętania",
   "Telegram enabled": "Telegram włączony",
   "Enable Telegram Notifications": "Włącz powiadomienia telegramu",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
index 7a29b714..13e33066 100644
--- a/frontend/static/locales/pt.json
+++ b/frontend/static/locales/pt.json
@@ -238,8 +238,6 @@
   "Inactive order": "Ordem inativa",
   "No active orders": "Nenhuma ordem ativa",
   "You do not have previous orders": "Você não tem ordens anteriores",
-  "Your token (will not remain here)": "Seu token (não permanecerá aqui)",
-  "Cannot remember": "Não consigo lembrar",
   "Telegram enabled": "Telegram ativado",
   "Enable Telegram Notifications": "Habilitar notificações do Telegram",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
index a2340db1..bb85e95f 100644
--- a/frontend/static/locales/ru.json
+++ b/frontend/static/locales/ru.json
@@ -238,8 +238,6 @@
   "Inactive order": "Неактивный ордер",
   "No active orders": "Нет активных ордеров",
   "You do not have previous orders": "У Вас нет предыдущих ордеров",
-  "Your token (will not remain here)": "Ваш токен (здесь не останется)",
-  "Cannot remember": "Не могу вспомнить",
   "Telegram enabled": "Telegram включен",
   "Enable Telegram Notifications": "Включить уведомления Telegram",
   "Use stealth invoices": "Использовать стелс инвойсы",
diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
index dd1cc070..ca3187c3 100644
--- a/frontend/static/locales/sv.json
+++ b/frontend/static/locales/sv.json
@@ -238,8 +238,6 @@
   "Inactive order": "Inaktiv order",
   "No active orders": "Inga aktiva ordrar",
   "You do not have previous orders": "Du har inga tidigare ordrar",
-  "Your token (will not remain here)": "Din token (kommer ej finnas kvar här)",
-  "Cannot remember": "Glömt bort",
   "Telegram enabled": "Telegram aktiverat",
   "Enable Telegram Notifications": "Aktivera Telegram-notiser",
   "Use stealth invoices": "Use stealth invoices",
diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
index a37551ba..a66f29b6 100644
--- a/frontend/static/locales/th.json
+++ b/frontend/static/locales/th.json
@@ -238,8 +238,6 @@
   "Inactive order": "รายการที่ไม่ได้ดำเนินการอยู่",
   "No active orders": "ไม่มีรายการที่กำลังดำเนินการอยู่",
   "You do not have previous orders": "คุณไม่มีรายการก่อนหน้านี้",
-  "Your token (will not remain here)": "token ของคุณ (แพล้ตฟอร์มไม่ได้บันทึกให้คุณ)",
-  "Cannot remember": "จำไม่ได้",
   "Telegram enabled": "เปิดใช้ Telegram แล้ว",
   "Enable Telegram Notifications": "เปิดใช้การแจ้งเตือนผ่านทาง Telegram",
   "Use stealth invoices": "ใช้งาน stealth invoices",
diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
index 8c20afb3..f5dfb315 100644
--- a/frontend/static/locales/zh-SI.json
+++ b/frontend/static/locales/zh-SI.json
@@ -238,8 +238,6 @@
   "Inactive order": "不活跃订单",
   "No active orders": "没有活跃的订单",
   "You do not have previous orders": "你没有之前的订单",
-  "Your token (will not remain here)": "你的令牌（不会留在此地）",
-  "Cannot remember": "记不得",
   "Telegram enabled": "Telegram 已开启",
   "Enable Telegram Notifications": "开启 Telegram 通知",
   "Use stealth invoices": "使用隐形发票",
diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
index 09d26186..7d7ef680 100644
--- a/frontend/static/locales/zh-TR.json
+++ b/frontend/static/locales/zh-TR.json
@@ -238,8 +238,6 @@
   "Inactive order": "不活躍訂單",
   "No active orders": "沒有活躍的訂單",
   "You do not have previous orders": "你沒有之前的訂單",
-  "Your token (will not remain here)": "你的令牌 （不會留在此地）",
-  "Cannot remember": "記不得",
   "Telegram enabled": "Telegram 已開啟",
   "Enable Telegram Notifications": "開啟 Telegram 通知",
   "Use stealth invoices": "使用隱形發票",