Updated icons and variable names