Smiles and icons fixed