Fix missing tag validation in all icon conditions

Added a check to ensure the second portion of the tag exists before using it across all icon types. This prevents potential errors when the tag format is incorrect or incomplete.