Back the icons
Merge branch 'wayback'