diff --git a/res/app/settings/adb-keys/adb-keys-controller.js b/res/app/settings/adb-keys/adb-keys-controller.js
index 167c239f..1f73229b 100644
--- a/res/app/settings/adb-keys/adb-keys-controller.js
+++ b/res/app/settings/adb-keys/adb-keys-controller.js
@@ -50,7 +50,7 @@ module.exports = function AdbKeysCtrl($scope, BrowserInfo) {
 
   $scope.toggleAddKey = function () {
     $scope.showAdd = !$scope.showAdd
-    $scope.focusAddTitle = true
+    $scope.focusAddField = true
   }
 
 
diff --git a/res/app/settings/adb-keys/adb-keys.css b/res/app/settings/adb-keys/adb-keys.css
index 5c119c4d..fcff57a1 100644
--- a/res/app/settings/adb-keys/adb-keys.css
+++ b/res/app/settings/adb-keys/adb-keys.css
@@ -30,3 +30,23 @@
   display: inline-block;
 }
 
+.animate-repeat.ng-move,
+.animate-repeat.ng-enter,
+.animate-repeat.ng-leave {
+  -webkit-transition: all ease-out 150ms;
+  transition: all ease-out 150ms;
+}
+
+.animate-repeat.ng-leave.ng-leave-active,
+.animate-repeat.ng-move,
+.animate-repeat.ng-enter {
+  opacity: 0;
+  max-height: 0;
+}
+
+.animate-repeat.ng-leave,
+.animate-repeat.ng-move.ng-move-active,
+.animate-repeat.ng-enter.ng-enter-active {
+  opacity: 1;
+  max-height: 100px;
+}
diff --git a/res/app/settings/adb-keys/adb-keys.jade b/res/app/settings/adb-keys/adb-keys.jade
index 3b25e1d7..453e9098 100644
--- a/res/app/settings/adb-keys/adb-keys.jade
+++ b/res/app/settings/adb-keys/adb-keys.jade
@@ -5,12 +5,11 @@
         i.fa.fa-android
         span(translate) ADB Keys
 
-        button.btn.btn-primary-outline.pull-right.btn-sm(
+        button.btn.pull-right.btn-sm(
         ng-click='toggleAddKey()',
-        ng-class='')
+        ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }')
           //(tooltip='{{ "Add ADB Key" | translate }}')
           i.fa.fa-plus.fa-fw
-          //span(translate) Add
 
       .widget-content.padded
 
@@ -29,11 +28,13 @@
                 label.control-label.col-md-1(translate) Title
                 .col-md-11
                   input(type='text', ng-model='title', ng-required='true',
-                  text-focus-select, focus-element='focusAddTitle').form-control
+                  text-focus-select).form-control
               .form-group
                 label.control-label.col-md-1(translate) Key
                 .col-md-11
-                  textarea(rows='4', ng-model='key', ng-required='true').form-control
+                  textarea(rows='4', ng-model='key', ng-required='true',
+                  autocorrect='off', autocapitalize='off', spellcheck='false',
+                  focus-element='focusAddField').form-control
 
               .alert.alert-warning.selectable This key can be obtained by doing: ...
 
@@ -44,7 +45,7 @@
                 span(translate) Add Key
 
         ul.list-group.key-list
-          li.list-group-item(ng-repeat='key in adbKeys')
+          li.list-group-item(ng-repeat='key in adbKeys').animate-repeat
             a
               i.fa.fa-key.fa-2x.fa-fw.key-list-icon
               .key-list-details.selectable
diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.jade
index 9820c220..1f4f9338 100644
--- a/res/app/settings/settings.jade
+++ b/res/app/settings/settings.jade
@@ -2,52 +2,3 @@ div(pane='center', ng-controller='SettingsCtrl')
   br
   .widget-container.fluid-height
     nice-tabs(key='SettingsTabs', tabs='settingTabs', filter='')
-    //.heading-for-tabs.tabs
-      tabset
-        tab
-          tab-heading
-            i.fa.fa-gears
-            span(translate) General
-          div
-            .row
-              .col-md-6
-                div(ng-include='"settings/local/local-settings.jade"')
-              .col-md-6
-                div(ng-include='"settings/language/language.jade"')
-        tab
-          tab-heading
-            i.fa.fa-key
-            span(translate) ADB Keys
-          .widget-container.fluid-height
-            p Some big content
-            h1 More
-
-
-
-
-
-
-  br
-  .row
-    //.col-md-6
-      div(ng-include='"settings/local/local-settings.jade"')
-    //.col-md-6
-      div(ng-include='"settings/language/language.jade"')
-    //.col-md-4
-      div(ng-include='"settings/notifications/notifications.jade"')
-
-    .col-sm-12
-      //tabset(vertical='true', type='pills')
-
-
-
-
-    //.col-sm-2
-      ul.list-group
-        li.list-group-item
-          a(ng-href='') General
-        li.list-group-item
-          a(ng-href='') ADB Keys
-    //.col-sm-10
-      .widget-container
-        p SOME