Merge request: Resolve discussion icons have different colors and float outside of discussion block

Several Problems in MR discussions:

Mismatching colors in icons:

Screen_Shot_2017-10-07_at_14.46.51

Overflow with open sidebar

Mobile

Screen_Shot_2017-10-07_at_14.36.52

Desktop

Screen_Shot_2017-10-07_at_14.35.20

These colors were not like this on 9.5 cc @jschatz1