Added support for S2J and J2S conversion

Also created two icons [S2J] and [J2S].
Did lots of code clean up.