Combined separate image and button links into single ones (take 2).