Align hard tabs

Continuation of  #2225 

Fixes #1845