Swap bookmarked/unbookmarked icons. Other UI fixes.