Last commit (add icon + screen) + calculate price