diff --git a/apparmor.d/abstractions/ubuntu-unity7-base.d/complete b/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
index a76b37d4..7eabd92e 100644
--- a/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
+++ b/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
@@ -1,11 +1,15 @@
 # apparmor.d - Full set of apparmor profiles
 # SPDX-License-Identifier: GPL-2.0-only
 
-  dbus send
-    bus="session" path="/org/gtk/vfs/mounttracker"   interface="org.gtk.vfs.MountTracker" member="ListMountableInfo",
+  dbus send bus=session path=/org/gtk/vfs/mounttracker
+       interface=org.gtk.vfs.MountTracker
+       member=ListMountableInfo,
 
-  dbus send
-    bus="session" path="/org/gtk/vfs/Daemon"         interface="org.gtk.vfs.Daemon" member="ListMonitorImplementations",
+  dbus send bus=session path=/org/gtk/vfs/Daemon
+       interface=org.gtk.vfs.Daemon
+       member=ListMonitorImplementations,
 
-  dbus send
-    bus="session" path="/org/gtk/Settings"           interface="org.freedesktop.DBus.Properties" member="GetAll" peer=(name=":*"),
+  dbus send bus=session path=/org/gtk/Settings
+       interface=org.freedesktop.DBus.Properties
+       member=GetAll
+       peer=(name=:*),
diff --git a/apparmor.d/groups/apps/thunderbird b/apparmor.d/groups/apps/thunderbird
index 4035c19c..aabd5501 100644
--- a/apparmor.d/groups/apps/thunderbird
+++ b/apparmor.d/groups/apps/thunderbird
@@ -53,6 +53,28 @@ profile thunderbird @{exec_path} {
   owner @{PROC}/@{pid}/gid_map w,
   owner @{PROC}/@{pid}/uid_map w,
 
+  dbus send bus=session path=/org/freedesktop/DBus
+       interface=org.freedesktop.DBus
+       member=RequestName
+       peer=(name=org.freedesktop.DBus),
+
+  dbus send bus=system path=/org/freedesktop/RealtimeKit[0-9]*
+       member={Get,MakeThreadHighPriority,MakeThreadRealtime}
+       peer=(name=org.freedesktop.RealtimeKit[0-9]*),
+
+  dbus send bus=system path=/org/freedesktop/UPower
+       interface=org.freedesktop.UPower
+       member=EnumerateDevices
+       peer=(name=org.freedesktop.UPower),
+
+  dbus send bus=session path=/ca/desrt/dconf/Writer/user
+       interface=ca.desrt.dconf.Writer
+       member={Change,Notify}
+       peer=(name=ca.desrt.dconf),
+
+  dbus bind bus=session
+       name=org.mozilla.thunderbird.*,
+
   @{exec_path} mrix,
   @{MOZ_LIBDIR}/thunderbird-wrapper-helper.sh rix,
 
@@ -197,22 +219,6 @@ profile thunderbird @{exec_path} {
   owner /dev/tty[0-9]* rw,
   owner @{HOME}/.xsession-errors w,
 
-  # DBus
-  dbus send
-    bus="session" path="/org/freedesktop/DBus" interface="org.freedesktop.DBus" member="RequestName" peer=(name="org.freedesktop.DBus"),
-
-  dbus send
-    bus="system" path="/org/freedesktop/RealtimeKit[0-9]*" member="{Get,MakeThreadHighPriority,MakeThreadRealtime}" peer=(name="org.freedesktop.RealtimeKit[0-9]*"),
-
-  dbus send
-    bus="system" path="/org/freedesktop/UPower" interface="org.freedesktop.UPower" member="EnumerateDevices" peer=(name="org.freedesktop.UPower"),
-
-  dbus send
-    bus="session" path="/ca/desrt/dconf/Writer/user" interface="ca.desrt.dconf.Writer" member="{Change,Notify}" peer=(name="ca.desrt.dconf"),
-
-  dbus bind
-    bus="session" name="org.mozilla.thunderbird.*",
-
   # dconf write
   owner @{HOME}/.config/dconf/     rw,
   owner @{HOME}/.config/dconf/user rw,