late night commit, few changes
Merge branch 'feature/more_item-icon_related_functions' into develop