diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php
index 04e29068..00ae977c 100644
--- a/app/views/dashboard/components/add.blade.php
+++ b/app/views/dashboard/components/add.blade.php
@@ -60,7 +60,7 @@
                     <input type="hidden" name="component[user_id]" value="{{ $loggedUser->id }}">
                     <input type="hidden" name="component[order]" value="0">
 
-                    <div class="form-group">
+                    <div class="btn-group">
                         <button type="submit" class="btn btn-success">{{ trans('forms.create') }}</button>
                         <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
                     </div>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index a72953a1..d0ce2c0e 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -60,8 +60,8 @@
                     <input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $loggedUser->id }}">
                     <input type="hidden" name="component[order]" value="{{ $component->order or 0 }}">
 
-                    <div class="form-group">
-                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                    <div class="btn-group">
+                        <button type="submit" class="btn btn-success">{{ trans('forms.save') }}</button>
                         <a class="btn btn-default" href="{{ route('dashboard.components') }}">{{ trans('forms.cancel') }}</a>
                     </div>
                 </form>
diff --git a/app/views/dashboard/components/groups/add.blade.php b/app/views/dashboard/components/groups/add.blade.php
index 1b636b85..e71f4782 100644
--- a/app/views/dashboard/components/groups/add.blade.php
+++ b/app/views/dashboard/components/groups/add.blade.php
@@ -23,7 +23,7 @@
                         </div>
                     </fieldset>
 
-                    <div class="form-group">
+                    <div class="btn-group">
                         <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
                         <a class="btn btn-default" href="{{ route('dashboard.components.groups') }}">{{ trans('forms.cancel') }}</a>
                     </div>
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index 27e30e88..0077e051 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -30,7 +30,10 @@
                         <hr>
                         <div class="form-group">
                             <label>{{ trans('forms.user.api-token') }}</label>
-                            <input type="text" class="form-control" name="api_key" disabled value="{{ $loggedUser->api_key }}">
+                            <div class="input-group">
+                                <input type="text" class="form-control" name="api_key" disabled value="{{ $loggedUser->api_key }}">
+                                <a href="/dashboard/user/{{ $loggedUser->id }}/api/regen" class="input-group-addon btn btn-danger">{{ trans('cachet.api.regenerate') }}</a>
+                            </div>
                             <span class="help-block">{{ trans('forms.user.api-token-help') }}</span>
                         </div>
                         <hr>
@@ -56,10 +59,7 @@
                         @endif
                     </fieldset>
 
-                    <div class="form-group">
-                        <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                        <a href="/dashboard/user/{{ $loggedUser->id }}/api/regen" class="btn btn-warning">{{ trans('cachet.api.regenerate') }}</a>
-                    </div>
+                    <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                 </form>
             </div>
         </div>