Replace string of trash to icon
Add effect to trash
Merge branch 'develop'