diff --git a/lib/i18n.ts b/lib/i18n.ts
index 60da6644f..230bddd7d 100644
--- a/lib/i18n.ts
+++ b/lib/i18n.ts
@@ -16,6 +16,12 @@
 
 "use strict";
 
+document.addEventListener(
+  "DOMContentLoaded",
+  function () {
+    document.body.lang = chrome.i18n.getUILanguage();
+  });
+
 declare var i18n: any;
 
 const JedModule = window["Jed"];
diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html
index 2eac4a8e8..e80fb50c9 100644
--- a/pages/confirm-contract.html
+++ b/pages/confirm-contract.html
@@ -1,30 +1,34 @@
-<!doctype html>
-
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Taler Wallet: Confirm Reserve Creation</title>
-    <script src="../lib/vendor/URI.js"></script>
-    <script src="../lib/vendor/mithril.js"></script>
-    <script src="../lib/vendor/lodash.core.min.js"></script>
-    <script src="../lib/vendor/system-csp-production.src.js"></script>
-    <script src="../lib/vendor/jed.js"></script>
-    <script src="../lib/i18n.js"></script>
-    <script src="../lib/i18n-strings.js"></script>
-    <script src="../lib/module-trampoline.js"></script>
-    <link rel="stylesheet" type="text/css" href="../style/wallet.css">
 
-  <body>
-    <header>
-      <div id="logo"></div>
-      <h1>Payment Confirmation</h1>
-    </header>
+<head>
+  <title>Taler Wallet: Confirm Reserve Creation</title>
 
-    <aside class="sidebar" id="left">
-    </aside>
+  <link rel="stylesheet" type="text/css" href="../style/lang.css">
+  <link rel="stylesheet" type="text/css" href="../style/wallet.css">
 
-    <section id="main">
-      <article id="contract" class="fade"></article>
-    </section>
+  <script src="../lib/vendor/URI.js"></script>
+  <script src="../lib/vendor/mithril.js"></script>
+  <script src="../lib/vendor/lodash.core.min.js"></script>
+  <script src="../lib/vendor/system-csp-production.src.js"></script>
+  <script src="../lib/vendor/jed.js"></script>
+  <script src="../lib/i18n.js"></script>
+  <script src="../lib/i18n-strings.js"></script>
+  <script src="../lib/module-trampoline.js"></script>
+</head>
+
+<body>
+  <header>
+    <div id="logo"></div>
+    <h1>Payment Confirmation</h1>
+  </header>
+
+  <aside class="sidebar" id="left">
+  </aside>
+
+  <section id="main">
+    <article id="contract" class="fade"></article>
+  </section>
+</body>
 
-  </body>
 </html>
diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
index e14d10221..b8cfd4a00 100644
--- a/pages/confirm-create-reserve.html
+++ b/pages/confirm-create-reserve.html
@@ -1,34 +1,36 @@
-<!doctype html>
-
+<!DOCTYPE html>
 <html>
+
 <head>
   <title>Taler Wallet: Select Taler Provider</title>
+
+  <link rel="stylesheet" type="text/css" href="../style/lang.css">
+  <link rel="stylesheet" type="text/css" href="popup.css">
+
   <script src="../lib/vendor/URI.js"></script>
   <script src="../lib/vendor/mithril.js"></script>
   <script src="../lib/vendor/system-csp-production.src.js"></script>
   <script src="../lib/vendor/jed.js"></script>
+  <script src="../lib/lang.js"></script>
   <script src="../lib/i18n.js"></script>
   <script src="../lib/i18n-strings.js"></script>
   <script src="../lib/module-trampoline.js"></script>
-  <link rel="stylesheet" type="text/css" href="../style/wallet.css">
 </head>
 
 <body>
+  <header>
+    <div id="logo"></div>
+    <h1>Select Taler Provider</h1>
+  </header>
 
-<header>
-  <div id="logo"></div>
-  <h1>Select Taler Provider</h1>
-</header>
+  <aside class="sidebar" id="left">
+  </aside>
 
-<aside class="sidebar" id="left">
-</aside>
-
-<section id="main">
-
-  <article>
-    <div class="fade" id="mint-selection"></div>
-  </article>
-
-</section>
+  <section id="main">
+    <article>
+      <div class="fade" id="mint-selection"></div>
+    </article>
+  </section>
 </body>
+
 </html>
diff --git a/popup/popup.html b/popup/popup.html
index c67085c1b..fbf9c2193 100644
--- a/popup/popup.html
+++ b/popup/popup.html
@@ -1,8 +1,12 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset="utf-8">
-  <link rel="stylesheet" href="popup.css" type="text/css">
+
+  <link rel="stylesheet" type="text/css" href="../style/lang.css">
+  <link rel="stylesheet" type="text/css" href="popup.css">
+
   <script src="../lib/vendor/mithril.js"></script>
   <script src="../lib/vendor/lodash.core.min.js"></script>
   <script src="../lib/vendor/system-csp-production.src.js"></script>
@@ -11,10 +15,10 @@
   <script src="../lib/i18n-strings.js"></script>
   <script src="../lib/module-trampoline.js"></script>
 </head>
+
 <body>
-<div id="nav"></div>
-<div id="content"></div>
+  <div id="nav"></div>
+  <div id="content"></div>
 </body>
 
-
 </html>
diff --git a/style/wallet.css b/style/wallet.css
index 0af2240e0..230cf671e 100644
--- a/style/wallet.css
+++ b/style/wallet.css
@@ -135,4 +135,4 @@ button.linky {
 
 table, th, td {
     border: 1px solid black;
-}
\ No newline at end of file
+}
