Merged changes to GTK2 theme from master
Merged changes to GTK3 theme from master