diff --git a/blocks/library/button/index.js b/blocks/library/button/index.js
new file mode 100644
index 0000000000000..dfa919c868765
--- /dev/null
+++ b/blocks/library/button/index.js
@@ -0,0 +1,109 @@
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+import { registerBlock, query } from 'api';
+import Editable from 'components/editable';
+import IconButton from '../../../editor/components/icon-button';
+
+const { attr, children } = query;
+
+/**
+ * Returns an attribute setter with behavior that if the target value is
+ * already the assigned attribute value, it will be set to undefined.
+ *
+ * @param {string} align Alignment value
+ * @return {Function} Attribute setter
+ */
+function applyOrUnset( align ) {
+ return ( attributes, setAttributes ) => {
+ const nextAlign = attributes.align === align ? undefined : align;
+ setAttributes( { align: nextAlign } );
+ };
+}
+
+registerBlock( 'core/button', {
+ title: wp.i18n.__( 'Button' ),
+
+ icon: 'marker',
+
+ category: 'common',
+
+ attributes: {
+ url: attr( 'a', 'href' ),
+ title: attr( 'a', 'title' ),
+ text: children( 'a' ),
+ align: ( node ) => ( node.className.match( /\balign(\S+)/ ) || [] )[ 1 ]
+ },
+
+ controls: [
+ {
+ icon: 'align-left',
+ title: wp.i18n.__( 'Align left' ),
+ isActive: ( { align } ) => 'left' === align,
+ onClick: applyOrUnset( 'left' )
+ },
+ {
+ icon: 'align-center',
+ title: wp.i18n.__( 'Align center' ),
+ isActive: ( { align } ) => 'center' === align,
+ onClick: applyOrUnset( 'center' )
+ },
+ {
+ icon: 'align-right',
+ title: wp.i18n.__( 'Align right' ),
+ isActive: ( { align } ) => 'right' === align,
+ onClick: applyOrUnset( 'right' )
+ }
+ ],
+
+ getEditWrapperProps( attributes ) {
+ const { align } = attributes;
+ if ( 'left' === align || 'right' === align || 'center' === align ) {
+ return { 'data-align': align };
+ }
+ },
+
+ edit( { attributes, setAttributes, focus, setFocus } ) {
+ const { text, url, title } = attributes;
+
+ return (
+
+
I imagine prior to the launch of the iPod, or the iPhone, there were teams saying the same thing: the copy + paste guys are so close to being ready and we know Walt Mossberg is going to ding us for this so let\'s just not ship to the manufacturers in China for just a few more weeks… The Apple teams were probably embarrassed. But if you\'re not embarrassed when you ship your first version you waited too long.
', '',