Fixed order of -time icon rename

Moved the change of icon-remove to fa-times to the end of the list so it
wouldn't cause an issue with icon-time to fa-clock-o.