Extract out server icon separately so we can store it only once

Also validate the JSON is valid
add a mapper filter for fromjson