[D#631] more updates for css and icon placement