diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 8e9c5ee9..712787aa 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -30,7 +30,7 @@ in
       };
 
       home.packages = [
-        gnome3.seahorse
+        gnome.seahorse
         keepassxc
         libsecret
         qMasterPassword
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 7549f680..bd94e375 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -89,10 +89,11 @@ in
 
         flameshot
         libnotify
-        gnome3.adwaita-icon-theme
+        gnome.adwaita-icon-theme
         gnome.eog
-        gnome3.nautilus
+        gnome.nautilus
         gnome.yelp
+        hicolor-icon-theme
 
         wine
 
@@ -113,7 +114,7 @@ in
         enable = true;
         font.name = "Lato";
         iconTheme = {
-          package = pkgs.papirus-maia-icon-theme;
+          package = pkgs.papirus-icon-theme;
           name = "Papirus-Adapta-Nokto-Maia";
         };
         theme = {
diff --git a/modules/office/default.nix b/modules/office/default.nix
index c1b552b7..204e3ae8 100644
--- a/modules/office/default.nix
+++ b/modules/office/default.nix
@@ -17,7 +17,7 @@ in
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
         libreoffice-fresh
-        gnome3.simple-scan
+        gnome.simple-scan
         # Tools like pdfunite
         poppler_utils
         # tool for annotating PDFs