Footer icon fixes, theme includes cleanup