Fix the derpage with H+ icons and QuickSettings icons

Change-Id: I2480a1ff9bbcd3eb6df1eb1eee3e5e493f4141d0