Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase