Tweaking base button style

Some base button updates also adding some test buttons like numers and
other future needed buttons with icon