Fix Icons ordering Derp

Change-Id: Ib5581c2ec43456f84325d1f148ceeee6130088b1
Merge "Fix Icons ordering Derp" into jb4.2