Fixed some bugs with icons and positions.