Partial merge of develop to experimental

Does not include #2336 as the file has been moved out from underneath it:
will do this separately

res/css/structures/_RightPanel.scss

@@ -57,6 +57,10 @@ limitations under the License.
     pointer-events: none;
 }
 
+.mx_RightPanel_headerButton_badgeHighlight .mx_RightPanel_headerButton_badge {
+    color: $warning-color;
+}
+
 .mx_RightPanel_headerButton_highlight {
     border-color: $button-bg-color;
 }