Rewards
Merge branch 'feature/RewardIcons' into develop