Fixing up icon and titles.