Update & Fix some icons {WIP}