diff --git a/src/LessPass.scss b/src/LessPass.scss
index a48873f..b415b43 100644
--- a/src/LessPass.scss
+++ b/src/LessPass.scss
@@ -32,7 +32,6 @@
 //@import "~bootstrap/scss/popover";
 //@import "~bootstrap/scss/carousel";
 @import "~bootstrap/scss/utilities";
-
 @import '~font-awesome/css/font-awesome.css';
 @import '~hint.css/hint.css';
 @import '~awesomplete/awesomplete.css';
@@ -48,14 +47,20 @@
 #lesspass {
   color: #464646;
   max-width: 420px;
+  border: none;
+
+  .card-header {
+    border-bottom: none;
+  }
 }
 
 .lesspass__inner-box {
   min-height: 240px;
+  border: $card-border-width solid $card-border-color;
 }
 
 @media (max-width: 419px) {
-  #lesspass {
+  .lesspass__inner-box {
     border: none;
   }
 }
@@ -95,6 +100,6 @@ button, .pointer {
   padding-right: 30px;
 }
 
-.border-blue{
+.border-blue {
   border-color: $blue !important;
 }
diff --git a/src/components/Options.vue b/src/components/Options.vue
index d83d45a..4480d70 100644
--- a/src/components/Options.vue
+++ b/src/components/Options.vue
@@ -55,12 +55,12 @@
       </div>
     </div>
     <div class="form-group row mb-0">
-      <div class="col-6 col-sm-4">
+      <div class="col-5 col-sm-4">
         <label for="passwordLength">{{ $t('Length') }}</label>
         <div class="input-group input-group-sm">
           <span class="input-group-btn" v-on:click="password.length=decrement(password.length, {min: 5, max: 35})">
             <button id="decreaseLength__btn" class="btn btn-primary border-blue px-2" type="button">
-              <i class="fa fa-minus"></i>
+              <small><i class="fa fa-minus"></i></small>
             </button>
           </span>
           <input id="passwordLength"
@@ -72,12 +72,12 @@
           <span class="input-group-btn"
                 v-on:click="password.length=increment(password.length, {min: 5, max: 35})">
             <button id="increaseLength__btn" class="btn btn-primary border-blue px-2" type="button">
-              <i class="fa fa-plus"></i>
+              <small><i class="fa fa-plus"></i></small>
             </button>
           </span>
         </div>
       </div>
-      <div class="col-6 col-sm-4">
+      <div class="col-5 col-sm-4">
         <label for="passwordCounter"
                class="hint--top hint--medium"
                v-bind:aria-label="$t('CounterFieldHelp','Increment this value to change the generated password without changing your master options.')">
@@ -87,7 +87,7 @@
           <span id="decreaseCounter__btn" class="input-group-btn"
                 v-on:click="password.counter=decrement(password.counter, {min: 1})">
               <button class="btn btn-primary border-blue px-2" type="button">
-              <i class="fa fa-minus"></i>
+              <small><i class="fa fa-minus"></i></small>
             </button>
           </span>
           <input id="passwordCounter"
@@ -98,7 +98,7 @@
           <span id="increaseCounter__btn" class="input-group-btn"
                 v-on:click="password.counter=increment(password.counter, {min: 1})">
             <button class="btn btn-primary border-blue px-2" type="button">
-              <i class="fa fa-plus"></i>
+              <small><i class="fa fa-plus"></i></small>
             </button>
           </span>
         </div>