Deconnection + Icone
fix merging