Merge pull request #3809
1bcf81e gui: Prevent status icons from being cut off (Wladimir J. van der Laan)