trim down the number of touch icons and back out some changes