Refactored colors,layout,icons,SCSS, refs #9421