diff --git a/l10n b/l10n
index bee67c4c6..1160be5b4 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit bee67c4c6eb4f02787cd1e354f03abbd2d3cf0ca
+Subproject commit 1160be5b47c31d7c7862412cd2a8368606233dd2
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 37804deef..2a6755d9b 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 37804deef0d07034621167cca17ff27a242480ec
+Subproject commit 2a6755d9ba1c27bda1cf52bde2872e6d7b2f6f08
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 67e78c3f8..b26eb7a9c 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -665,6 +665,7 @@ var zenMissingKeyboardShortcutL10n = {
   key_gotoHistory: "zen-key-goto-history",
 
   goHome: "zen-key-go-home",
+  key_redo: "zen-key-redo",
 }  
 
 var gZenCKSSettings = {
@@ -728,9 +729,9 @@ var gZenCKSSettings = {
       
       let fragment = window.MozXULElement.parseXULToFragment(`
         <hbox class="${ZEN_CKS_CLASS_BASE}">
-          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${action}"></label>
+          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${keyID}"></label>
           <vbox flex="1">
-            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${action}" />
+            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${keyID}" />
           </vbox>
         </hbox>
       `);
@@ -841,6 +842,7 @@ var gZenCKSSettings = {
         if (!input.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`)) {
           input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
         }
+        input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
         if (hasConflicts && !input.nextElementSibling) {
           input.after(window.MozXULElement.parseXULToFragment(`
             <label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>