diff --git a/apparmor.d/abstractions/freedesktop.org.d/complete b/apparmor.d/abstractions/freedesktop.org.d/complete
index c9f714ac..7313fbca 100644
--- a/apparmor.d/abstractions/freedesktop.org.d/complete
+++ b/apparmor.d/abstractions/freedesktop.org.d/complete
@@ -10,6 +10,9 @@
   @{system_share_dirs}/glib-2.0/schemas/ r,
   @{system_share_dirs}/glib-2.0/schemas/gschemas.compiled r,
 
+  @{system_share_dirs}/ r,
+  @{system_share_dirs}/mime/ r,
+
   /usr/share/mime/ r,
 
   /etc/gnome/defaults.list r,
diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal b/apparmor.d/groups/freedesktop/xdg-desktop-portal
index ade5d9f9..257ac4f0 100644
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal
@@ -78,9 +78,6 @@ profile xdg-desktop-portal @{exec_path} flags=(attach_disconnected) {
 
   /var/lib/gdm{,3}/greeter-dconf-defaults r,
 
-  /var/lib/flatpak/exports/share/mime/mime.cache r,
-  /var/lib/flatpak/exports/share/applications/{**,} r,
-
   @{user_config_dirs}/kioslaverc r,
 
   owner @{tmp}/icon* rw,
diff --git a/apparmor.d/groups/gnome/gnome-control-center-goa-helper b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
index b858ab8e..f3c87abc 100644
--- a/apparmor.d/groups/gnome/gnome-control-center-goa-helper
+++ b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
@@ -46,8 +46,6 @@ profile gnome-control-center-goa-helper @{exec_path} {
   /usr/share/cracklib/* r,
   /usr/share/publicsuffix/public_suffix_list.dafsa r,
 
-  /var/lib/flatpak/exports/share/icons/{,**} r,
-
   owner @{user_config_dirs}/goa-1.0/accounts.conf r,
 
   owner @{user_cache_dirs}/gnome-control-center-goa-helper/{,**} rwl,
diff --git a/apparmor.d/groups/gnome/gnome-shell b/apparmor.d/groups/gnome/gnome-shell
index 7f76ff3f..8e2c7c67 100644
--- a/apparmor.d/groups/gnome/gnome-shell
+++ b/apparmor.d/groups/gnome/gnome-shell
@@ -196,7 +196,6 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   /usr/share/gdm/BuiltInSessions/{,*.desktop} r,
   /usr/share/gdm/greeter-dconf-defaults r,
   /usr/share/gdm/greeter/applications/{,**} r,
-  /usr/share/gnome-shell/{,**} r,
   /usr/share/libgweather/Locations.xml r,
   /usr/share/libinput*/ r,
   /usr/share/libinput*/{,**/}[0-9][0-9]-*.quirks r,
@@ -205,6 +204,7 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   /usr/share/wallpapers/** r,
   /usr/share/wayland-sessions/{,*.desktop} r,
   /usr/share/xml/iso-codes/{,**} r,
+  @{system_share_dirs}/gnome-shell/{,**} r,
 
   / r,
   /.flatpak-info r,
@@ -217,7 +217,6 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
 
   /var/lib/flatpak/app/**/gnome-shell/{,**} r,
   /var/lib/flatpak/appstream/**/icons/** r,
-  /var/lib/flatpak/exports/share/gnome-shell/{,**} r,
 
   owner @{GDM_HOME}/greeter-dconf-defaults r,
   owner @{gdm_cache_dirs}/ w,
diff --git a/apparmor.d/groups/gnome/tracker-extract b/apparmor.d/groups/gnome/tracker-extract
index d9bd673b..66beccbb 100644
--- a/apparmor.d/groups/gnome/tracker-extract
+++ b/apparmor.d/groups/gnome/tracker-extract
@@ -49,9 +49,6 @@ profile tracker-extract @{exec_path} flags=(attach_disconnected) {
   /etc/blkid.conf r,
   /etc/fstab r,
 
-  /var/lib/flatpak/exports/share/applications/mimeinfo.cache r,
-  /var/lib/flatpak/exports/share/mime/mime.cache r,
-
   owner @{GDM_HOME}/greeter-dconf-defaults r,
   owner @{gdm_cache_dirs}/ rw,
   owner @{gdm_cache_dirs}/fontconfig/[a-f0-9]*.cache-?{,.NEW,.LCK,.TMP-*} rw,
diff --git a/apparmor.d/groups/kde/ksmserver b/apparmor.d/groups/kde/ksmserver
index cdceeb39..e38c2a1f 100644
--- a/apparmor.d/groups/kde/ksmserver
+++ b/apparmor.d/groups/kde/ksmserver
@@ -41,8 +41,6 @@ profile ksmserver @{exec_path} flags=(attach_disconnected,mediate_deleted) {
   /etc/xdg/kscreenlockerrc r,
   /etc/xdg/menus/ r,
 
-  /var/lib/flatpak/exports/share/mime/ r,
-
   owner @{HOME}/@{rand6} rw,
   owner @{HOME}/.Xauthority rw,
 
diff --git a/apparmor.d/groups/kde/ksmserver-logout-greeter b/apparmor.d/groups/kde/ksmserver-logout-greeter
index fa8bd0b9..a13b08f3 100644
--- a/apparmor.d/groups/kde/ksmserver-logout-greeter
+++ b/apparmor.d/groups/kde/ksmserver-logout-greeter
@@ -30,8 +30,6 @@ profile ksmserver-logout-greeter @{exec_path} flags=(attach_disconnected) {
   /usr/share/plasma/desktoptheme/** r,
   /usr/share/plasma/look-and-feel/** r,
   /var/lib/AccountsService/icons/ r,
-  /var/lib/flatpak/exports/share/icons/{,**} r,
-  /var/lib/flatpak/exports/share/mime/generic-icons r,
 
   owner @{HOME}/ r,
 
diff --git a/apparmor.d/groups/kde/kstart b/apparmor.d/groups/kde/kstart
index aca93c0e..1080978c 100644
--- a/apparmor.d/groups/kde/kstart
+++ b/apparmor.d/groups/kde/kstart
@@ -22,8 +22,6 @@ profile kstart @{exec_path} flags=(attach_disconnected) {
   @{bin}/** rPUx,
   @{bin}/konsole rPx,
 
-  /var/lib/flatpak/exports/share/mime/ r,
-
   owner @{user_cache_dirs}/mesa_shader_cache/index rw,
   owner @{user_share_dirs}/kservices{5,6}/ r,
   owner @{user_share_dirs}/kservices{5,6}/ServiceMenus/ r,
diff --git a/apparmor.d/groups/kde/plasma-browser-integration-host b/apparmor.d/groups/kde/plasma-browser-integration-host
index c6a5a8d0..93b11c81 100644
--- a/apparmor.d/groups/kde/plasma-browser-integration-host
+++ b/apparmor.d/groups/kde/plasma-browser-integration-host
@@ -28,8 +28,6 @@ profile plasma-browser-integration-host @{exec_path} {
   /etc/xdg/menus/ r,
   /etc/xdg/taskmanagerrulesrc r,
 
-  /var/lib/flatpak/exports/share/mime/ r,
-
   owner @{user_cache_dirs}/icon-cache.kcache rw,
   owner @{user_cache_dirs}/ksycoca{5,6}_* r,
 
diff --git a/apparmor.d/groups/kde/plasmashell b/apparmor.d/groups/kde/plasmashell
index 172a8365..b0f2f634 100644
--- a/apparmor.d/groups/kde/plasmashell
+++ b/apparmor.d/groups/kde/plasmashell
@@ -85,7 +85,6 @@ profile plasmashell @{exec_path} flags=(mediate_deleted) {
   /etc/xdg/** r,
 
   /var/lib/AccountsService/icons/* r,
-  /var/lib/flatpak/exports/share/mime/ r,
 
         @{HOME}/ r,
   owner @{HOME}/@{XDG_DESKTOP_DIR}/*.desktop r,
diff --git a/apparmor.d/profiles-g-l/gtk-update-icon-cache b/apparmor.d/profiles-g-l/gtk-update-icon-cache
index 6a1a8dd5..917332e3 100644
--- a/apparmor.d/profiles-g-l/gtk-update-icon-cache
+++ b/apparmor.d/profiles-g-l/gtk-update-icon-cache
@@ -14,13 +14,9 @@ profile gtk-update-icon-cache @{exec_path} flags=(attach_disconnected) {
 
   @{exec_path} mr,
 
-  /usr/share/icons/** r,
-  /usr/share/icons/**/.icon-theme.cache rw,
-  /usr/share/icons/**/icon-theme.cache rw,
-
-  /var/lib/flatpak/exports/share/icons/{,**/} r,
-  /var/lib/flatpak/exports/share/icons/hicolor/.icon-theme.cache rw,
-  /var/lib/flatpak/exports/share/icons/hicolor/icon-theme.cache w,
+  @{system_share_dirs}/icons/{,**/} r,
+  @{system_share_dirs}/icons/**/.icon-theme.cache rw,
+  @{system_share_dirs}/icons/**/icon-theme.cache w,
 
   owner @{user_share_dirs}/** r,
   owner @{user_share_dirs}/**/.icon-theme.cache rw,