diff --git a/src/plugins/axivion/axivion.qrc b/src/plugins/axivion/axivion.qrc
index fa3ad146d37..d1e41e3cdb3 100644
--- a/src/plugins/axivion/axivion.qrc
+++ b/src/plugins/axivion/axivion.qrc
@@ -2,18 +2,18 @@
     <qresource prefix="/axivion">
         <file>images/axivion.png</file>
         <file>images/axivion@2x.png</file>
-        <file>images/button-av.png</file>
-        <file>images/button-av@2x.png</file>
-        <file>images/button-cl.png</file>
-        <file>images/button-cl@2x.png</file>
-        <file>images/button-cy.png</file>
-        <file>images/button-cy@2x.png</file>
-        <file>images/button-de.png</file>
-        <file>images/button-de@2x.png</file>
-        <file>images/button-mv.png</file>
-        <file>images/button-mv@2x.png</file>
-        <file>images/button-sv.png</file>
-        <file>images/button-sv@2x.png</file>
+        <file>images/button-AV.png</file>
+        <file>images/button-AV@2x.png</file>
+        <file>images/button-CL.png</file>
+        <file>images/button-CL@2x.png</file>
+        <file>images/button-CY.png</file>
+        <file>images/button-CY@2x.png</file>
+        <file>images/button-DE.png</file>
+        <file>images/button-DE@2x.png</file>
+        <file>images/button-MV.png</file>
+        <file>images/button-MV@2x.png</file>
+        <file>images/button-SV.png</file>
+        <file>images/button-SV@2x.png</file>
         <file>images/sortAsc.png</file>
         <file>images/sortAsc@2x.png</file>
         <file>images/sortDesc.png</file>
