Refs #3619
 * Updating icons
 * Tooltip more readable
 * putting language in General and deprecating redundant translation
Merge remote-tracking branch 'origin/master'