Pipe Icon texture fix and small cleanup.