Merge pull request #3971 from Pringo/master Remove Remaining Boomy Icons and Replace With Placeholders
