diff --git a/button.go b/button.go
index 5163f77..d0a56f9 100644
--- a/button.go
+++ b/button.go
@@ -7,13 +7,17 @@ import "git.tebibyte.media/tomo/tomo/event"
 import "git.tebibyte.media/tomo/objects/layouts"
 
 var buttonLayout     = layouts.NewGrid([]bool { true        }, []bool { true })
-var iconButtonLayout = layouts.NewGrid([]bool { false, true }, []bool { true })
+var iconButtonLayout = layouts.NewGrid([]bool { false       }, []bool { true })
+var bothButtonLayout = layouts.NewGrid([]bool { false, true }, []bool { true })
 
 // Button is a clickable button.
 type Button struct {
 	tomo.ContainerBox
+
 	label *Label
 	icon  *Icon
+	labelActive bool
+	
 	on struct {
 		click event.FuncBroadcaster
 	}
@@ -27,8 +31,8 @@ func NewButton (text string) *Button {
 	}
 	theme.Apply(box, theme.R("objects", "Button", ""))
 	box.label.SetAlign(tomo.AlignMiddle, tomo.AlignMiddle)
-	box.Add(box.label)
 	box.SetLayout(buttonLayout)
+	box.SetText(text)
 	
 	box.CaptureDND(true)
 	box.CaptureMouse(true)
@@ -44,6 +48,15 @@ func NewButton (text string) *Button {
 // SetText sets the text of the button's label.
 func (this *Button) SetText (text string) {
 	this.label.SetText(text)
+	if this.labelActive && text == "" {
+		this.Delete(this.label)
+		this.labelActive = false
+	}
+	if !this.labelActive && text != "" {
+		this.Add(this.label)
+		this.labelActive = true
+	}
+	this.applyLayout()
 }
 
 // SetIcon sets an icon for this button. Setting the icon to IconUnknown will
@@ -56,12 +69,10 @@ func (this *Button) SetIcon (id theme.Icon) {
 	}
 	this.icon = icon
 
-	if this.icon == nil {
-		this.SetLayout(buttonLayout)
-	} else {
-		this.SetLayout(iconButtonLayout)
+	if this.icon != nil {
 		this.Insert(this.icon, this.label)
 	}
+	this.applyLayout()
 }
 
 // OnClick specifies a function to be called when the button is clicked.
@@ -69,6 +80,16 @@ func (this *Button) OnClick (callback func ()) event.Cookie {
 	return this.on.click.Connect(callback)
 }
 
+func (this *Button) applyLayout () {
+	if this.labelActive && this.icon == nil {
+		this.SetLayout(buttonLayout)
+	} else if !this.labelActive && this.icon != nil {
+		this.SetLayout(iconButtonLayout)
+	} else {
+		this.SetLayout(bothButtonLayout)
+	}
+}
+
 func (this *Button) handleKeyUp (key input.Key, numberPad bool) {
 	if key != input.KeyEnter && key != input.Key(' ') { return }
 	this.on.click.Broadcast()