BRANCH 4.3: fixed icons on gallery
Merge branch 'remkonoteboom/4.3' into 4.3