diff --git a/app/users/controllers/user-accounts-controller.html b/app/users/controllers/user-accounts-controller.html
index f5bdda0..f9ff260 100644
--- a/app/users/controllers/user-accounts-controller.html
+++ b/app/users/controllers/user-accounts-controller.html
@@ -20,7 +20,7 @@
         </div>
       </div>
       <div class="acnt-prop__submit-wrapper">
-          <button type="button" class="btn-primary inline" ng-click="saveAllValues()">Save settings</button>
+          <button type="button" class="btn  btn-primary" ng-click="saveAllValues()">Save settings</button>
       </div>
     </form>
   </div>
@@ -45,8 +45,8 @@
         <div class="table__cell"> {{user.RoleId}} </div>
         <div class="table__cell"> {{user.Locked}} </div>
         <div class="table__cell">
-          <button type="button" class="btn-edit inline" ng-disabled="isUserSelected" ng-click="setSelectedUser(user)">Edit</button>
-          <button type="button" class="btn-delete inline" ng-disabled="isUserSelected" ng-click="deleteUser(user.UserName)">Delete</button>
+          <button type="button" class="btn  btn-primary" ng-disabled="isUserSelected" ng-click="setSelectedUser(user)">Edit</button>
+          <button type="button" class="btn btn-primary" ng-disabled="isUserSelected" ng-click="deleteUser(user.UserName)">Delete</button>
         </div>
       </div>
     </div>
@@ -120,9 +120,9 @@
           </div>
         </div>
         <div class="user-manage__submit-wrapper">
-            <button type="button" ng-click="submitted=true; user__form.$valid && createNewUser(); user__form.$setUntouched()" ng-show="!isUserSelected" class="btn-primary inline">Create user</button>
-            <button type="button" class="btn-primary inline" ng-click="submitted=true; user__form.$valid && updateUserInfo(); user__form.$setUntouched()" ng-show="isUserSelected">Save</button>
-            <button type="button" class="btn-primary inline" ng-if="isUserSelected" ng-click="cancel()">Cancel</button>
+            <button type="button" ng-click="submitted=true; user__form.$valid && createNewUser(); user__form.$setUntouched()" ng-show="!isUserSelected" class="btn btn-primary">Create user</button>
+            <button type="button" class="btn  btn-primary" ng-click="submitted=true; user__form.$valid && updateUserInfo(); user__form.$setUntouched()" ng-show="isUserSelected">Save</button>
+            <button type="button" class="btn  btn-primary" ng-if="isUserSelected" ng-click="cancel()">Cancel</button>
         </div>
     </section>
   </form>
diff --git a/app/users/styles/user-accounts.scss b/app/users/styles/user-accounts.scss
index 869b68b..f49d47c 100644
--- a/app/users/styles/user-accounts.scss
+++ b/app/users/styles/user-accounts.scss
@@ -1,22 +1,3 @@
-.user-list__tbl {
-  .btn-edit,
-  .btn-delete {
-    padding: .5em 1em;
-    min-height: 2em;
-    color: $primebtn__text;
-    background: $primebtn__bg;
-    &:hover {
-      background: rgba($primebtn__bg, .8);
-      @include fastTransition-all;
-    }
-    &:disabled {
-      background: $btn__disabled-bg;
-      color: $btn__disabled-txt;
-      @include fastTransition-all;
-      cursor: default;
-    }
-  }
-}
 .acnt-prop-header {
   width: 100%;
   border-bottom: 2px solid #b8c1c1;
@@ -58,10 +39,9 @@
   }
   .password-toggle {
     position: absolute;
-    right: 5px;
+    right: 20px;
     top: .6em;
     padding: 3px;
-    margin-right: 20px;
     color: $primebtn__bg;
     font-size: .8em;
   }
@@ -76,8 +56,7 @@
       margin: .5em;
     }
   }
-  .user-manage__error
-  {
+  .user-manage__error {
     background: lighten($error-color, 20%);
     padding: 1em;
     text-align: center;
@@ -87,8 +66,7 @@
     font-family: "Courier New", Helvetica, Arial, sans-serif;
     font-weight: 700;
   }
-  .user-manage__success
-  {
+  .user-manage__success {
     color: $primebtn__bg;
     padding: 1em;
     font-size: 1em;