More fixing, especially mail icons ^^