Fix bugs, icons are reloaded