Fix icon font + clean up