Fixes the torch and flare icons.

This fixes the flare and torch icons not always having an appropriate inhand icon for all cases.
Fixes #5733 .

EDIT: I've added the changes from PR 5829 to my PR to avoid further merge conflict so both my changes and @Miauw62 's can be pushed now together.
From PR https://github.com/tgstation/-tg-station/pull/5829 :
Fixed #5752
Fixed #4755