Separate actions into trait
Better descriptions
Fix icon not showing in non-combined resources