Make the border optional, like the button (cherry picked from commit c2271b8)
Make the border optional, like the button
(cherry picked from commit c2271b8)

leftees/galleryplus,leftees/galleryplus,patman15/galleryplus,patman15/galleryplus,leftees/galleryplus,patman15/galleryplus