Merge branch '26859-comment-button-doesn-t-align-vertically-with-line-number' into 'master'

Resolve "Comment button doesn't align vertically with line number"

Closes #26859

See merge request !8918