Inventory resize because of the icon resize
Merge remote-tracking branch 'origin/dev'