More Than 45 fixes on style and icons