Refinement of style and icons