Fixed icons and defaults