finished switch to haml (except devise views), renamed some icons for clarity