diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass
index 8411fbfa..d14b8bf2 100644
--- a/app/styles/app/layouts/settings.sass
+++ b/app/styles/app/layouts/settings.sass
@@ -194,6 +194,7 @@ $input-main-height: 30px
   width: grid-calc(3, 12)
   text-align: right
   white-space: nowrap
+  overflow: hidden
   .icon-fingerprint
     @extend %icon
     @extend .icon-fingerprint
@@ -258,7 +259,7 @@ $input-main-height: 30px
     display: inline-block
     height: 32px
     width: 100%
-    padding: .2em .4em
+    padding: .4em .4em
     border: 1px solid #eeedec
     border-radius: 4px
     color: #8e8f8e
@@ -268,6 +269,7 @@ $input-main-height: 30px
     padding: .5em .8em
     color: $white
     font-size: $font-size-sm
+    font-weight: 300
     &:hover
       background-color: #3BA85D
       cursor: pointer
@@ -279,3 +281,37 @@ $input-main-height: 30px
       font-size: 12px
       line-height: 1.3
 
+.form--sshkey
+
+  .form-elem
+    margin-bottom: .5rem
+  @media #{$medium-up}
+    .form-elem
+      max-width: 460px
+
+  input
+    display: inline-block
+    height: 32px
+    width: 100%
+    padding: .4em .4em
+    border: 1px solid #eeedec
+    border-radius: 4px
+    color: #8e8f8e
+    font-size: $font-size-sm
+  textarea
+    display: inline-block
+    width: 100%
+    padding: .2em .4em
+    border: 1px solid #eeedec
+    border-radius: 4px
+    color: #8e8f8e
+    font-size: $font-size-sm
+  .form-submit
+    padding: .5em .8em
+    color: $white
+    font-size: $font-size-sm
+    font-weight: 300
+    width: auto
+    &:hover
+      background-color: #3BA85D
+
diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass
index 4caac525..cbd9e47a 100644
--- a/app/styles/app/modules/buttons.sass
+++ b/app/styles/app/modules/buttons.sass
@@ -4,24 +4,22 @@
 
 $button-border-color: #d4d4d4
 
-.button
+.button,
+.btn
   font-family: $font-family-sans-serif
-  font-size: $font-size-tiny
-  font-weight: normal
   position: relative
   overflow: visible
   display: inline-block
   padding: 5px 10px
-  border: 1px solid $button-border-color
-  margin: 0
-  background-color: #E9E9E7
-  background-clip: padding-box
   cursor: pointer
   outline: none
   text-decoration: none
   text-align: center
-  color: $gray-dark-3
+  color: $white
   white-space: nowrap
+  background-color: #C2C3C5
+  border-radius: 4px
+  font-weight: 300
 
 .button:hover,
 .button:focus,
@@ -84,9 +82,6 @@ $button-border-color: #d4d4d4
     position: relative
     top: -0.15em
 
-.btn
-  @extend .button
-  @extend %border-radius-4px
 .button--green
   border: none
   font-size: $font-size-small
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index 52b1192a..eea5133b 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -60,7 +60,7 @@
           <textarea name="" id="" cols="30" rows="10" placeholder="SSH key"></textarea>
         </div>
         <div class="form-elem">
-          <input type="submit" class="form-action">
+          <input type="submit" class="form-submit" value="Add">
         </div>
       </form>
     </div>