diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index a2de6d6519..0f0ec997be 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -149,22 +149,15 @@ export default class KeyBackupPanel extends React.PureComponent {
         } else if (this.state.loading) {
             return <Spinner />;
         } else if (this.state.backupInfo) {
+            const EmojiText = sdk.getComponent('elements.EmojiText');
             let clientBackupStatus;
-            let buttons;
+            let restoreButtonCaption = _t("Restore from Backup");
 
             if (MatrixClientPeg.get().getKeyBackupEnabled()) {
                 clientBackupStatus = <div>
                     <p>{encryptedMessageAreEncrypted}</p>
-                    <p>{_t("This device is backing up your keys. ✅")}</p>
+                    <p>{_t("This device is backing up your keys. ")}<EmojiText>✅</EmojiText></p>
                 </div>;
-                buttons = <p>
-                    <AccessibleButton kind="primary" onClick={this._restoreBackup}>
-                        { _t("Restore from Backup") }
-                    </AccessibleButton>&nbsp;&nbsp;&nbsp;
-                    <AccessibleButton kind="danger" onClick={this._deleteBackup}>
-                        { _t("Delete Backup") }
-                    </AccessibleButton>
-                </p>;
             } else {
                 clientBackupStatus = <div>
                     <p>{encryptedMessageAreEncrypted}</p>
@@ -174,11 +167,7 @@ export default class KeyBackupPanel extends React.PureComponent {
                     )}</p>
                     <p>{_t("Back up your keys before signing out to avoid losing them.")}</p>
                 </div>;
-                buttons = <p>
-                    <AccessibleButton kind="primary" onClick={this._restoreBackup}>
-                        { _t("Use Key Backup") }
-                    </AccessibleButton>
-                </p>;
+                restoreButtonCaption = _t("Use key backup");
             }
 
             let uploadStatus;
@@ -267,7 +256,14 @@ export default class KeyBackupPanel extends React.PureComponent {
                     <div>{backupSigStatuses}</div>
                     <div>{trustedLocally}</div>
                 </details>
-                {buttons}
+                <p>
+                    <AccessibleButton kind="primary" onClick={this._restoreBackup}>
+                        {restoreButtonCaption}
+                    </AccessibleButton>&nbsp;&nbsp;&nbsp;
+                    <AccessibleButton kind="danger" onClick={this._deleteBackup}>
+                        { _t("Delete Backup") }
+                    </AccessibleButton>
+                </p>
             </div>;
         } else {
             return <div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a19b8e7cdf..8854019737 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -442,11 +442,11 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
     "Unable to load key backup status": "Unable to load key backup status",
-    "This device is backing up your keys. ✅": "This device is backing up your keys. ✅",
     "Restore from Backup": "Restore from Backup",
+    "This device is backing up your keys. ": "This device is backing up your keys. ",
     "This device is <b>not backing up your keys</b>.": "This device is <b>not backing up your keys</b>.",
     "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
-    "Use Key Backup": "Use Key Backup",
+    "Use key backup": "Use key backup",
     "Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
     "All keys backed up": "All keys backed up",
     "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.": "Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s.",
@@ -787,6 +787,7 @@
     "You are trying to access a room.": "You are trying to access a room.",
     "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
     "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
+    "Use Key Backup": "Use Key Backup",
     "Never lose encrypted messages": "Never lose encrypted messages",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
@@ -1173,6 +1174,7 @@
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
     "Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
     "Enter Recovery Passphrase": "Enter Recovery Passphrase",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Access your secure message history and set up secure messaging by entering your recovery passphrase.",
     "Next": "Next",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>",