Add fonticon + better error handling