diff --git a/app/assets/sass/modules/_forms.scss b/app/assets/sass/modules/_forms.scss
index cd24f687..efa5abda 100644
--- a/app/assets/sass/modules/_forms.scss
+++ b/app/assets/sass/modules/_forms.scss
@@ -7,6 +7,22 @@ textarea {
     overflow: auto;
 }
 
+.markdown-control {
+    position: relative;
+
+    &:before {
+        position:absolute;
+        display:block;
+        right:0%;
+        bottom:0%;
+        width:40px;
+        height:40px;
+        font-size: 2em;
+        font-family: "Ionicons";
+        content: "\f4e6";
+    }
+}
+
 .form-control {
     display: block;
     width: 100%;
diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php
index cdd57734..8f2a10ef 100644
--- a/app/views/dashboard/incidents/add.blade.php
+++ b/app/views/dashboard/incidents/add.blade.php
@@ -78,8 +78,9 @@
                         </div>
                         <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"><i class='icons ion-social-markdown'></i> {{ trans('forms.incidents.message-help') }}</span>
+                            <div class='markdown-control'>
+                                <textarea name="incident[message]" class="form-control" rows="5" required>{{ Input::old('incident.message') }}</textarea>
+                            </div>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php
index f9b7755f..5043129c 100644
--- a/app/views/dashboard/incidents/edit.blade.php
+++ b/app/views/dashboard/incidents/edit.blade.php
@@ -69,8 +69,9 @@
                         </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"><i class='icons ion-social-markdown'></i> {{ trans('forms.incidents.message-help') }}</span>
+                            <div class='markdown-control'>
+                                <textarea name="incident[message]" class="form-control" rows="5" required>{{ $incident->message }}</textarea>
+                            </div>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/incidents/templates/add.blade.php b/app/views/dashboard/incidents/templates/add.blade.php
index 2819f117..d8fca19c 100644
--- a/app/views/dashboard/incidents/templates/add.blade.php
+++ b/app/views/dashboard/incidents/templates/add.blade.php
@@ -22,7 +22,9 @@
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
-                            <textarea name="template[template]" class="form-control" rows="5" required></textarea>
+                            <div class='markdown-control'>
+                                <textarea name="template[template]" class="form-control" rows="5" required></textarea>
+                            </div>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/incidents/templates/edit.blade.php b/app/views/dashboard/incidents/templates/edit.blade.php
index c8ff8c28..5fa4c1a2 100644
--- a/app/views/dashboard/incidents/templates/edit.blade.php
+++ b/app/views/dashboard/incidents/templates/edit.blade.php
@@ -31,7 +31,9 @@
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.templates.template') }}</label>
-                            <textarea name="template[template]" class="form-control" rows="5" required>{{ $template->template }}</textarea>
+                            <div class='markdown-control'>
+                                <textarea name="template[template]" class="form-control" rows="5" required>{{ $template->template }}</textarea>
+                            </div>
                         </div>
                     </fieldset>
 
diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php
index bae2c0d8..2a286649 100644
--- a/app/views/dashboard/settings/app-setup.blade.php
+++ b/app/views/dashboard/settings/app-setup.blade.php
@@ -32,7 +32,9 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.about-this-page') }}</label>
-                                        <textarea name="app_about" class="form-control" rows="4">{{ Setting::get('app_about') }}</textarea>
+                                        <div class='markdown-control'>
+                                            <textarea name="app_about" class="form-control" rows="4">{{ Setting::get('app_about') }}</textarea>
+                                        </div>
                                     </div>
                                 </div>
                             </div>