shuffling favicons

Change-Id: I4f7d20091c07373c92f6a4002f60939b896f2254
Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I3657633da5615920c59609670e0997266a5dfaa1