diff --git a/src/plugins/axivion/axivionoutputpane.cpp b/src/plugins/axivion/axivionoutputpane.cpp
index 31a03f0d569..70e44057e9f 100644
--- a/src/plugins/axivion/axivionoutputpane.cpp
+++ b/src/plugins/axivion/axivionoutputpane.cpp
@@ -564,7 +564,7 @@ void IssuesWidget::updateBasicProjectInfo(std::optional<Dto::ProjectInfoDto> inf
     int buttonId = 0;
     for (const Dto::IssueKindInfoDto &kind : issueKinds) {
         auto button = new QToolButton(this);
-        button->setIcon(iconForIssue(kind.prefix));
+        button->setIcon(iconForIssue(kind.getOptionalPrefixEnum()));
         button->setToolTip(kind.nicePluralName);
         button->setCheckable(true);
         connect(button, &QToolButton::clicked, this, [this, prefix = kind.prefix]{
diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp
index 20e7871b14e..6e04af7e30d 100644
--- a/src/plugins/axivion/axivionplugin.cpp
+++ b/src/plugins/axivion/axivionplugin.cpp
@@ -63,16 +63,18 @@ using namespace Utils;
 
 namespace Axivion::Internal {
 
-QIcon iconForIssue(const QString &prefix)
+QIcon iconForIssue(const std::optional<Dto::IssueKind> &issueKind)
 {
-    static QHash<QString, QIcon> prefixToIcon;
-    auto it = prefixToIcon.find(prefix);
+    if (!issueKind)
+        return {};
 
-    if (it == prefixToIcon.end()) {
-        Icon icon({{FilePath::fromString(":/axivion/images/button-" + prefix.toLower() + ".png"),
-                    Theme::PaletteButtonText}},
-                  Icon::Tint);
-        it = prefixToIcon.insert(prefix, icon.icon());
+    static QHash<Dto::IssueKind, QIcon> prefixToIcon;
+    auto it = prefixToIcon.constFind(*issueKind);
+    if (it == prefixToIcon.constEnd()) {
+        const auto prefix = Dto::IssueKindMeta::enumToStr(*issueKind);
+        const Icon icon({{FilePath::fromString(":/axivion/images/button-" + prefix + ".png"),
+                          Theme::PaletteButtonText}}, Icon::Tint);
+        it = prefixToIcon.insert(*issueKind, icon.icon());
     }
     return it.value();
 }
@@ -226,7 +228,7 @@ public:
         const QString markText = issue.description;
         const QString id = issue.kind + QString::number(issue.id.value_or(-1));
         setToolTip(id + '\n' + markText);
-        setIcon(iconForIssue(issue.kind));
+        setIcon(iconForIssue(issue.getOptionalKindEnum()));
         if (color)
             setColor(*color);
         setPriority(TextMark::NormalPriority);
diff --git a/src/plugins/axivion/axivionplugin.h b/src/plugins/axivion/axivionplugin.h
index c60aad6e9e9..18cdae6dded 100644
--- a/src/plugins/axivion/axivionplugin.h
+++ b/src/plugins/axivion/axivionplugin.h
@@ -71,7 +71,7 @@ void fetchProjectInfo(const QString &projectName);
 std::optional<Dto::ProjectInfoDto> projectInfo();
 bool handleCertificateIssue();
 
-QIcon iconForIssue(const QString &prefix);
+QIcon iconForIssue(const std::optional<Dto::IssueKind> &issueKind);
 QString anyToSimpleString(const Dto::Any &any);
 void fetchIssueInfo(const QString &id);
 
diff --git a/src/plugins/axivion/images/button-av.png b/src/plugins/axivion/images/button-AV.png
similarity index 100%
rename from src/plugins/axivion/images/button-av.png
rename to src/plugins/axivion/images/button-AV.png
diff --git a/src/plugins/axivion/images/button-av@2x.png b/src/plugins/axivion/images/button-AV@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-av@2x.png
rename to src/plugins/axivion/images/button-AV@2x.png
diff --git a/src/plugins/axivion/images/button-cl.png b/src/plugins/axivion/images/button-CL.png
similarity index 100%
rename from src/plugins/axivion/images/button-cl.png
rename to src/plugins/axivion/images/button-CL.png
diff --git a/src/plugins/axivion/images/button-cl@2x.png b/src/plugins/axivion/images/button-CL@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-cl@2x.png
rename to src/plugins/axivion/images/button-CL@2x.png
diff --git a/src/plugins/axivion/images/button-cy.png b/src/plugins/axivion/images/button-CY.png
similarity index 100%
rename from src/plugins/axivion/images/button-cy.png
rename to src/plugins/axivion/images/button-CY.png
diff --git a/src/plugins/axivion/images/button-cy@2x.png b/src/plugins/axivion/images/button-CY@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-cy@2x.png
rename to src/plugins/axivion/images/button-CY@2x.png
diff --git a/src/plugins/axivion/images/button-de.png b/src/plugins/axivion/images/button-DE.png
similarity index 100%
rename from src/plugins/axivion/images/button-de.png
rename to src/plugins/axivion/images/button-DE.png
diff --git a/src/plugins/axivion/images/button-de@2x.png b/src/plugins/axivion/images/button-DE@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-de@2x.png
rename to src/plugins/axivion/images/button-DE@2x.png
diff --git a/src/plugins/axivion/images/button-mv.png b/src/plugins/axivion/images/button-MV.png
similarity index 100%
rename from src/plugins/axivion/images/button-mv.png
rename to src/plugins/axivion/images/button-MV.png
diff --git a/src/plugins/axivion/images/button-mv@2x.png b/src/plugins/axivion/images/button-MV@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-mv@2x.png
rename to src/plugins/axivion/images/button-MV@2x.png
diff --git a/src/plugins/axivion/images/button-sv.png b/src/plugins/axivion/images/button-SV.png
similarity index 100%
rename from src/plugins/axivion/images/button-sv.png
rename to src/plugins/axivion/images/button-SV.png
diff --git a/src/plugins/axivion/images/button-sv@2x.png b/src/plugins/axivion/images/button-SV@2x.png
similarity index 100%
rename from src/plugins/axivion/images/button-sv@2x.png
rename to src/plugins/axivion/images/button-SV@2x.png
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index ddec488f3cb..07452dc8c1e 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3813,7 +3813,7 @@
          r="1.5" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-av"
+       id="src/plugins/axivion/images/button-AV"
        transform="translate(17)">
       <use
          style="display:inline"
@@ -3830,7 +3830,7 @@
          style="fill:none;stroke:#000000" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-cl"
+       id="src/plugins/axivion/images/button-CL"
        transform="translate(34)">
       <use
          style="display:inline"
@@ -3862,7 +3862,7 @@
          d="m 2027.5,579 v 1 m -6,-7 v 1" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-cy"
+       id="src/plugins/axivion/images/button-CY"
        transform="translate(51)">
       <use
          style="display:inline"
@@ -3885,7 +3885,7 @@
          transform="rotate(180,2025,576)" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-de"
+       id="src/plugins/axivion/images/button-DE"
        transform="translate(68)">
       <use
          style="display:inline"
@@ -3916,7 +3916,7 @@
          style="display:inline" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-mv"
+       id="src/plugins/axivion/images/button-MV"
        transform="translate(85)">
       <use
          style="display:inline"
@@ -3933,7 +3933,7 @@
          d="m 2020,573.5 h -1 m 1,3 h -1 m 1,3 h -1 m 2.5,-3 v 3 h 3 z m -3,6 h 13 l -13,-13 z" />
     </g>
     <g
-       id="src/plugins/axivion/images/button-sv"
+       id="src/plugins/axivion/images/button-SV"
        transform="translate(102)">
       <use
          style="display:inline"