Merge "Fixing issue where holgoraphic icon backgrounds were not being drawn."