circular image
fixed icon loading for every layout
minor fix
Merge remote-tracking branch 'upstream/master'