diff --git a/.gitignore b/.gitignore
index ff4693f..37cef29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gnome-themes-standard-3.22.2.tar.xz
+SOURCES/gnome-themes-extra-3.28.tar.xz
diff --git a/.gnome-themes-standard.metadata b/.gnome-themes-standard.metadata
index 9babb0c..41facde 100644
--- a/.gnome-themes-standard.metadata
+++ b/.gnome-themes-standard.metadata
@@ -1 +1 @@
-bbb0e8473007091e88975773086d34d0e0208638 SOURCES/gnome-themes-standard-3.22.2.tar.xz
+8c69c3e2c84bc0fc3853ce5f1e529fa2471571c3 SOURCES/gnome-themes-extra-3.28.tar.xz
diff --git a/SOURCES/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch b/SOURCES/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch
deleted file mode 100644
index c29e69c..0000000
--- a/SOURCES/0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ae703a57261c26ad9f7dd328fd110046a7456bbd Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Wed, 12 Oct 2016 23:37:49 +0200
-Subject: [PATCH] Install Adwaita-dark css file in the right directory
-
----
- themes/Adwaita-dark/gtk-3.0/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/themes/Adwaita-dark/gtk-3.0/Makefile.am b/themes/Adwaita-dark/gtk-3.0/Makefile.am
-index bc0a73e..5cbcf63 100644
---- a/themes/Adwaita-dark/gtk-3.0/Makefile.am
-+++ b/themes/Adwaita-dark/gtk-3.0/Makefile.am
-@@ -1,4 +1,4 @@
--themedir = $(datadir)/themes/Adwaita/gtk-3.0
-+themedir = $(datadir)/themes/Adwaita-dark/gtk-3.0
- 
- theme_DATA = gtk.css
- 
--- 
-2.7.4
-
-diff -up gnome-themes-standard-3.22.2/themes/Adwaita-dark/gtk-3.0/Makefile.in.orig gnome-themes-standard-3.22.2/themes/Adwaita-dark/gtk-3.0/Makefile.in
---- gnome-themes-standard-3.22.2/themes/Adwaita-dark/gtk-3.0/Makefile.in.orig	2016-11-17 02:59:53.309849034 +0100
-+++ gnome-themes-standard-3.22.2/themes/Adwaita-dark/gtk-3.0/Makefile.in	2016-11-17 03:00:11.278732581 +0100
-@@ -291,7 +291,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--themedir = $(datadir)/themes/Adwaita/gtk-3.0
-+themedir = $(datadir)/themes/Adwaita-dark/gtk-3.0
- theme_DATA = gtk.css
- EXTRA_DIST = $(theme_DATA)
- all: all-am
diff --git a/SPECS/gnome-themes-standard.spec b/SPECS/gnome-themes-standard.spec
index 063b398..74f6e5c 100644
--- a/SPECS/gnome-themes-standard.spec
+++ b/SPECS/gnome-themes-standard.spec
@@ -2,18 +2,16 @@
 %global gtk3_version 3.9.12
 
 Name: gnome-themes-standard
-Version: 3.22.2
+Version: 3.28
 Release: 2%{?dist}
 Summary: Standard themes for GNOME applications
 
 License: LGPLv2+
-URL: http://git.gnome.org/browse/gnome-themes-standard
-Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
+URL: https://gitlab.gnome.org/GNOME/gnome-themes-extra
+Source0: http://download.gnome.org/sources/gnome-themes-extra/3.28/gnome-themes-extra-%{version}.tar.xz
 Source2: gtkrc
 Source3: metacity-theme-2.xml
 
-# Backported from upstream
-Patch0: 0001-Install-Adwaita-dark-css-file-in-the-right-directory.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1549711
 Patch1: 0001-Do-not-set-treeview-colors.patch
 
@@ -25,6 +23,7 @@ BuildRequires: /usr/bin/gtk-update-icon-cache
 Requires: abattis-cantarell-fonts
 Requires: adwaita-gtk2-theme = %{version}-%{release}
 Requires: adwaita-icon-theme
+Requires: google-noto-emoji-color-fonts
 
 Conflicts: adwaita-gtk3-theme < 3.13.3
 
@@ -42,8 +41,7 @@ The adwaita-gtk2-theme package contains a gtk2 theme for presenting widgets
 with a GNOME look and feel.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n gnome-themes-extra-%{version}
 %patch1 -p1
 
 %build
@@ -81,7 +79,7 @@ for t in HighContrast; do
 done
 
 %files
-%license COPYING
+%license LICENSE
 %doc NEWS
 %dir %{_datadir}/icons/HighContrast
 %{_datadir}/icons/HighContrast/16x16/
@@ -114,6 +112,14 @@ done
 %{_datadir}/themes/HighContrast/index.theme
 
 %changelog
+* Thu Jul 26 2018 Peng Wu <pwu@redhat.com> - 3.28-2
+- Requires google-noto-emoji-color-fonts
+- Resolves: #1595172
+
+* Thu May 24 2018 Kalev Lember <klember@redhat.com> - 3.28-1
+- Update to 3.28
+- Resolves: #1568633
+
 * Thu Mar 22 2018 Kalev Lember <klember@redhat.com> - 3.22.2-2
 - Do not set treeview colors
 - Resolves: #1549711