swap in more vanir images.. get back some o' that vanir feelin'

Change-Id: I08981ef6de202999e38597e63cc17736360bacd3
rearrange settings headers to pre-4.4 state: add back the voodoo

Change-Id: I1d80482f691f2abae9840f51782bb3b537996eba