Fixes: U4-5654 U7.2 - Creating a media type with inheritance throws a YSOD and also fixes legacy icons with media/content types