css: icons: match our icons as well as generic font-awesome

(also some sass cleanup)