Tool drawing improvements

fixes: 42