Fix for sort button in dark style
Merge branch 'master' into stable