Added icons

Added icons and some fixes