Moved IconButtons to abstract factory