diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index bb937808..7d58ef14 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -79,13 +79,18 @@
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.message') }}</label>
                             <textarea name="incident[message]" class="form-control" rows="5" required>{{ Input::old('incident.message') }}</textarea>
-                            <span class="help-block">{{ trans('forms.incidents.message-help') }}</span>
+                            <span class="help-block"><i class='icons ion-social-markdown'></i> {{ trans('forms.incidents.message-help') }}</span>
                         </div>
                     </fieldset>
 
                     <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}">
-                    <button type="submit" class="btn btn-success">{{ trans('forms.add') }}</button>
-                    <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
+
+                    <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.incidents') }}">{{ trans('forms.cancel') }}</a>
+                        </div>
+                    </div>
                 {{ Form::close() }}
             </div>
         </div>
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php
index 52d68d0c..5d86cc64 100644
--- a/app/views/dashboard/incidents/edit.blade.php
+++ b/app/views/dashboard/incidents/edit.blade.php
@@ -15,69 +15,74 @@
             <div class="col-md-12">
                 @include('partials.dashboard.errors')
                 {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
-                <fieldset>
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
-                        <input type="text" class="form-control" name="incident[name]" id="incident-name" required value={{$incident->name}} />
-                    </div>
-                    <div class="form-group">
-                        <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
-                        <label class="radio-inline">
-                            <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} />
-                            <i class="icon ion-flag"></i>
-                            {{ trans('cachet.incidents.status')[1] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/>
-                            <i class="icon ion-alert-circled"></i>
-                            {{ trans('cachet.incidents.status')[2] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/>
-                            <i class="icon ion-eye"></i>
-                            {{ trans('cachet.incidents.status')[3] }}
-                        </label>
-                        <label class="radio-inline">
-                            <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/>
-                            <i class="icon ion-checkmark"></i>
-                            {{ trans('cachet.incidents.status')[4] }}
-                        </label>
-                    </div>
-                    <div class='form-group'>
-                        <label>{{ trans('forms.incidents.component') }}</label>
-                        <select name='incident[component_id]' class='form-control'>
-                            <option value='0' {{ $incident->id === 0 ? "selected" : null }}></option>
-                            @foreach($components as $component)
-                            <option value='{{ $component->id }}' {{ $incident->component_id === $component->id ? "selected" : null }}>{{ $component->name }}</option>
-                            @endforeach
-                        </select>
-                        <span class='help-block'>{{ trans('forms.optional') }}</span>
-                    </div>
-                    <div class="form-group {{ $incident->component_id === 0 ? 'hidden' : null }}" id='component-status'>
-                        <div class="well">
-                            <div class="radio-items">
-                                @foreach(trans('cachet.components.status') as $statusID => $status)
-                                <div class="radio-inline">
-                                    <label>
-                                        <input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component_id > 0 && $incident->component->status === $statusID ? 'checked' : null }} />
-                                        {{ $status }}
-                                    </label>
-                                </div>
+                    <fieldset>
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.name') }}</label>
+                            <input type="text" class="form-control" name="incident[name]" id="incident-name" required value={{$incident->name}} />
+                        </div>
+                        <div class="form-group">
+                            <label for="incident-name">{{ trans('forms.incidents.status') }}</label><br />
+                            <label class="radio-inline">
+                                <input type="radio" name="incident[status]" value="1" {{ ($incident->status == 1) ? "checked=checked" : "" }} />
+                                <i class="icon ion-flag"></i>
+                                {{ trans('cachet.incidents.status')[1] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="incident[status]" value="2" {{ ($incident->status == 2) ? "checked=checked" : "" }}/>
+                                <i class="icon ion-alert-circled"></i>
+                                {{ trans('cachet.incidents.status')[2] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="incident[status]" value="3" {{ ($incident->status == 3) ? "checked=checked" : "" }}/>
+                                <i class="icon ion-eye"></i>
+                                {{ trans('cachet.incidents.status')[3] }}
+                            </label>
+                            <label class="radio-inline">
+                                <input type="radio" name="incident[status]" value="4" {{ ($incident->status == 4) ? "checked=checked" : "" }}/>
+                                <i class="icon ion-checkmark"></i>
+                                {{ trans('cachet.incidents.status')[4] }}
+                            </label>
+                        </div>
+                        <div class='form-group'>
+                            <label>{{ trans('forms.incidents.component') }}</label>
+                            <select name='incident[component_id]' class='form-control'>
+                                <option value='0' {{ $incident->id === 0 ? "selected" : null }}></option>
+                                @foreach($components as $component)
+                                <option value='{{ $component->id }}' {{ $incident->component_id === $component->id ? "selected" : null }}>{{ $component->name }}</option>
                                 @endforeach
+                            </select>
+                            <span class='help-block'>{{ trans('forms.optional') }}</span>
+                        </div>
+                        <div class="form-group {{ $incident->component_id === 0 ? 'hidden' : null }}" id='component-status'>
+                            <div class="well">
+                                <div class="radio-items">
+                                    @foreach(trans('cachet.components.status') as $statusID => $status)
+                                    <div class="radio-inline">
+                                        <label>
+                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component_id > 0 && $incident->component->status === $statusID ? 'checked' : null }} />
+                                            {{ $status }}
+                                        </label>
+                                    </div>
+                                    @endforeach
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label>{{ trans('forms.incidents.message') }}</label>
-                        <textarea name="incident[message]" class="form-control" rows="5" required>{{ $incident->message }}</textarea>
-                        <span class="help-block">{{ trans('forms.incidents.message-help') }}</span>
-                    </div>
-                </fieldset>
+                        <div class="form-group">
+                            <label>{{ trans('forms.incidents.message') }}</label>
+                            <textarea name="incident[message]" class="form-control" rows="5" required>{{ $incident->message }}</textarea>
+                            <span class="help-block"><i class='icons ion-social-markdown'></i> {{ trans('forms.incidents.message-help') }}</span>
+                        </div>
+                    </fieldset>
 
-                <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
-                <input type="hidden" name="incident[id]" value={{$incident->id}} />
-                <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
+                    <input type="hidden" name="incident[user_id]" value="{{ Auth::user()->id }}" />
+                    <input type="hidden" name="incident[id]" value={{$incident->id}} />
+
+                    <div class='form-group'>
+                        <div class='btn-group'>
+                            <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
+                            <a class="btn btn-default" href="{{ route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
+                        </div>
+                    </div>
                 {{ Form::close() }}
             </div>
         </div>