diff --git a/java/spacewalk-java.changes.eth.fa2 b/java/spacewalk-java.changes.eth.fa2
new file mode 100644
index 00000000000..7655cc7748d
--- /dev/null
+++ b/java/spacewalk-java.changes.eth.fa2
@@ -0,0 +1 @@
+- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)
diff --git a/web/html/src/branding/css/susemanager/components/icons.less b/web/html/src/branding/css/susemanager/components/icons.less
new file mode 100644
index 00000000000..393178cbee7
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/icons.less
@@ -0,0 +1,8 @@
+.fa,
+[class^="fa-"] {
+  font-family: "FontAwesome";
+}
+
+[class*="spacewalk-icon-"] {
+  font-family: "spacewalk-icon";
+}
diff --git a/web/html/src/branding/css/susemanager/components/icons.scss b/web/html/src/branding/css/susemanager/components/icons.scss
new file mode 100644
index 00000000000..393178cbee7
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/icons.scss
@@ -0,0 +1,8 @@
+.fa,
+[class^="fa-"] {
+  font-family: "FontAwesome";
+}
+
+[class*="spacewalk-icon-"] {
+  font-family: "spacewalk-icon";
+}
diff --git a/web/html/src/branding/css/susemanager/index.less b/web/html/src/branding/css/susemanager/index.less
index 9ab7bb8c60a..2ab30220f61 100644
--- a/web/html/src/branding/css/susemanager/index.less
+++ b/web/html/src/branding/css/susemanager/index.less
@@ -25,6 +25,7 @@
 @import "./components/date-time-picker.less";
 @import "./components/header.less";
 @import "./components/address.less";
+@import "./components/icons.less";
 
 // Responsive overrides
 @import "../base/responsive-rules.less";
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index 9f90d4e7575..e2f84d97b3c 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -31,6 +31,7 @@
 @import "./components/legend.scss";
 @import "./components/help-block.scss";
 @import "./components/collapse.scss";
+@import "./components/icons.scss";
 
 @import "./bootstrap-fixes.scss";
 
diff --git a/web/spacewalk-web.changes.eth.fa2 b/web/spacewalk-web.changes.eth.fa2
new file mode 100644
index 00000000000..7655cc7748d
--- /dev/null
+++ b/web/spacewalk-web.changes.eth.fa2
@@ -0,0 +1 @@
+- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)