fixing icons, other stuff