While there, move some stray menu items to their respective module
menu and minimise the padding of the menu to reclaim the space added
by the fixed-width icon behaviour.

Looking good!  :)

Suggested by: @8191