(Bug 5095) Fix conflicting link/background combos in Hot Chocolate

Note - Bug 5179 needs to be committed first for layer compilation to succeed.