+ improve icon resolution
+ back icon should also be black when the white theme is selected