diff --git a/hosts/nixos/home/partials/gnome/dconf.nix b/hosts/nixos/home/partials/gnome/dconf.nix
index d5258b6..9b4e90d 100644
--- a/hosts/nixos/home/partials/gnome/dconf.nix
+++ b/hosts/nixos/home/partials/gnome/dconf.nix
@@ -6,7 +6,8 @@
 with lib.hm.gvariant;
 {
   home.packages = with pkgs; [
-    numix-icon-theme-square
+    gnome-tweaks
+    papirus-icon-theme
   ];
 
   dconf = {
@@ -45,7 +46,7 @@ with lib.hm.gvariant;
       };
 
       "org/gnome/desktop/interface" = {
-        icon-theme = "Numix-Square";
+        icon-theme = "Papirus";
         accent-color = "teal";
         color-scheme = "prefer-dark";
       };
diff --git a/hosts/nixos/system/partials/flatpak.nix b/hosts/nixos/system/partials/flatpak.nix
index a2abe40..0b5ea02 100644
--- a/hosts/nixos/system/partials/flatpak.nix
+++ b/hosts/nixos/system/partials/flatpak.nix
@@ -8,9 +8,5 @@
 
   services.flatpak.packages = [
     "io.github.flattool.Warehouse"
-    "org.gnome.Papers"
-    "org.gnome.Loupe"
-    "org.gnome.Showtime"
-    "io.github.alainm23.planify"
   ];
 }
diff --git a/modules/system/nixos/apps/gnome/apps.nix b/modules/system/nixos/apps/gnome/apps.nix
index 0ba538e..c236417 100644
--- a/modules/system/nixos/apps/gnome/apps.nix
+++ b/modules/system/nixos/apps/gnome/apps.nix
@@ -15,7 +15,14 @@ in
   config = mkIf cfg.enable {
 
     environment = {
-      systemPackages = with pkgs; [ nautilus ];
+      systemPackages =
+        with pkgs;
+        [ nautilus ]
+        ++ [
+          papers
+          loupe
+          celluloid
+        ];
     };
 
     services.gvfs.enable = true; # SMB, FTP, ... access