diff --git a/apparmor.d/abstractions/bus/org.freedesktop.UPower b/apparmor.d/abstractions/bus/org.freedesktop.UPower
index ac83968e..2bd80c9a 100644
--- a/apparmor.d/abstractions/bus/org.freedesktop.UPower
+++ b/apparmor.d/abstractions/bus/org.freedesktop.UPower
@@ -17,7 +17,7 @@
        member={Get,GetAll}
        peer=(name=:*, label=upowerd),
 
-  dbus receive bus=system path=/org/freedesktop/UPower/devices/{mouse_hidpp_battery_0,battery_BAT0}
+  dbus receive bus=system path=/org/freedesktop/UPower/devices/*
        interface=org.freedesktop.DBus.Properties
        member=PropertiesChanged
        peer=(name=:*, label=upowerd),
diff --git a/apparmor.d/groups/kde/dolphin b/apparmor.d/groups/kde/dolphin
index 3fd75c45..0c1d1b2a 100644
--- a/apparmor.d/groups/kde/dolphin
+++ b/apparmor.d/groups/kde/dolphin
@@ -80,7 +80,7 @@ profile dolphin @{exec_path} {
   owner @{PROC}/@{pid}/mountinfo r,
   owner @{PROC}/@{pid}/mounts r,
 
-  @{sys}/devices/virtual/block/dm-0/uevent r,
+  @{sys}/devices/virtual/block/dm-@{int}/uevent r,
 
   /dev/tty r,
 
diff --git a/apparmor.d/groups/kde/konsole b/apparmor.d/groups/kde/konsole
index 097970ff..76ce0cb5 100644
--- a/apparmor.d/groups/kde/konsole
+++ b/apparmor.d/groups/kde/konsole
@@ -15,8 +15,8 @@ profile konsole @{exec_path} flags=(attach_disconnected) {
   include <abstractions/consoles>
   include <abstractions/dri>
   include <abstractions/kde-strict>
+  include <abstractions/mesa>
   include <abstractions/nameservice-strict>
-  include <abstractions/ubuntu-xterm>
 
   ptrace (read),
 
@@ -44,7 +44,6 @@ profile konsole @{exec_path} flags=(attach_disconnected) {
   owner @{user_config_dirs}/konsolerc.@{rand6} rwl -> @{user_config_dirs}/#@{int},
 
   owner @{user_cache_dirs}/icon-cache.kcache rw,
-  owner @{user_cache_dirs}/mesa_shader_cache/index rw,
 
   owner @{user_share_dirs}/konsole/{,**} rw,
 
@@ -60,7 +59,6 @@ profile konsole @{exec_path} flags=(attach_disconnected) {
 
   owner @{PROC}/@{pid}/cmdline r,
   owner @{PROC}/@{pid}/stat r,
-  @{PROC}/sys/dev/i915/perf_stream_paranoid r,
   @{PROC}/sys/kernel/core_pattern r,
 
   include if exists <local/konsole>