diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
index 438faaa4d..8167cc04a 100644
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@@ -287,6 +287,7 @@ class S implements WidgetsLocalizations {
   String trade_id_not_found(String tradeId, String title) => "Trade ${tradeId} of ${title} not found.";
   String trade_is_powered_by(String provider) => "This trade is powered by ${provider}";
   String transaction_details_copied(String title) => "${title} copied to Clipboard";
+  String version(String currentVersion) => "Version ${currentVersion}";
   String wallet_list_failed_to_load(String wallet_name, String error) => "Failed to load ${wallet_name} wallet. ${error}";
   String wallet_list_failed_to_remove(String wallet_name, String error) => "Failed to remove ${wallet_name} wallet. ${error}";
   String wallet_list_loading_wallet(String wallet_name) => "Loading ${wallet_name} wallet";
@@ -800,6 +801,8 @@ class $de extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Wird geladen ${wallet_name} Wallet";
   @override
+  String version(String currentVersion) => "Ausführung ${currentVersion}";
+  @override
   String router_no_route(String name) => "Keine Route definiert für ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "Handel ${tradeId} von ${title} nicht gefunden.";
@@ -1348,6 +1351,8 @@ class $hi extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "लोड हो रहा है ${wallet_name} बटुआ";
   @override
+  String version(String currentVersion) => "संस्करण ${currentVersion}";
+  @override
   String router_no_route(String name) => "के लिए कोई मार्ग निर्धारित नहीं है ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "व्यापार ${tradeId} of ${title} नहीं मिला.";
@@ -1896,6 +1901,8 @@ class $ru extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Загрузка ${wallet_name} кошелька";
   @override
+  String version(String currentVersion) => "Версия ${currentVersion}";
+  @override
   String router_no_route(String name) => "Экран не найден ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "Сделка ${tradeId} ${title} не найдена.";
@@ -2444,6 +2451,8 @@ class $ko extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "로딩 ${wallet_name} 지갑";
   @override
+  String version(String currentVersion) => "버전 ${currentVersion}";
+  @override
   String router_no_route(String name) => "에 정의 된 경로가 없습니다 ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "무역 ${tradeId} 의 ${title} 찾을 수 없습니다.";
@@ -2992,6 +3001,8 @@ class $pt extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Abrindo a carteira ${wallet_name}";
   @override
+  String version(String currentVersion) => "Versão ${currentVersion}";
+  @override
   String router_no_route(String name) => "Nenhuma rota definida para ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "A troca ${tradeId} de ${title} não foi encontrada.";
@@ -3540,6 +3551,8 @@ class $ja extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "読み込み中 ${wallet_name} 財布";
   @override
+  String version(String currentVersion) => "バージョン ${currentVersion}";
+  @override
   String router_no_route(String name) => "ルートが定義されていません ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "トレード ${tradeId} of ${title} 見つかりません";
@@ -4092,6 +4105,8 @@ class $pl extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Ładuję ${wallet_name} portfel";
   @override
+  String version(String currentVersion) => "Wersja ${currentVersion}";
+  @override
   String router_no_route(String name) => "Brak zdefiniowanej trasy dla ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "Handel ${tradeId} of ${title} nie znaleziono.";
@@ -4640,6 +4655,8 @@ class $es extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Billetera ${wallet_name} de carga";
   @override
+  String version(String currentVersion) => "Versión ${currentVersion}";
+  @override
   String router_no_route(String name) => "No hay ruta definida para ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "Comercio ${tradeId} de ${title} no encontrado.";
@@ -5188,6 +5205,8 @@ class $nl extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "Bezig met laden ${wallet_name} portemonnee";
   @override
+  String version(String currentVersion) => "Versie ${currentVersion}";
+  @override
   String router_no_route(String name) => "Geen route gedefinieerd voor ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "Handel ${tradeId} van ${title} niet gevonden.";
@@ -5736,6 +5755,8 @@ class $zh extends S {
   @override
   String wallet_list_loading_wallet(String wallet_name) => "载入中 ${wallet_name} 钱包";
   @override
+  String version(String currentVersion) => "版 ${currentVersion}";
+  @override
   String router_no_route(String name) => "未定义路线 ${name}";
   @override
   String trade_id_not_found(String tradeId, String title) => "贸易方式 ${tradeId} 的 ${title} 未找到.";
diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart
index 4453f2124..5d8f935c2 100644
--- a/lib/src/screens/settings/settings.dart
+++ b/lib/src/screens/settings/settings.dart
@@ -343,7 +343,7 @@ class SettingsFormState extends State<SettingsForm> {
               final item = _items[index];
               bool _isDrawDivider = true;
 
-              if (item.attribute == Attributes.header || index == _items.length - 1) {
+              if (item.attribute == Attributes.header || item == _items.last) {
                 _isDrawDivider = false;
               } else {
                 if (_items[index + 1].attribute == Attributes.header) {
diff --git a/lib/src/stores/settings/settings_store.dart b/lib/src/stores/settings/settings_store.dart
index 57136d06f..786d4083e 100644
--- a/lib/src/stores/settings/settings_store.dart
+++ b/lib/src/stores/settings/settings_store.dart
@@ -48,9 +48,7 @@ abstract class SettingsStoreBase with Store {
             serializeActionlistDisplayModes(actionlistDisplayMode)),
         fireImmediately: false);
 
-    PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
-      currentVersion = packageInfo.version;
-    });
+    PackageInfo.fromPlatform().then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
 
   }
 
@@ -272,7 +270,7 @@ abstract class SettingsStoreBase with Store {
       ItemHeaders.support: S.current.settings_support,
       ItemHeaders.termsAndConditions: S.current.settings_terms_and_conditions,
       ItemHeaders.faq: S.current.faq,
-      ItemHeaders.version: 'Version $currentVersion'
+      ItemHeaders.version: S.current.version(currentVersion)
     });
   }
 
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 23e3cb8b2..05106ffdd 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Neues Wort hinzufügen",
   "incorrect_seed" : "Der eingegebene Text ist ungültig.",
 
