Icons cleaned up and misc