diff --git a/app/components/sortable-table/template.hbs b/app/components/sortable-table/template.hbs
index 07098f51a..ae89d27a2 100644
--- a/app/components/sortable-table/template.hbs
+++ b/app/components/sortable-table/template.hbs
@@ -35,7 +35,7 @@
         <div class="col span-4 clearfix">
           {{#if search}}
             <div class="pull-right input-group">
-              {{input value=searchText type="search" class="input-sm" placeholder=(t 'generic.search')}}
+              {{input value=searchText type="search" class="input-sm pull-right" placeholder=(t 'generic.search')}}
               {{#if searchText}}
                 <span class="input-group-btn">
                   <button class="btn bg-primary" {{action 'clearSearch'}}><i class="icon icon-close"/></button>
diff --git a/app/styles/components/_badge-state.scss b/app/styles/components/_badge-state.scss
index 20525fc37..9c55fa6c2 100644
--- a/app/styles/components/_badge-state.scss
+++ b/app/styles/components/_badge-state.scss
@@ -13,6 +13,12 @@
   &.text-success:hover {
     color: $success;
   }
+
+  i {
+    height: 17px;
+    line-height: 14px;
+    vertical-align: middle;
+  }
 }
 
 .grid TD.state {
diff --git a/app/styles/components/_forms.scss b/app/styles/components/_forms.scss
index 669088c2a..493022c46 100644
--- a/app/styles/components/_forms.scss
+++ b/app/styles/components/_forms.scss
@@ -56,7 +56,7 @@ textarea {
     padding: 5px 10px;
     font-size: 15px;
     transition: all ease-in-out .3s;
-    width: 100%;
+    // width: 100%;
 
     &[size] {
       display: inline-block;