Merge "Move footer icons to assets/ directory"