diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py
index b91b0cb58af..b330e45a814 100644
--- a/scripts/startup/bl_operators/wm.py
+++ b/scripts/startup/bl_operators/wm.py
@@ -2417,8 +2417,8 @@ class WM_OT_tool_set_by_brush_type(Operator):
         # Lookup a tool with a matching brush type (ignoring some specific ones).
         tool_id = "builtin.brush"
         for item in ToolSelectPanelHelper._tools_flatten(
-            tool_helper_cls.tools_from_context(
-                context, mode=context.mode)):
+                tool_helper_cls.tools_from_context(context, mode=context.mode),
+        ):
             if item is None:
                 continue
 
diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py
index d2b7e7b3140..6f54ca88832 100644
--- a/scripts/startup/bl_ui/space_view3d.py
+++ b/scripts/startup/bl_ui/space_view3d.py
@@ -222,7 +222,12 @@ class VIEW3D_HT_tool_header(Header):
             layout.popover_group(context=".particlemode", **popover_kw)
         elif mode_string == 'OBJECT':
             layout.popover_group(context=".objectmode", **popover_kw)
-        elif mode_string in {'PAINT_GPENCIL', 'EDIT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
+        elif mode_string in {
+                'PAINT_GPENCIL',
+                'EDIT_GPENCIL',
+                'SCULPT_GPENCIL',
+                'WEIGHT_GPENCIL',
+        }:
             # Grease pencil layer.
             gpl = context.active_gpencil_layer
             if gpl and gpl.info is not None:
@@ -245,7 +250,8 @@ class VIEW3D_HT_tool_header(Header):
             'PAINT_GREASE_PENCIL',
             'SCULPT_GREASE_PENCIL',
             'WEIGHT_GREASE_PENCIL',
-                'VERTEX_GREASE_PENCIL'}:
+            'VERTEX_GREASE_PENCIL',
+        }:
             row = layout.row(align=True)
             row.prop(tool_settings, "use_grease_pencil_multi_frame_editing", text="")
 
@@ -253,7 +259,8 @@ class VIEW3D_HT_tool_header(Header):
                 'EDIT_GREASE_PENCIL',
                 'SCULPT_GREASE_PENCIL',
                 'WEIGHT_GREASE_PENCIL',
-                    'VERTEX_GREASE_PENCIL'}:
+                'VERTEX_GREASE_PENCIL',
+            }:
                 sub = row.row(align=True)
                 sub.active = tool_settings.use_grease_pencil_multi_frame_editing
                 sub.popover(
@@ -806,7 +813,7 @@ class VIEW3D_HT_header(Header):
         scene = context.scene
 
         # Orientation
-        if object_mode in {'OBJECT', 'EDIT', 'EDIT_GPENCIL'} or has_pose_mode:
+        if has_pose_mode or object_mode in {'OBJECT', 'EDIT', 'EDIT_GPENCIL'}:
             orient_slot = scene.transform_orientation_slots[0]
             row = layout.row(align=True)
 
@@ -819,7 +826,7 @@ class VIEW3D_HT_header(Header):
             )
 
         # Pivot
-        if object_mode in {'OBJECT', 'EDIT', 'EDIT_GPENCIL', 'SCULPT_GPENCIL'} or has_pose_mode:
+        if has_pose_mode or object_mode in {'OBJECT', 'EDIT', 'EDIT_GPENCIL', 'SCULPT_GPENCIL'}:
             layout.prop(tool_settings, "transform_pivot_point", text="", icon_only=True)
 
         # Snap
@@ -827,10 +834,11 @@ class VIEW3D_HT_header(Header):
         if obj is None:
             show_snap = True
         else:
-            if (object_mode not in {
-                    'SCULPT', 'SCULPT_CURVES', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT',
+            if has_pose_mode or (object_mode not in {
+                    'SCULPT', 'SCULPT_CURVES',
+                    'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT',
                     'PAINT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL', 'VERTEX_GPENCIL',
-            }) or has_pose_mode:
+            }):
                 show_snap = True
             else: