diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 8ccfaea6..db11e3e2 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3372,6 +3372,27 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="show_number_merged" class="col-sm-4 control-label">
+                          <span class="label label-primary"
+                                data-toggle="tooltip"
+                                title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['highlight_ticket_rows_based_on_priority']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['highlight_ticket_rows_based_on_priority']; ?>"
+                           data-content="<?php echo $hesklang['highlight_ticket_rows_based_on_priority_help']; ?>"></i>
+                    </label>
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox"
+                                       name="highlight_ticket_rows_based_on_priority" <?php if ($modsForHesk_settings['highlight_ticket_rows_based_on_priority']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['highlight_ticket_rows_based_on_priority_descr']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group">
                     <label for="s_submittedformat" class="col-sm-4 control-label"><?php echo $hesklang['sdf']; ?> <a
                             href="Javascript:void(0)"
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index e52dd5a8..27855154 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -458,6 +458,7 @@ $set['use_bootstrap_theme'] = empty($_POST['use_bootstrap_theme']) ? 0 : 1;
 $set['new_kb_article_visibility'] = hesk_checkMinMax(intval(hesk_POST('new_kb_article_visibility')), 0, 2, 2);
 $set['mfh_attachments'] = empty($_POST['email_attachments']) ? 0 : 1;
 $set['show_number_merged'] = empty($_POST['show_number_merged']) ? 0 : 1;
+$set['highlight_ticket_rows_based_on_priority'] = empty($_POST['highlight_ticket_rows_based_on_priority']) ? 0 : 1;
 $set['request_location'] = empty($_POST['request_location']) ? 0 : 1;
 $set['category_order_column'] = empty($_POST['category_order_column']) ? 'cat_order' : 'name';
 
@@ -621,6 +622,7 @@ mfh_updateSetting('use_bootstrap_theme', $set['use_bootstrap_theme']);
 mfh_updateSetting('new_kb_article_visibility', $set['new_kb_article_visibility']);
 mfh_updateSetting('attachments', $set['mfh_attachments']);
 mfh_updateSetting('show_number_merged', $set['show_number_merged']);
+mfh_updateSetting('highlight_ticket_rows_based_on_priority', $set['highlight_ticket_rows_based_on_priority']);
 mfh_updateSetting('request_location', $set['request_location']);
 mfh_updateSetting('category_order_column', $set['category_order_column'], true);
 mfh_updateSetting('rich_text_for_tickets', $set['rich_text_for_tickets']);
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index 1e871e48..712c6797 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -238,9 +238,11 @@ if ($total > 0) {
                     break;
                 case 2:
                     $ticket['priority'] = '<span style="color: green; font-size:1.3em" class="fa fa-fw fa-angle-double-down" data-toggle="tooltip" data-placement="top" title="' . $hesklang['medium'] . '"></span>';
+                    $color = $modsForHesk_settings['highlight_ticket_rows_based_on_priority'] ? 'success' : '';
                     break;
                 default:
                     $ticket['priority'] = '<span style="color: blue; font-size:1.3em" class="fa fa-fw fa-long-arrow-down" data-toggle="tooltip" data-placement="top" title="' . $hesklang['low'] . '"></span>';
+                    $color = $modsForHesk_settings['highlight_ticket_rows_based_on_priority'] ? 'info' : '';
             }
 
             // Set message (needed for row title)
diff --git a/install/migrations/v330/AddHighlightTicketRowsSetting.php b/install/migrations/v330/AddHighlightTicketRowsSetting.php
new file mode 100644
index 00000000..192359a7
--- /dev/null
+++ b/install/migrations/v330/AddHighlightTicketRowsSetting.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace v330;
+
+class AddHighlightTicketRowsSetting extends \AbstractUpdatableMigration {
+
+    function innerUp($hesk_settings) {
+        $this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`)
+            VALUES ('highlight_ticket_rows_based_on_priority', '0')");
+    }
+
+    function innerDown($hesk_settings) {
+        $this->executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` 
+            WHERE `Key` = 'highlight_ticket_rows_based_on_priority'");
+    }
+}
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 8a621218..0de8b91c 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2235,6 +2235,9 @@ $hesklang['business_hours_help'] = 'Set business hours for the calendar. There i
 but times outside of the defined business hours will have a darker gray background for increased visibility.';
 $hesklang['show_event_start_time'] = 'Show event start time in title';
 $hesklang['show_event_start_time_help'] = 'Always show the start time on event titles (unless the event is an all-day event).';
+$hesklang['highlight_ticket_rows_based_on_priority'] = 'Highlight ticket rows based on priority';
+$hesklang['highlight_ticket_rows_based_on_priority_help'] = 'If enabled, each ticket on the tickets page will be highlighted based on priority. If disabled, only * Critical * and High priority tickets will be highlighted.';
+$hesklang['highlight_ticket_rows_based_on_priority_descr'] = 'Highlight all ticket rows based on priority';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');