Iconia res fixed
Merge branch 'Acer-Iconia'