Second half of revert of toolbar button size: Refs bgo#723578

This code must also remain, as it deals with situations where
spacers are placed before or after the linked buttons.