Merge pull request #1649 from erikdesjardins/master

Different icons for HTML5 video
Merge pull request #1 from honestbleeps/master

Test