Fixed icons and more