Corrections to handle weird icon themes, defaults for text/* types and %s field quoting consistency