fixed icons
Merge branch 'master' into loader
fix permalinks