Fix icons and load character dialog

Messed up the conflicts during the merge...