fixed icons and such