Added all icons and little cleaning.