diff --git a/admin/manage_users.php b/admin/manage_users.php
index 676ed631..07a7b555 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -277,11 +277,11 @@ if ($action = hesk_REQUEST('a')) {
 
                     /* To edit yourself go to "Profile" page, not here. */
                     if ($myuser['id'] == $_SESSION['id']) {
-                        $edit_code = '<a href="profile.php"><i class="fa fa-pencil icon-link" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
+                        $edit_code = '<a href="profile.php"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
                     } elseif ($myuser['id'] == 1) {
                         $edit_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
                     } else {
-                        $edit_code = '<a href="manage_users.php?a=edit&amp;id=' . $myuser['id'] . '"><i class="fa fa-pencil icon-link" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
+                        $edit_code = '<a href="manage_users.php?a=edit&amp;id=' . $myuser['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['edit'] . '"></i></a>';
                     }
 
                     if ($myuser['isadmin']) {
@@ -535,7 +535,6 @@ function new_user()
         `notify_note`,
         `notify_note_unassigned`,
         `notify_overdue_unassigned`,
-        `autorefresh`,
         `permission_template`,
         `default_calendar_view`) VALUES (
 	'" . hesk_dbEscape($myuser['user']) . "',
@@ -562,7 +561,6 @@ function new_user()
 	'" . ($myuser['notify_note']) . "',
 	'" . ($myuser['notify_note_unassigned']) . "',
 	'" . ($myuser['notify_overdue_unassigned']) . "',
-	" . intval($myuser['autorefresh']) . ",
 	" . intval($myuser['template']) . ",
 	" . intval($myuser['default_calendar_view']) . ")");
 
@@ -689,7 +687,6 @@ function update_user()
 	`notify_note`='" . ($myuser['notify_note']) . "',
 	`notify_note_unassigned`='" . ($myuser['notify_note_unassigned']) . "',
 	`notify_overdue_unassigned`='" . ($myuser['notify_overdue_unassigned']) . "',
-	`autorefresh`=" . intval($myuser['autorefresh']) . ",
 	`permission_template`=" . intval($myuser['template']) . ",
 	`default_calendar_view`=" . intval($myuser['default_calendar_view']) . "
     WHERE `id`='" . intval($myuser['id']) . "'");
@@ -785,7 +782,6 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
     if ($myuser['afterreply'] != 1 && $myuser['afterreply'] != 2) {
         $myuser['afterreply'] = 0;
     }
-    $myuser['autorefresh'] = intval(hesk_POST('autorefresh'));
 
     // Defaults
     $myuser['autostart'] = isset($_POST['autostart']) ? 1 : 0;
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
index 1fefd2a9..ded81bee 100644
--- a/inc/profile_functions.inc.php
+++ b/inc/profile_functions.inc.php
@@ -316,12 +316,14 @@ function hesk_profile_tab($session_array = 'new', $is_profile_page = true, $acti
                                 }
                             }
                             ?>
-                            <label><input type="checkbox" name="autoreload" value="1" <?php if (!empty($_SESSION[$session_array]['autoreload'])) {echo 'checked="checked"';}?> /> <?php echo $hesklang['arpp']; ?></label>
-                            <input type="text" name="reload_time" value="<?php echo $reload_time; ?>" size="5" maxlength="5" onkeyup="this.value=this.value.replace(/[^\d]+/,'')" />
-                            <select name="secmin">
-                                <option value="sec" <?php echo $sec; ?>><?php echo $hesklang['seconds']; ?></option>
-                                <option value="min" <?php echo $min; ?>><?php echo $hesklang['minutes']; ?></option>
-                            </select>
+                            <div class="checkbox form-inline">
+                                <label><input type="checkbox" name="autoreload" value="1" <?php if (!empty($_SESSION[$session_array]['autoreload'])) {echo 'checked="checked"';}?> /> <?php echo $hesklang['arpp']; ?></label>
+                                <input type="text" class="form-control" name="reload_time" value="<?php echo $reload_time; ?>" size="5" maxlength="5" onkeyup="this.value=this.value.replace(/[^\d]+/,'')" />
+                                <select name="secmin" class="form-control">
+                                    <option value="sec" <?php echo $sec; ?>><?php echo $hesklang['seconds']; ?></option>
+                                    <option value="min" <?php echo $min; ?>><?php echo $hesklang['minutes']; ?></option>
+                                </select>
+                            </div>
                             <div class="checkbox">
                                 <label><input type="checkbox" name="notify_customer_new"
                                               value="1" <?php if (!empty($_SESSION[$session_array]['notify_customer_new'])) {
@@ -361,17 +363,6 @@ function hesk_profile_tab($session_array = 'new', $is_profile_page = true, $acti
                         </select>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="autoRefresh"
-                           class="col-sm-3 control-label"><?php echo $hesklang['ticket_auto_refresh']; ?></label>
-
-                    <div class="col-sm-9">
-                        <input type="text" class="form-control" id="autorefresh" name="autorefresh"
-                               placeholder="<?php echo htmlspecialchars($hesklang['ticket_auto_refresh']); ?>"
-                               value="<?php echo $_SESSION[$session_array]['autorefresh']; ?>">
-                        <span class="help-block"><?php echo $hesklang['autorefresh_restrictions']; ?></span>
-                    </div>
-                </div>
             </div>
             <div role="tabpanel" class="tab-pane fade" id="notifications">
                 <?php $disabledText =