code restructure and bugfixes, reload icons in contact list