Icons adjusted, checking bugs