CSS fix for decaf theme
Merge remote-tracking branch 'upstream/master'

Fetch from original