sort out a whole bunch of the horrible mess that is our icon set, including new railw...