diff --git a/src/popup/app/vault/views/vaultAddLogin.html b/src/popup/app/vault/views/vaultAddLogin.html
index 50bb28b0..c6ae5c2b 100644
--- a/src/popup/app/vault/views/vaultAddLogin.html
+++ b/src/popup/app/vault/views/vaultAddLogin.html
@@ -36,14 +36,14 @@
                         {{i18n.generatePassword}}
                         <i class="fa fa-chevron-right"></i>
                     </a>
-                    <div class="list-section-item">
-                        <label for="totp" class="item-label">{{i18n.authenticatorKeyTotp}}</label>
-                        <input id="totp" type="text" name="Totp" ng-model="login.totp">
-                    </div>
                 </div>
             </div>
             <div class="list-section">
                 <div class="list-section-items">
+                    <div class="list-section-item">
+                        <label for="totp" class="item-label">{{i18n.authenticatorKeyTotp}}</label>
+                        <input id="totp" type="text" name="Totp" ng-model="login.totp">
+                    </div>
                     <div class="list-section-item">
                         <label for="folder" class="item-label">{{i18n.folder}}</label>
                         <select id="folder" name="FolderId" ng-model="login.folderId">
diff --git a/src/popup/app/vault/views/vaultEditLogin.html b/src/popup/app/vault/views/vaultEditLogin.html
index adbb3979..eae88860 100644
--- a/src/popup/app/vault/views/vaultEditLogin.html
+++ b/src/popup/app/vault/views/vaultEditLogin.html
@@ -37,14 +37,14 @@
                         {{i18n.generatePassword}}
                         <i class="fa fa-chevron-right"></i>
                     </a>
-                    <div class="list-section-item">
-                        <label for="totp" class="item-label">{{i18n.authenticatorKeyTotp}}</label>
-                        <input id="totp" type="text" name="Totp" ng-model="login.totp">
-                    </div>
                 </div>
             </div>
             <div class="list-section">
                 <div class="list-section-items">
+                    <div class="list-section-item">
+                        <label for="totp" class="item-label">{{i18n.authenticatorKeyTotp}}</label>
+                        <input id="totp" type="text" name="Totp" ng-model="login.totp">
+                    </div>
                     <div class="list-section-item">
                         <label for="folder" class="item-label">{{i18n.folder}}</label>
                         <select id="folder" name="FolderId" ng-model="login.folderId">
diff --git a/src/popup/app/vault/views/vaultViewLogin.html b/src/popup/app/vault/views/vaultViewLogin.html
index 417c7581..a9999fe1 100644
--- a/src/popup/app/vault/views/vaultViewLogin.html
+++ b/src/popup/app/vault/views/vaultViewLogin.html
@@ -85,8 +85,8 @@
                    ng-repeat="attachment in login.attachments"
                    ng-click="download(attachment)">
                     {{attachment.fileName}}
-                    <i class="fa fa-spin fa-spinner text-muted" ng-if="attachment.downloading"></i>
-                    <i class="fa fa-chevron-right"></i>
+                    <i class="fa fa-download right-icon fa-fw no-animation" ng-if="!attachment.downloading"></i>
+                    <i class="fa fa-spin fa-spinner right-icon fa-fw no-animation" ng-if="attachment.downloading"></i>
                     <small class="item-sub-label">{{attachment.sizeName}}</small>
                 </a>
             </div>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index cbb5a675..7ef13d91 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -342,7 +342,7 @@
             }
         }
 
-        .fa-chevron-right {
+        .fa-chevron-right, .right-icon {
             float: right;
             margin-top: 4px;
             color: @list-icon-color;
@@ -461,6 +461,12 @@
     }
 }
 
+.no-animation {
+    &.ng-hide.ng-hide-animate, &.ng-leave {
+        display: none !important;
+    }
+}
+
 .btn {
     border-radius: 0;
     -webkit-border-radius: 0;