Add SymbolIcon.
Fix missing include.
Remove unnecessary forward decls.