update styling for all pages and more ico fonts
fix merge conflicts