RTL CSS improvements
Merge pull request #4154 from timvandermeij/rtl-css-fixes

RTL CSS improvements
Fix merge conflicts