diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
new file mode 100644
index 000000000000..731d6158304b
--- /dev/null
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "paper-icon-theme";
+  version = "2016-05-21";
+
+  src = fetchFromGitHub {
+    owner = "snwh";
+    repo = package-name;
+    rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7";
+    sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  installPhase = ''
+    make install DESTDIR="$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Modern icon theme designed around bold colours and simple geometric shapes";
+    homepage = http://snwh.org/paper;
+    license = with licenses; [ cc-by-sa-40 lgpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix
deleted file mode 100644
index c7cf3a871b58..000000000000
--- a/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub, gtk }:
-
-stdenv.mkDerivation rec {
-  version = "6a5f14cfe697b0a829456a1fd560acdcddc6043f";
-  name = "paper-gtk-theme-${version}";
-
-  src = fetchFromGitHub {
-    owner = "snwh";
-    repo = "paper-gtk-theme";
-    sha256 = "0kyn3a6sq0z22vds6szl630jv20pjskjbdg0wc8abxzwg0vwxc5m";
-    rev = version;
-  };
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/share/themes/Paper/
-    cp -r ./Paper/ $out/share/themes/
-  '';
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = "http://snwh.org/paper/";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.simonvandel ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
new file mode 100644
index 000000000000..ccff20dd929d
--- /dev/null
+++ b/pkgs/misc/themes/paper-gtk-theme/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
+
+stdenv.mkDerivation rec {
+  version = "2016-05-18";
+  name = "paper-gtk-theme-${version}";
+
+  src = fetchFromGitHub {
+    owner = "snwh";
+    repo = "paper-gtk-theme";
+    rev = "5113d58dc64de70fcc75ad2d6d05c8c8dae2de7f";
+    sha256 = "1j9l50iyvadpqsq5v14zgml24jgraajr5kl9ji0ar62nlak2bi8s";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ gtk_engines ];
+
+  installPhase = ''
+    make install DESTDIR="$out"
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
+    homepage = "http://snwh.org/paper";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.simonvandel maintainers.romildo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e3581aea355..1a739e228ab7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2801,7 +2801,7 @@ in
 
   pamtester = callPackage ../tools/security/pamtester { };
 
-  paper-gtk-theme = callPackage ../misc/themes/gtk3/paper-gtk-theme { };
+  paper-gtk-theme = callPackage ../misc/themes/paper-gtk-theme { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
 
@@ -11592,6 +11592,8 @@ in
 
   opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
 
+  paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
+
   pecita = callPackage ../data/fonts/pecita {};
 
   paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {};