fix for sort button in dark theme
Merge branch 'master' into stable