Separated radius for icon and buttons

Adding larger radius to buttons was causing the icons to appear as
circles instead of rounded squares. Now set to 2dp by default for the
icons which should show up acceptably on most devices.