The second tweak made (for the case without an icon) was causing superfluous spacing all over the UI for things like checkboxes + combo-boxes + text widgets. This was quite ugly and gave readability issues with the checkboxes in particular.