Fix rendering and added icons for Tinker mode