Bug 989058 - Cumulative theme fixes; f=bgrins,benvie r=dcamp,fitzgen