fixed a merge problem but now media icon doesnt show up…