diff --git a/.creevey/images/MetricList/With Remove all NODATA/chrome.png b/.creevey/images/MetricList/With Remove all NODATA/chrome.png
index f8004cd54..a8477ae05 100644
Binary files a/.creevey/images/MetricList/With Remove all NODATA/chrome.png and b/.creevey/images/MetricList/With Remove all NODATA/chrome.png differ
diff --git a/.creevey/images/MetricList/With Status Indicator/chrome.png b/.creevey/images/MetricList/With Status Indicator/chrome.png
index cb54eaebe..412c6b106 100644
Binary files a/.creevey/images/MetricList/With Status Indicator/chrome.png and b/.creevey/images/MetricList/With Status Indicator/chrome.png differ
diff --git a/.creevey/images/TriggerListItem/Default/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Default/moveToElement/chrome/statusClicked.png
index 9242ea42c..11722c5db 100644
Binary files a/.creevey/images/TriggerListItem/Default/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Default/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Exception state/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Exception state/moveToElement/chrome/statusClicked.png
index 30909d671..58fe4cfbc 100644
Binary files a/.creevey/images/TriggerListItem/Exception state/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Exception state/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Few states/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Few states/moveToElement/chrome/statusClicked.png
index 1adf5457a..0c48d56b9 100644
Binary files a/.creevey/images/TriggerListItem/Few states/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Few states/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Large counters/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Large counters/moveToElement/chrome/statusClicked.png
index 193f5df8a..3e750d736 100644
Binary files a/.creevey/images/TriggerListItem/Large counters/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Large counters/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Long tags/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Long tags/moveToElement/chrome/statusClicked.png
index 5ecabba96..7396ea9c7 100644
Binary files a/.creevey/images/TriggerListItem/Long tags/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Long tags/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Long trigger name/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Long trigger name/moveToElement/chrome/statusClicked.png
index a3ccd647f..b91cf549b 100644
Binary files a/.creevey/images/TriggerListItem/Long trigger name/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Long trigger name/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Lot of all data/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Lot of all data/moveToElement/chrome/statusClicked.png
index a5f0a7ebc..7625fa09a 100644
Binary files a/.creevey/images/TriggerListItem/Lot of all data/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Lot of all data/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Lot tags/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Lot tags/moveToElement/chrome/statusClicked.png
index 205cf3af3..2ef3d5355 100644
Binary files a/.creevey/images/TriggerListItem/Lot tags/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Lot tags/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Lot targets/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Lot targets/moveToElement/chrome/statusClicked.png
index 4d486ef8b..8d3659671 100644
Binary files a/.creevey/images/TriggerListItem/Lot targets/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Lot targets/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/One long target name/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/One long target name/moveToElement/chrome/statusClicked.png
index b8eb2602c..b00b4fc0e 100644
Binary files a/.creevey/images/TriggerListItem/One long target name/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/One long target name/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Short tags/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Short tags/moveToElement/chrome/statusClicked.png
index 1899684d7..929eb2068 100644
Binary files a/.creevey/images/TriggerListItem/Short tags/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Short tags/moveToElement/chrome/statusClicked.png differ
diff --git a/.creevey/images/TriggerListItem/Throttling flag/moveToElement/chrome/statusClicked.png b/.creevey/images/TriggerListItem/Throttling flag/moveToElement/chrome/statusClicked.png
index d5e031ad8..4cb25fe6d 100644
Binary files a/.creevey/images/TriggerListItem/Throttling flag/moveToElement/chrome/statusClicked.png and b/.creevey/images/TriggerListItem/Throttling flag/moveToElement/chrome/statusClicked.png differ
diff --git a/src/Components/MetricList/MetricList.less b/src/Components/MetricList/MetricList.less
index 678b4e726..05df633c3 100644
--- a/src/Components/MetricList/MetricList.less
+++ b/src/Components/MetricList/MetricList.less
@@ -27,7 +27,7 @@
 .state {
     flex-shrink: 0;
     padding-top: 6px;
-    width: 25px;
+    width: 50px;
     height: 20px;
     box-sizing: border-box;
 
diff --git a/src/Components/MetricList/MetricList.tsx b/src/Components/MetricList/MetricList.tsx
index 0e24b337b..704609ee8 100644
--- a/src/Components/MetricList/MetricList.tsx
+++ b/src/Components/MetricList/MetricList.tsx
@@ -79,7 +79,21 @@ export default function MetricList(props: Props): React.ReactElement {
                         entries.length > MAX_LIST_LENGTH_BEFORE_SCROLLABLE ? "stable" : "auto",
                 }}
             >
-                {status && <div className={cn("state")} />}
+                {status && (
+                    <div className={cn("state")}>
+                        <button
+                            type="button"
+                            className={cn("a11y-span", { sorting: onSort })}
+                            onClick={onSort && (() => onSort("state"))}
+                        >
+                            State
+                            {sortingColumn === "state" && (
+                                <span className={cn("icon")}>{sortingIcon}</span>
+                            )}
+                        </button>
+                    </div>
+                )}
+
                 <div className={cn("name")}>
                     <button
                         type="button"
