Add prepare state and add custom icon