Centering button icons
new commits
Merging class source