Button images added to tabs
Resolving conflicts