Better toolbox padding between button groups
Fix the right shifting fix being overriden