Bug 963946 - Fix theme regressions caused by bug 963739. r=Paenglab
Bug 963923 - Fix small Windows compser issues. r+ui-r=me