@@ -140,7 +154,7 @@ export default function MetricList(props: Props): React.ReactElement {
                         // Otherwise, the total height will be the sum of individual row heights.
                         entries.length > MAX_LIST_LENGTH_BEFORE_SCROLLABLE
                             ? METRIC_LIST_HEIGHT
-                            : getTotalSize(entries)
+                            : getTotalSize(entries) + 2
                     }
                     width="100%"
                     itemSize={(index) => getItemSize(...entries[index])}
diff --git a/src/Components/TriggerListItem/TriggerListItem.tsx b/src/Components/TriggerListItem/TriggerListItem.tsx
index 0c3360508..d03e81fca 100644
--- a/src/Components/TriggerListItem/TriggerListItem.tsx
+++ b/src/Components/TriggerListItem/TriggerListItem.tsx
@@ -13,8 +13,9 @@ import RouterLink from "../RouterLink/RouterLink";
 import StatusIndicator from "../StatusIndicator/StatusIndicator";
 import TagGroup from "../TagGroup/TagGroup";
 import Tabs, { Tab } from "../Tabs/Tabs";
-import MetricListView from "../MetricList/MetricList";
+import MetricListView, { SortingColumn } from "../MetricList/MetricList";
 import { sanitize } from "dompurify";
+import { sortMetrics } from "../../helpers/sort-metrics";
 import classNames from "classnames/bind";
 
 import styles from "./TriggerListItem.less";
@@ -34,6 +35,8 @@ type Props = {
 type State = {
     showMetrics: boolean;
     metrics: MetricItemList;
+    sortingColumn: SortingColumn;
+    sortingDown: boolean;
 };
 
 export default class TriggerListItem extends React.Component<Props, State> {
@@ -44,28 +47,11 @@ export default class TriggerListItem extends React.Component<Props, State> {
         this.state = {
             showMetrics: false,
             metrics: props.data.last_check?.metrics || {},
+            sortingColumn: "event",
+            sortingDown: false,
         };
     }
 
-    static sortMetricsByValue(metrics: MetricItemList): MetricItemList {
-        return Object.keys(metrics)
-            .sort((x: string, y: string) => {
-                const valueA = metrics[x].value || 0;
-                const valueB = metrics[y].value || 0;
-                if (valueA < valueB) {
-                    return -1;
-                }
-                if (valueA > valueB) {
-                    return 1;
-                }
-                return 0;
-            })
-            .reduce((data: MetricItemList, key: string) => {
-                data[key] = metrics[key];
-                return data;
-            }, {});
-    }
-
     render(): React.ReactNode {
         const { searchMode, data } = this.props;
         const { id, name, targets, tags, throttling, highlights } = data;
@@ -149,6 +135,19 @@ export default class TriggerListItem extends React.Component<Props, State> {
         );
     }
 
+    handleSort(column: SortingColumn) {
+        const { sortingColumn, sortingDown } = this.state;
+
+        if (column === sortingColumn) {
+            this.setState({ sortingDown: !sortingDown });
+        } else {
+            this.setState({
+                sortingColumn: column,
+                sortingDown: true,
+            });
+        }
+    }
+
     getHasExceptionState(): boolean {
         const { data } = this.props;
         const { state: triggerStatus } = data.last_check || {};
@@ -224,6 +223,7 @@ export default class TriggerListItem extends React.Component<Props, State> {
 
     renderMetrics(): React.ReactNode {
         const { onChange, onRemove, data } = this.props;
+        const { sortingColumn, sortingDown } = this.state;
         if (!onChange || !onRemove) {
             return null;
         }
@@ -236,9 +236,14 @@ export default class TriggerListItem extends React.Component<Props, State> {
         const metrics: Array<React.ReactElement> = statuses.map((status: Status) => (
             <Tab key={status} id={status} label={getStatusCaption(status)}>
                 <MetricListView
-                    items={TriggerListItem.sortMetricsByValue(this.filterMetricsByStatus(status))}
-                    sortingColumn="value"
-                    sortingDown
+                    items={sortMetrics(
+                        this.filterMetricsByStatus(status),
+                        sortingColumn,
+                        sortingDown
+                    )}
+                    sortingColumn={sortingColumn}
+                    onSort={(column) => this.handleSort(column)}
+                    sortingDown={sortingDown}
                     onChange={(metric: string, maintenance: number) =>
                         onChange?.(data.id, metric, maintenance)
                     }
diff --git a/src/pages/trigger/trigger.desktop.tsx b/src/pages/trigger/trigger.desktop.tsx
index ded615313..5586e52ba 100644
--- a/src/pages/trigger/trigger.desktop.tsx
+++ b/src/pages/trigger/trigger.desktop.tsx
@@ -37,7 +37,7 @@ type State = {
 
 class TriggerDesktop extends React.Component<TriggerDesktopProps, State> {
     public state: State = {
-        sortingColumn: "state",
+        sortingColumn: "event",
         sortingDown: false,
     };