design & alignment enhancements, remove icon html-elements to keep a single grain smaller