Follow-up from "Optimize UI performance"

The following discussion from !1379 (merged) should be addressed:

• @Aza started a discussion:

  687986d1 introduced a regression on the AB buttons placement.