Changes on when to show icon and fixing some style parsing