Some refactoring + corrections: get correct craft plan icon for the selected plan