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 .