New timeline icons, css fixes and refactoring
Trying to resolve a conflict