D8 - Fixing [#2159963] and bringing css inline with D7.