Clear up logic of pre-session, enhance icon creation