More work on long-running media - started to rationalise icons