Added Icons + username check