Added icons, small fixes