Fixing Image cache
Fixing filter button image size
Merge remote-tracking branch 'origin/development' into development