Small refactors for Tabs, Icons and Helpers