#30 Better alignment of icons