diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap
index 1b3f1baef..9706fc9d7 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Alert/__snapshots__/index.test.js.snap
@@ -15,7 +15,7 @@ exports[`<Alert /> matches snapshot when inhibited 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-minus\\"
-             class=\\"svg-inline--fa fa-search-minus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1 cursor-pointer\\"
+             class=\\"svg-inline--fa fa-search-minus fa-w-16 mr-1 cursor-pointer\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -46,7 +46,7 @@ exports[`<Alert /> matches snapshot when inhibited 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-plus\\"
-             class=\\"svg-inline--fa fa-search-plus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-search-plus fa-w-16 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -67,7 +67,7 @@ exports[`<Alert /> matches snapshot when inhibited 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"caret-down\\"
-         class=\\"svg-inline--fa fa-caret-down fa-w-10 fa-null fa-rotate-null fa-pull-null pr-1\\"
+         class=\\"svg-inline--fa fa-caret-down fa-w-10 pr-1\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 320 512\\"
@@ -93,7 +93,7 @@ exports[`<Alert /> matches snapshot when inhibited 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"volume-mute\\"
-           class=\\"svg-inline--fa fa-volume-mute fa-w-16 fa-null fa-rotate-null fa-pull-null text-success\\"
+           class=\\"svg-inline--fa fa-volume-mute fa-w-16 text-success\\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"
@@ -144,7 +144,7 @@ exports[`<Alert /> matches snapshot when inhibited 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"external-link-alt\\"
-         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
@@ -175,7 +175,7 @@ exports[`<Alert /> matches snapshot with showAlertmanagers=false showReceiver=fa
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-minus\\"
-             class=\\"svg-inline--fa fa-search-minus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1 cursor-pointer\\"
+             class=\\"svg-inline--fa fa-search-minus fa-w-16 mr-1 cursor-pointer\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -206,7 +206,7 @@ exports[`<Alert /> matches snapshot with showAlertmanagers=false showReceiver=fa
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-plus\\"
-             class=\\"svg-inline--fa fa-search-plus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-search-plus fa-w-16 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -227,7 +227,7 @@ exports[`<Alert /> matches snapshot with showAlertmanagers=false showReceiver=fa
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"caret-down\\"
-         class=\\"svg-inline--fa fa-caret-down fa-w-10 fa-null fa-rotate-null fa-pull-null pr-1\\"
+         class=\\"svg-inline--fa fa-caret-down fa-w-10 pr-1\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 320 512\\"
@@ -281,7 +281,7 @@ exports[`<Alert /> matches snapshot with showAlertmanagers=false showReceiver=fa
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"external-link-alt\\"
-         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap
index 6199b1e6f..4df42bb40 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap
@@ -11,7 +11,7 @@ exports[`<RenderLinkAnnotation /> matches snapshot 1`] = `
        focusable=\\"false\\"
        data-prefix=\\"fas\\"
        data-icon=\\"external-link-alt\\"
-       class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+       class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
        role=\\"img\\"
        xmlns=\\"http://www.w3.org/2000/svg\\"
        viewbox=\\"0 0 512 512\\"
@@ -37,7 +37,7 @@ exports[`<RenderNonLinkAnnotation /> matches snapshot when visible=false 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"search-plus\\"
-         class=\\"svg-inline--fa fa-search-plus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+         class=\\"svg-inline--fa fa-search-plus fa-w-16 mr-1\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
@@ -64,7 +64,7 @@ exports[`<RenderNonLinkAnnotation /> matches snapshot when visible=true 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"search-minus\\"
-         class=\\"svg-inline--fa fa-search-minus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1 cursor-pointer\\"
+         class=\\"svg-inline--fa fa-search-minus fa-w-16 mr-1 cursor-pointer\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupFooter/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupFooter/__snapshots__/index.test.js.snap
index 60e3c40eb..9c41793fd 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupFooter/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupFooter/__snapshots__/index.test.js.snap
@@ -15,7 +15,7 @@ exports[`<GroupFooter /> matches snapshot 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-minus\\"
-             class=\\"svg-inline--fa fa-search-minus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1 cursor-pointer\\"
+             class=\\"svg-inline--fa fa-search-minus fa-w-16 mr-1 cursor-pointer\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -46,7 +46,7 @@ exports[`<GroupFooter /> matches snapshot 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-plus\\"
-             class=\\"svg-inline--fa fa-search-plus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-search-plus fa-w-16 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -129,7 +129,7 @@ exports[`<GroupFooter /> matches snapshot 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"external-link-alt\\"
-         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
@@ -160,7 +160,7 @@ exports[`<GroupFooter /> mathes snapshot when silence is rendered 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-minus\\"
-             class=\\"svg-inline--fa fa-search-minus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1 cursor-pointer\\"
+             class=\\"svg-inline--fa fa-search-minus fa-w-16 mr-1 cursor-pointer\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -191,7 +191,7 @@ exports[`<GroupFooter /> mathes snapshot when silence is rendered 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"search-plus\\"
-             class=\\"svg-inline--fa fa-search-plus fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-search-plus fa-w-16 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -274,7 +274,7 @@ exports[`<GroupFooter /> mathes snapshot when silence is rendered 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"external-link-alt\\"
-         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+         class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
@@ -312,7 +312,7 @@ exports[`<GroupFooter /> mathes snapshot when silence is rendered 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"chevron-up\\"
-                     class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null \\"
+                     class=\\"svg-inline--fa fa-chevron-up fa-w-14 \\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 448 512\\"
diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/__snapshots__/index.test.js.snap
index bc7ac0c48..cfe8b3f6a 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/__snapshots__/index.test.js.snap
@@ -37,7 +37,7 @@ exports[`<Silence /> matches snapshot when data is present in alertStore 1`] = `
                  focusable=\\"false\\"
                  data-prefix=\\"fas\\"
                  data-icon=\\"chevron-up\\"
-                 class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null \\"
+                 class=\\"svg-inline--fa fa-chevron-up fa-w-14 \\"
                  role=\\"img\\"
                  xmlns=\\"http://www.w3.org/2000/svg\\"
                  viewbox=\\"0 0 448 512\\"
@@ -102,7 +102,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
                  focusable=\\"false\\"
                  data-prefix=\\"fas\\"
                  data-icon=\\"chevron-down\\"
-                 class=\\"svg-inline--fa fa-chevron-down fa-w-14 fa-null fa-rotate-null fa-pull-null \\"
+                 class=\\"svg-inline--fa fa-chevron-down fa-w-14 \\"
                  role=\\"img\\"
                  xmlns=\\"http://www.w3.org/2000/svg\\"
                  viewbox=\\"0 0 448 512\\"
@@ -146,7 +146,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"external-link-alt\\"
-             class=\\"svg-inline--fa fa-external-link-alt fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+             class=\\"svg-inline--fa fa-external-link-alt fa-w-16 \\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 512 512\\"
@@ -165,7 +165,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"calendar-check\\"
-             class=\\"svg-inline--fa fa-calendar-check fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted mr-1\\"
+             class=\\"svg-inline--fa fa-calendar-check fa-w-14 text-muted mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 448 512\\"
@@ -185,7 +185,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"calendar-times\\"
-             class=\\"svg-inline--fa fa-calendar-times fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted mr-1\\"
+             class=\\"svg-inline--fa fa-calendar-times fa-w-14 text-muted mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 448 512\\"
@@ -205,7 +205,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"edit\\"
-             class=\\"svg-inline--fa fa-edit fa-w-18 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-edit fa-w-18 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 576 512\\"
@@ -222,7 +222,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
              focusable=\\"false\\"
              data-prefix=\\"fas\\"
              data-icon=\\"trash\\"
-             class=\\"svg-inline--fa fa-trash fa-w-14 fa-null fa-rotate-null fa-pull-null mr-1\\"
+             class=\\"svg-inline--fa fa-trash fa-w-14 mr-1\\"
              role=\\"img\\"
              xmlns=\\"http://www.w3.org/2000/svg\\"
              viewbox=\\"0 0 448 512\\"
@@ -242,7 +242,7 @@ exports[`<Silence /> matches snapshot with expaned details 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"filter\\"
-               class=\\"svg-inline--fa fa-filter fa-w-16 fa-null fa-rotate-null fa-pull-null text-muted mr-1\\"
+               class=\\"svg-inline--fa fa-filter fa-w-16 text-muted mr-1\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Grid/EmptyGrid/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/EmptyGrid/__snapshots__/index.test.js.snap
index 9e3f2b5fa..3de871c4d 100644
--- a/ui/src/Components/Grid/EmptyGrid/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/EmptyGrid/__snapshots__/index.test.js.snap
@@ -7,7 +7,7 @@ exports[`<EmptyGrid /> matches snapshot 1`] = `
        focusable=\\"false\\"
        data-prefix=\\"fas\\"
        data-icon=\\"mug-hot\\"
-       class=\\"svg-inline--fa fa-mug-hot fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+       class=\\"svg-inline--fa fa-mug-hot fa-w-16 \\"
        role=\\"img\\"
        xmlns=\\"http://www.w3.org/2000/svg\\"
        viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Grid/FatalError/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/FatalError/__snapshots__/index.test.js.snap
index 3c7ec5a05..27f4bb56a 100644
--- a/ui/src/Components/Grid/FatalError/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/FatalError/__snapshots__/index.test.js.snap
@@ -9,7 +9,7 @@ exports[`<FatalError /> matches snapshot 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"exclamation-circle\\"
-           class=\\"svg-inline--fa fa-exclamation-circle fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+           class=\\"svg-inline--fa fa-exclamation-circle fa-w-16 \\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Grid/UpgradeNeeded/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/UpgradeNeeded/__snapshots__/index.test.js.snap
index 7c8438a48..f59602e7d 100644
--- a/ui/src/Components/Grid/UpgradeNeeded/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Grid/UpgradeNeeded/__snapshots__/index.test.js.snap
@@ -9,7 +9,7 @@ exports[`<UpgradeNeeded /> matches snapshot 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"rocket\\"
-           class=\\"svg-inline--fa fa-rocket fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+           class=\\"svg-inline--fa fa-rocket fa-w-16 \\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"
@@ -25,7 +25,7 @@ exports[`<UpgradeNeeded /> matches snapshot 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"spinner\\"
-           class=\\"svg-inline--fa fa-spinner fa-w-16 fa-spin fa-null fa-rotate-null fa-pull-null mr-1\\"
+           class=\\"svg-inline--fa fa-spinner fa-w-16 fa-spin mr-1\\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/Labels/LabelWithPercent/__snapshots__/index.test.js.snap b/ui/src/Components/Labels/LabelWithPercent/__snapshots__/index.test.js.snap
index a54e839b9..b9de37a3c 100644
--- a/ui/src/Components/Labels/LabelWithPercent/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/Labels/LabelWithPercent/__snapshots__/index.test.js.snap
@@ -19,7 +19,7 @@ exports[`<LabelWithPercent /> matches snapshot with isActive=true 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"times\\"
-         class=\\"svg-inline--fa fa-times fa-w-11 fa-null fa-rotate-null fa-pull-null cursor-pointer text-reset ml-1 close\\"
+         class=\\"svg-inline--fa fa-times fa-w-11 cursor-pointer text-reset ml-1 close\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 352 512\\"
diff --git a/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap b/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap
index 86dced59d..3c30fc7a9 100644
--- a/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/MainModal/Configuration/__snapshots__/index.test.js.snap
@@ -14,7 +14,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-down\\"
-               class=\\"svg-inline--fa fa-chevron-down fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-down fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -85,7 +85,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -133,7 +133,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -180,7 +180,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -251,7 +251,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -322,7 +322,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -401,7 +401,7 @@ exports[`<Configuration /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
diff --git a/ui/src/Components/MainModal/__snapshots__/Help.test.js.snap b/ui/src/Components/MainModal/__snapshots__/Help.test.js.snap
index 2c212cb10..536e94a95 100644
--- a/ui/src/Components/MainModal/__snapshots__/Help.test.js.snap
+++ b/ui/src/Components/MainModal/__snapshots__/Help.test.js.snap
@@ -14,7 +14,7 @@ exports[`<Help /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-down\\"
-               class=\\"svg-inline--fa fa-chevron-down fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-down fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -173,7 +173,7 @@ exports[`<Help /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -349,7 +349,7 @@ exports[`<Help /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"chevron-up\\"
-               class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+               class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 448 512\\"
@@ -690,7 +690,7 @@ exports[`<Help /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"info-circle\\"
-                   class=\\"svg-inline--fa fa-info-circle fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+                   class=\\"svg-inline--fa fa-info-circle fa-w-16 mr-1\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 512 512\\"
@@ -765,7 +765,7 @@ exports[`<Help /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"info-circle\\"
-                   class=\\"svg-inline--fa fa-info-circle fa-w-16 fa-null fa-rotate-null fa-pull-null mr-1\\"
+                   class=\\"svg-inline--fa fa-info-circle fa-w-16 mr-1\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap b/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap
index 3b206bac3..7fb667a8e 100644
--- a/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap
+++ b/ui/src/Components/MainModal/__snapshots__/MainModalContent.test.js.snap
@@ -33,7 +33,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-down\\"
-                   class=\\"svg-inline--fa fa-chevron-down fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-down fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -104,7 +104,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -152,7 +152,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -199,7 +199,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -270,7 +270,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -341,7 +341,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
@@ -420,7 +420,7 @@ exports[`<MainModalContent /> matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"chevron-up\\"
-                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 fa-null fa-rotate-null fa-pull-null text-muted\\"
+                   class=\\"svg-inline--fa fa-chevron-up fa-w-14 text-muted\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 448 512\\"
diff --git a/ui/src/Components/MultiSelect/__snapshots__/ValidationError.test.js.snap b/ui/src/Components/MultiSelect/__snapshots__/ValidationError.test.js.snap
index 657ab4b2d..e4f938d0e 100644
--- a/ui/src/Components/MultiSelect/__snapshots__/ValidationError.test.js.snap
+++ b/ui/src/Components/MultiSelect/__snapshots__/ValidationError.test.js.snap
@@ -7,7 +7,7 @@ exports[`<ValidationError /> matches snapshot 1`] = `
        focusable=\\"false\\"
        data-prefix=\\"fas\\"
        data-icon=\\"exclamation-circle\\"
-       class=\\"svg-inline--fa fa-exclamation-circle fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+       class=\\"svg-inline--fa fa-exclamation-circle fa-w-16 \\"
        role=\\"img\\"
        xmlns=\\"http://www.w3.org/2000/svg\\"
        viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/NavBar/FetchIndicator/__snapshots__/index.test.js.snap b/ui/src/Components/NavBar/FetchIndicator/__snapshots__/index.test.js.snap
index 87b2650b1..a07e1fa83 100644
--- a/ui/src/Components/NavBar/FetchIndicator/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/NavBar/FetchIndicator/__snapshots__/index.test.js.snap
@@ -6,7 +6,7 @@ exports[`<FetchIndicator /> matches snapshot when fetch is in progress 1`] = `
      focusable=\\"false\\"
      data-prefix=\\"fas\\"
      data-icon=\\"circle-notch\\"
-     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-spin fa-lg fa-rotate-null fa-pull-null mx-1 text-muted\\"
+     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-spin fa-lg mx-1 text-muted\\"
      role=\\"img\\"
      xmlns=\\"http://www.w3.org/2000/svg\\"
      viewbox=\\"0 0 512 512\\"
@@ -26,7 +26,7 @@ exports[`<FetchIndicator /> matches snapshot when idle 1`] = `
      focusable=\\"false\\"
      data-prefix=\\"fas\\"
      data-icon=\\"circle-notch\\"
-     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-lg fa-rotate-null fa-pull-null mx-1 text-muted\\"
+     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-lg mx-1 text-muted\\"
      role=\\"img\\"
      xmlns=\\"http://www.w3.org/2000/svg\\"
      viewbox=\\"0 0 512 512\\"
@@ -46,7 +46,7 @@ exports[`<FetchIndicator /> matches snapshot when paused 1`] = `
      focusable=\\"false\\"
      data-prefix=\\"far\\"
      data-icon=\\"pause-circle\\"
-     class=\\"svg-inline--fa fa-pause-circle fa-w-16 fa-lg fa-rotate-null fa-pull-null mx-1 text-muted\\"
+     class=\\"svg-inline--fa fa-pause-circle fa-w-16 fa-lg mx-1 text-muted\\"
      role=\\"img\\"
      xmlns=\\"http://www.w3.org/2000/svg\\"
      viewbox=\\"0 0 512 512\\"
@@ -66,7 +66,7 @@ exports[`<FetchIndicator /> matches snapshot when response is processed 1`] = `
      focusable=\\"false\\"
      data-prefix=\\"fas\\"
      data-icon=\\"circle-notch\\"
-     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-spin fa-lg fa-rotate-null fa-pull-null mx-1 text-success\\"
+     class=\\"svg-inline--fa fa-circle-notch fa-w-16 fa-spin fa-lg mx-1 text-success\\"
      role=\\"img\\"
      xmlns=\\"http://www.w3.org/2000/svg\\"
      viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap b/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap
index 188f8ce23..95dc37fe4 100644
--- a/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/NavBar/FilterInput/__snapshots__/index.test.js.snap
@@ -9,7 +9,7 @@ exports[`<FilterInput /> matches snapshot on default render 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"search\\"
-           class=\\"svg-inline--fa fa-search fa-w-16 fa-null fa-rotate-null fa-pull-null \\"
+           class=\\"svg-inline--fa fa-search fa-w-16 \\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"
@@ -55,7 +55,7 @@ exports[`<FilterInput /> matches snapshot on default render 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"caret-down\\"
-           class=\\"svg-inline--fa fa-caret-down fa-w-10 fa-null fa-rotate-null fa-pull-null \\"
+           class=\\"svg-inline--fa fa-caret-down fa-w-10 \\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 320 512\\"
diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap
index d0f7ff7da..6670002c8 100644
--- a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap
@@ -46,7 +46,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-up\\"
-                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -80,7 +80,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-down\\"
-                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -108,7 +108,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-up\\"
-                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -142,7 +142,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-down\\"
-                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -170,7 +170,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-up\\"
-                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -204,7 +204,7 @@ exports[`<DateTimeSelect /> 'Duration' tab matches snapshot 1`] = `
                      focusable=\\"false\\"
                      data-prefix=\\"fas\\"
                      data-icon=\\"angle-down\\"
-                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                     class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                      role=\\"img\\"
                      xmlns=\\"http://www.w3.org/2000/svg\\"
                      viewbox=\\"0 0 320 512\\"
@@ -583,7 +583,7 @@ exports[`<DateTimeSelect /> 'Ends' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-up\\"
-                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -603,7 +603,7 @@ exports[`<DateTimeSelect /> 'Ends' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-up\\"
-                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -640,7 +640,7 @@ exports[`<DateTimeSelect /> 'Ends' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-down\\"
-                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -660,7 +660,7 @@ exports[`<DateTimeSelect /> 'Ends' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-down\\"
-                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -1031,7 +1031,7 @@ exports[`<DateTimeSelect /> 'Starts' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-up\\"
-                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -1051,7 +1051,7 @@ exports[`<DateTimeSelect /> 'Starts' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-up\\"
-                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-up fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -1088,7 +1088,7 @@ exports[`<DateTimeSelect /> 'Starts' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-down\\"
-                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
@@ -1108,7 +1108,7 @@ exports[`<DateTimeSelect /> 'Starts' tab matches snapshot 1`] = `
                    focusable=\\"false\\"
                    data-prefix=\\"fas\\"
                    data-icon=\\"angle-down\\"
-                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x fa-rotate-null fa-pull-null text-muted cursor-pointer\\"
+                   class=\\"svg-inline--fa fa-angle-down fa-w-10 fa-2x text-muted cursor-pointer\\"
                    role=\\"img\\"
                    xmlns=\\"http://www.w3.org/2000/svg\\"
                    viewbox=\\"0 0 320 512\\"
diff --git a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap
index 72a8183a1..a4064709b 100644
--- a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap
+++ b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelValueInput.test.js.snap
@@ -16,7 +16,7 @@ exports[`<LabelValueInput /> matches snapshot 1`] = `
                focusable=\\"false\\"
                data-prefix=\\"fas\\"
                data-icon=\\"spinner\\"
-               class=\\"svg-inline--fa fa-spinner fa-w-16 fa-spin fa-null fa-rotate-null fa-pull-null \\"
+               class=\\"svg-inline--fa fa-spinner fa-w-16 fa-spin \\"
                role=\\"img\\"
                xmlns=\\"http://www.w3.org/2000/svg\\"
                viewbox=\\"0 0 512 512\\"
diff --git a/ui/src/Components/SilenceModal/SilencePreview/__snapshots__/index.test.js.snap b/ui/src/Components/SilenceModal/SilencePreview/__snapshots__/index.test.js.snap
index 8dd07c541..9b59e5f39 100644
--- a/ui/src/Components/SilenceModal/SilencePreview/__snapshots__/index.test.js.snap
+++ b/ui/src/Components/SilenceModal/SilencePreview/__snapshots__/index.test.js.snap
@@ -99,7 +99,7 @@ exports[`<SilencePreview /> matches snapshot 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"check-circle\\"
-         class=\\"svg-inline--fa fa-check-circle fa-w-16 fa-null fa-rotate-null fa-pull-null pr-1\\"
+         class=\\"svg-inline--fa fa-check-circle fa-w-16 pr-1\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 512 512\\"
@@ -118,7 +118,7 @@ exports[`<SilencePreview /> matches snapshot 1`] = `
          focusable=\\"false\\"
          data-prefix=\\"fas\\"
          data-icon=\\"arrow-left\\"
-         class=\\"svg-inline--fa fa-arrow-left fa-w-14 fa-null fa-rotate-null fa-pull-null pr-1\\"
+         class=\\"svg-inline--fa fa-arrow-left fa-w-14 pr-1\\"
          role=\\"img\\"
          xmlns=\\"http://www.w3.org/2000/svg\\"
          viewbox=\\"0 0 448 512\\"
diff --git a/ui/src/__snapshots__/ErrorBoundary.test.js.snap b/ui/src/__snapshots__/ErrorBoundary.test.js.snap
index 7afcbb79a..b7b84ab9a 100644
--- a/ui/src/__snapshots__/ErrorBoundary.test.js.snap
+++ b/ui/src/__snapshots__/ErrorBoundary.test.js.snap
@@ -9,7 +9,7 @@ exports[`<ErrorBoundary /> matches snapshot 1`] = `
            focusable=\\"false\\"
            data-prefix=\\"fas\\"
            data-icon=\\"bomb\\"
-           class=\\"svg-inline--fa fa-bomb fa-w-16 fa-null fa-rotate-null fa-pull-null text-danger mr-2\\"
+           class=\\"svg-inline--fa fa-bomb fa-w-16 text-danger mr-2\\"
            role=\\"img\\"
            xmlns=\\"http://www.w3.org/2000/svg\\"
            viewbox=\\"0 0 512 512\\"