Fix button type
Refactoring code for caching  product
Merge remote-tracking branch 'remotes/origin/develop' into refactor/toasterIcons