Timeline and Icon fix