My biggest tip for this is to wear sweater over the shirt that will cover the waistband so only you know your shirt is untucked. That’s harder going into spring, but places like J. Crew factory often have lightweight 100% cotton sweaters on sale that work really well in an office.
Tip #2 is to try and find wider pants in a thicker fabric. It’ll give you smoother lines and be more comfy over all!!!