Mercury styles break entity browsers

The merge error seems related to the MR initially pointing to the wrong branch. Changing that and the code merges cleanly.

Can confirm that the MR resolves the issue and I can now see the edit and delete icons. Thank you!