Issue #264 - Distribution preparation + item icons update