minor fix for generic icons
Fixed dark theme cab
Fixed selection of apk and piccture icons
Merge remote-tracking branch 'upstream/master'