Improved icons
Moving towards more external tablet config