New icons and rearrangement of icons and others

Added new icons and rearrangement of icons and others, as well as bug
fixes.