diff --git a/button.go b/button.go
index 7f1b2e2..5163f77 100644
--- a/button.go
+++ b/button.go
@@ -46,10 +46,14 @@ func (this *Button) SetText (text string) {
 	this.label.SetText(text)
 }
 
-// SetIcon sets an icon for this button.
-// TODO: use tomo.Icon instead, use small size icons
-func (this *Button) SetIcon (icon *Icon) {
+// SetIcon sets an icon for this button. Setting the icon to IconUnknown will
+// remove it.
+func (this *Button) SetIcon (id theme.Icon) {
 	if this.icon != nil { this.Delete(this.icon) }
+
+	var icon *Icon; if id != theme.IconUnknown {
+		icon = NewIcon(id, theme.IconSizeSmall)
+	}
 	this.icon = icon
 
 	if this.icon == nil {