-  "biometric_auth_reason" : "Scannen Sie Ihren Fingerabdruck zur Authentifizierung"
+  "biometric_auth_reason" : "Scannen Sie Ihren Fingerabdruck zur Authentifizierung",
+  "version" : "Ausführung ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index a0667d43b..70e95b298 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Add new word",
   "incorrect_seed" : "The text entered is not valid.",
 
-  "biometric_auth_reason" : "Scan your fingerprint to authenticate"
+  "biometric_auth_reason" : "Scan your fingerprint to authenticate",
+  "version" : "Version ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index e22cfa02d..e76cb10f6 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Agregar palabra nueva",
   "incorrect_seed" : "El texto ingresado no es válido.",
 
-  "biometric_auth_reason" : "Escanee su huella digital para autenticar"
+  "biometric_auth_reason" : "Escanee su huella digital para autenticar",
+  "version" : "Versión ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 68e7191be..7c5b21b08 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "नया शब्द जोड़ें",
   "incorrect_seed" : "दर्ज किया गया पाठ मान्य नहीं है।",
 
-  "biometric_auth_reason" : "प्रमाणित करने के लिए अपने फ़िंगरप्रिंट को स्कैन करें"
+  "biometric_auth_reason" : "प्रमाणित करने के लिए अपने फ़िंगरप्रिंट को स्कैन करें",
+  "version" : "संस्करण ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 7f209f1d1..f78d7c8d1 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "新しい単語を追加",
   "incorrect_seed" : "入力されたテキストは無効です。",
 
-  "biometric_auth_reason" : "प指紋をスキャンして認証する"
+  "biometric_auth_reason" : "प指紋をスキャンして認証する",
+  "version" : "バージョン ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 7f4e75c1a..146b23058 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "새로운 단어 추가",
   "incorrect_seed" : "입력하신 텍스트가 유효하지 않습니다.",
 
-  "biometric_auth_reason" : "지문을 스캔하여 인증"
+  "biometric_auth_reason" : "지문을 스캔하여 인증",
+  "version" : "버전 ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 2f683e0c0..6550cfbb6 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Nieuw woord toevoegen",
   "incorrect_seed" : "De ingevoerde tekst is niet geldig.",
 
-  "biometric_auth_reason" : "Scan uw vingerafdruk om te verifiëren"
+  "biometric_auth_reason" : "Scan uw vingerafdruk om te verifiëren",
+  "version" : "Versie ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index e38761024..5f4236eba 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Dodaj nowe słowo",
   "incorrect_seed" : "Wprowadzony tekst jest nieprawidłowy.",
 
-  "biometric_auth_reason" : "Zeskanuj swój odcisk palca, aby go uwierzytelnić"
+  "biometric_auth_reason" : "Zeskanuj swój odcisk palca, aby go uwierzytelnić",
+  "version" : "Wersja ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 7463bbd03..73cbe5866 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Adicionar nova palavra",
   "incorrect_seed" : "O texto digitado não é válido.",
 
-  "biometric_auth_reason" : "Digitalize sua impressão digital para autenticar"
+  "biometric_auth_reason" : "Digitalize sua impressão digital para autenticar",
+  "version" : "Versão ${currentVersion}"
 }
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 0dc4c4bde..62b617b5e 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "Добавить новое слово",
   "incorrect_seed" : "Введенный текст некорректный.",
 
-  "biometric_auth_reason" : "Отсканируйте свой отпечаток пальца для аутентификации"
+  "biometric_auth_reason" : "Отсканируйте свой отпечаток пальца для аутентификации",
+  "version" : "Версия ${currentVersion}"
 }
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 23cc240e3..b0fbb6bbb 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -338,5 +338,6 @@
   "add_new_word" : "添加新词",
   "incorrect_seed" : "输入的文字无效。",
 
-  "biometric_auth_reason" : "掃描指紋以進行身份驗證"
+  "biometric_auth_reason" : "掃描指紋以進行身份驗證",
+  "version" : "版 ${currentVersion}"
 }
\ No newline at end of file