merge and icons fix
Some works on schemes designer