If you are using @import statements in your userChrome.css to load the other files, then I would put these extra rules at the end of userChrome.css after the imports.
For the tab heights, none of the styles should be modifying the tab height, they should be as tall as they are in Firefox normally. Make sure you are not setting tab height related properties in my_appearance_settings.css.
Edit: I mean, you can edit tab heights, you just need to do it in a manner that is compatible with multi-row_tabs.



This seems to be a recent regression in nightly - I created bug 2011219 for this.