diff --git a/config.sh b/config.sh
index f36478e..5b49ae5 100644
--- a/config.sh
+++ b/config.sh
@@ -36,6 +36,9 @@ rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps
# which has its own icons and we have breeze for the rest.
[ "$desktop" = "kde" -o "$desktop" = "x11" ] && rpm -e --nodeps adwaita-icon-theme
+# Workaround until dropped from xfce4-branding-openSUSE
+[ "$desktop" = "x11" -o "$desktop" = "xfce" ] && rpm -e --nodeps noto-coloremoji-fonts
+
#--------------------------------------
# enable and disable services
diff --git a/list-common.sh b/list-common.sh
index 72069de..8352c9c 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -96,6 +96,7 @@ buildignore efont-unicode-bitmap-fonts
buildignore baekmuk-bitmap-fonts
buildignore intlfonts-chinese-big-bitmap-fonts
buildignore xorg-x11-fonts
+buildignore xorg-x11-fonts-legacy
buildignore strace
buildignore tcsh
diff --git a/list-x11.sh b/list-x11.sh
index 0f48bdc..7109818 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -63,7 +63,6 @@ buildignore xfce-terminal-lang
buildignore exo-lang
buildignore xfdesktop-lang
buildignore xfce4-power-manager-lang
-buildignore xorg-x11-fonts-legacy
buildignore noto-sans-cjk-fonts
# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 90f59d8..c8da456 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -218,6 +218,8 @@
+
+
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 207f40e..dfe6343 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -218,6 +218,8 @@
+
+
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 38de878..7d93241 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -218,6 +218,8 @@
+
+
@@ -520,8 +522,6 @@
-
-
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index a666e71..fbb4ff4 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 4 09:30:39 UTC 2020 - Fabian Vogt
+
+- Forcibly remove noto-coloremoji-fonts until it can be replaced with
+ a buildignore
+- Ignore xorg-x11-fonts-legacy everywhere
+
-------------------------------------------------------------------
Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 923c08e..2bc0cd6 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -218,6 +218,8 @@
+
+
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 368f7bb..99999e4 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -218,6 +218,8 @@
+
+
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 305b7dc..7018c10 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -218,6 +218,8 @@
+
+
@@ -514,8 +516,6 @@
-
-
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index dfcc640..0ab6a8d 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -218,6 +218,8 @@
+
+