diff --git a/src/client/components/boardComponent.tsx b/src/client/components/boardComponent.tsx
index bc50e017b..ffdcfd5a5 100644
--- a/src/client/components/boardComponent.tsx
+++ b/src/client/components/boardComponent.tsx
@@ -149,7 +149,7 @@ class BoardComponent extends React.Component<Props, State> {
 
 							<div className="octo-board-header-cell">
 								<div className="octo-label" title={`Items with an empty ${boardTree.groupByProperty?.name} property will go here. This column cannot be removed.`}>{`No ${boardTree.groupByProperty?.name}`}</div>
-								<Button text={`${boardTree.emptyGroupCards.length}`} />
+                                <Button>{`${boardTree.emptyGroupCards.length}`}</Button>
 								<div className="octo-spacer" />
 								<Button><div className="imageOptions" /></Button>
 								<Button onClick={() => { this.addCard(undefined) }}><div className="imageAdd" /></Button>
@@ -173,7 +173,7 @@ class BoardComponent extends React.Component<Props, State> {
 										className={`octo-label ${group.option.color}`}
 										text={group.option.value}
 										onChanged={(text) => { this.propertyNameChanged(group.option, text) }} />
-									<Button text={`${group.cards.length}`} />
+                                    <Button>{`${group.cards.length}`}</Button>
 									<div className="octo-spacer" />
 									<MenuWrapper>
 										<Button><div className="imageOptions" /></Button>
@@ -190,7 +190,7 @@ class BoardComponent extends React.Component<Props, State> {
 							)}
 
 							<div className="octo-board-header-cell">
-								<Button text="+ Add a group" onClick={(e) => { this.addGroupClicked() }} />
+                                <Button onClick={(e) => { this.addGroupClicked() }}>+ Add a group</Button>
 							</div>
 						</div>
 
@@ -210,7 +210,7 @@ class BoardComponent extends React.Component<Props, State> {
 										onDragStart={() => { this.draggedCard = card }}
 										onDragEnd={() => { this.draggedCard = undefined }} />
 								)}
-								<Button text="+ New" onClick={() => { this.addCard(undefined) }} />
+                                <Button onClick={() => { this.addCard(undefined) }} >+ New</Button>
 							</BoardColumn>
 
 							{/* Columns */}
@@ -226,7 +226,7 @@ class BoardComponent extends React.Component<Props, State> {
 											onDragStart={() => { this.draggedCard = card }}
 											onDragEnd={() => { this.draggedCard = undefined }} />
 									)}
-									<Button text="+ New" onClick={() => { this.addCard(group.option.value) }} />
+                                    <Button onClick={() => { this.addCard(group.option.value) }} >+ New</Button>
 								</BoardColumn>
 							)}
 						</div>
diff --git a/src/client/components/button.tsx b/src/client/components/button.tsx
index 2ee2874a9..93ce9ef55 100644
--- a/src/client/components/button.tsx
+++ b/src/client/components/button.tsx
@@ -6,7 +6,7 @@ type Props = {
 	onClick?: (e: React.MouseEvent<HTMLDivElement>) => void
 	style?: React.CSSProperties
 	backgroundColor?: string
-	text?: string
+	children?: React.ReactNode
 	title?: string
 }
 
@@ -20,7 +20,6 @@ export default class Button extends React.Component<Props> {
 				style={style}
 				title={this.props.title}>
 				{this.props.children}
-				{this.props.text}
 			</div>)
 	}
 }
diff --git a/src/client/components/cardDialog.tsx b/src/client/components/cardDialog.tsx
index cf17778cd..5c46916a4 100644
--- a/src/client/components/cardDialog.tsx
+++ b/src/client/components/cardDialog.tsx
@@ -149,7 +149,7 @@ class CardDialog extends React.Component<Props, State> {
 				<div className="dialog" >
 					<div className="toolbar">
 						<div className="octo-spacer"></div>
-						<Button text="..." onClick={(e) => {
+						<Button onClick={(e) => {
 							Menu.shared.options = [
 								{ id: "delete", name: "Delete" },
 							]
@@ -163,7 +163,7 @@ class CardDialog extends React.Component<Props, State> {
 								}
 							}
 							Menu.shared.showAtElement(e.target as HTMLElement)
-						}}></Button>
+						}}>...</Button>
 					</div>
 					<div className="content">
 						{icon ?