In order to have the option for the stock icon, you have to change the shortcut. So, for example, if you want to change the messaging icon from the gray LP one to the green stock one:
Long press on the shortcut
Press change shortcut
Select messaging (again)
Click Default Icon