consistency

some consistency changes, updated some icons as well