Instead of writing all variations of .btn-icon + .btn-text selectors, you can write a single selector that checks for the presence of an icon.
.btn-icon + .btn-text