Fix style + fix icons