What if you migrate the past icons with emotes in the emotes tab!
for example, the past worlds icons/baron icon for an emote. instead of removing your mastery badges key for this emotes feature, why not just migrate them into the emotes tab?
pictures of this icons:
https://cdn.vox-cdn.com/uploads/chorus_asset/file/7647267/crafting_icons.PNG
and put these icons emotes here, and use them without equipping an icon:
https://cdn.vox-cdn.com/uploads/chorus_asset/file/9439337/Screen_Shot_2017_10_11_at_12.12.45_PM.png