Adjusted terminologies, some icons