osd: flatter troughs for OSD

https://bugzilla.gnome.org/show_bug.cgi?id=723829
osd: fix insensitive buttons

https://bugzilla.gnome.org/show_bug.cgi?id=723829
Merge branch 'osd-tweaks'