diff --git a/gnome-themes-extra.spec b/gnome-themes-extra.spec
index a7c9473..6e89876 100644
--- a/gnome-themes-extra.spec
+++ b/gnome-themes-extra.spec
@@ -1,6 +1,6 @@
 Name:           gnome-themes-extra
 Version:        3.28
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        GNOME Extra Themes
 
 License:        LGPLv2+
@@ -19,6 +19,7 @@ BuildRequires:  /usr/bin/gtk-update-icon-cache
 
 Recommends: (adwaita-gtk2-theme = %{version}-%{release} if gtk2)
 Requires: adwaita-icon-theme
+Requires: highcontrast-icon-theme = %{version}-%{release}
 
 # Renamed in F28
 Obsoletes: gnome-themes-standard < 3.28
@@ -46,11 +47,24 @@ Not to be confused with gnome-themes-extras.
 %package -n adwaita-gtk2-theme
 Summary: Adwaita gtk2 theme
 Requires: gtk2%{_isa}
+# cursor and icon themes required for the theme
+Requires: adwaita-cursor-theme
+Requires: adwaita-icon-theme
+Requires: highcontrast-icon-theme = %{version}-%{release}
 
 %description -n adwaita-gtk2-theme
 The adwaita-gtk2-theme package contains a gtk2 theme for presenting widgets
 with a GNOME look and feel.
 
+%package -n highcontrast-icon-theme
+Summary: HighContrast icon theme
+BuildArch: noarch
+# Split out to a new subpackage in gnome-themes-standard 3.28-12
+Conflicts: gnome-themes-standard < 3.28-12
+
+%description -n highcontrast-icon-theme
+This package contains the HighContrast icon theme used by the GNOME desktop.
+
 %prep
 %autosetup -p1
 
@@ -68,15 +82,21 @@ touch $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast/icon-theme.cache
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-2.0
 cp -a $RPM_SOURCE_DIR/gtkrc $RPM_BUILD_ROOT%{_datadir}/gtk-2.0/gtkrc
 
-%transfiletriggerin -- %{_datadir}/icons/HighContrast
+%transfiletriggerin -n highcontrast-icon-theme -- %{_datadir}/icons/HighContrast
 gtk-update-icon-cache --force %{_datadir}/icons/HighContrast &>/dev/null || :
 
-%transfiletriggerpostun -- %{_datadir}/icons/HighContrast
+%transfiletriggerpostun -n highcontrast-icon-theme -- %{_datadir}/icons/HighContrast
 gtk-update-icon-cache --force %{_datadir}/icons/HighContrast &>/dev/null || :
 
 %files
 %license LICENSE
 %doc NEWS README.md
+%{_datadir}/themes/Adwaita/gtk-3.0/
+%{_datadir}/themes/Adwaita-dark/gtk-3.0/
+%{_datadir}/themes/HighContrast/gtk-3.0/
+
+%files -n highcontrast-icon-theme
+%license LICENSE
 %dir %{_datadir}/icons/HighContrast
 %{_datadir}/icons/HighContrast/16x16/
 %{_datadir}/icons/HighContrast/22x22/
@@ -87,9 +107,6 @@ gtk-update-icon-cache --force %{_datadir}/icons/HighContrast &>/dev/null || :
 %{_datadir}/icons/HighContrast/scalable/
 %{_datadir}/icons/HighContrast/index.theme
 %ghost %{_datadir}/icons/HighContrast/icon-theme.cache
-%{_datadir}/themes/Adwaita/gtk-3.0/
-%{_datadir}/themes/Adwaita-dark/gtk-3.0/
-%{_datadir}/themes/HighContrast/gtk-3.0/
 
 %files -n adwaita-gtk2-theme
 %license LICENSE
@@ -106,6 +123,10 @@ gtk-update-icon-cache --force %{_datadir}/icons/HighContrast &>/dev/null || :
 %{_datadir}/themes/HighContrast/index.theme
 
 %changelog
+* Mon Feb 15 2021 Kalev Lember <klember@redhat.com> - 3.28-12
+- Split highcontrast-icon-theme out to a new subpackage
+- Explicitly require cursor and icon themes required for the gtk2 themes
+
 * Mon Feb 08 2021 Kalev Lember <klember@redhat.com> - 3.28-11
 - Make adwaita-gtk2-theme recommends conditional on gtk2 being installed