Readd missing -input variable inside button mixin. Addresses issue #5444 annd #4871