Re-arranged styles to make icon class more reusable