Merge from beltbar_improvements (icon on belt icons when flashlight/laser attachments are on, better contrast on belt bar item counts)