diff --git a/default/theme/assets/wintergreen-icons-large.png b/default/theme/assets/wintergreen-icons-large.png
index ad1438f..c4dae36 100644
Binary files a/default/theme/assets/wintergreen-icons-large.png and b/default/theme/assets/wintergreen-icons-large.png differ
diff --git a/default/theme/assets/wintergreen-icons-small.png b/default/theme/assets/wintergreen-icons-small.png
index 10cdcee..6ee264d 100644
Binary files a/default/theme/assets/wintergreen-icons-small.png and b/default/theme/assets/wintergreen-icons-small.png differ
diff --git a/examples/icons/main.go b/examples/icons/main.go
index 1ae99d1..85ee36e 100644
--- a/examples/icons/main.go
+++ b/examples/icons/main.go
@@ -1,7 +1,6 @@
 package main
 
 import "git.tebibyte.media/sashakoshka/tomo"
-import "git.tebibyte.media/sashakoshka/tomo/theme"
 import "git.tebibyte.media/sashakoshka/tomo/layouts"
 import "git.tebibyte.media/sashakoshka/tomo/elements"
 import _ "git.tebibyte.media/sashakoshka/tomo/backends/all"
@@ -20,12 +19,13 @@ func run () {
 
 	container.Adopt(elements.NewLabel("Just some of the wonderful icons we have:", false), false)
 	container.Adopt(elements.NewSpacer(true), false)
-	container.Adopt(icons(theme.IconHome, theme.IconRepositories), true)
-	container.Adopt(icons(theme.IconFile, theme.IconCD), true)
-	container.Adopt(icons(theme.IconOpen, theme.IconRemoveBookmark), true)
+	container.Adopt(icons(tomo.IconHome, tomo.IconHistory), true)
+	container.Adopt(icons(tomo.IconFile, tomo.IconNetwork), true)
+	container.Adopt(icons(tomo.IconOpen, tomo.IconRemoveFavorite), true)
+	container.Adopt(icons(tomo.IconCursor, tomo.IconDistort), true)
 
 	closeButton := elements.NewButton("Ok")
-	closeButton.SetIcon(theme.IconYes)
+	closeButton.SetIcon(tomo.IconYes)
 	closeButton.ShowText(false)
 	closeButton.OnClick(tomo.Stop)
 	container.Adopt(closeButton, false)
@@ -34,10 +34,10 @@ func run () {
 	window.Show()
 }
 
-func icons (min, max theme.Icon) (container *containers.Container) {
+func icons (min, max tomo.Icon) (container *containers.Container) {
 	container = containers.NewContainer(layouts.Horizontal { true, false })
 	for index := min; index <= max; index ++ {
-		container.Adopt(elements.NewIcon(index, theme.IconSizeSmall), true)
+		container.Adopt(elements.NewIcon(index, tomo.IconSizeSmall), true)
 	}
 	return
 }
diff --git a/theme.go b/theme.go
index d6679d1..9b0bf0f 100644
--- a/theme.go
+++ b/theme.go
@@ -104,7 +104,8 @@ const (
 	IconLibraries
 	IconDownloads
 	IconRepositories
-	IconSettings)
+	IconSettings
+	IconHistory)
 
 const (
 	// Object icons
@@ -191,12 +192,29 @@ const (
 	IconBackward
 	IconForward
 	IconRefresh
-	IconHistory
+	IconUpward
 
 	IconYes
 	IconNo
 
-	IconUpward)
+	IconUndo
+	IconRedo
+
+	IconRun
+	IconSearch
+
+	IconClose
+	IconQuit
+	IconIconify
+	IconShade
+	IconMaximize
+	IconRestore
+
+	IconReplace
+	IconUnite
+	IconDiffer
+	IconInvert
+	IconIntersect)
 
 const (
 	// Status icons
@@ -207,7 +225,29 @@ const (
 
 const (
 	// Tool icons
-	)
+	IconCursor Icon = iota + 0x200
+	IconMeasure
+	
+	IconSelect
+	IconSelectRectangle
+	IconSelectEllipse
+	IconSelectGeometric
+	IconSelectFreeform
+	IconSelectLasso
+	IconSelectFuzzy
+	
+	IconTransform
+	IconTranslate
+	IconRotate
+	IconScale
+	IconWarp
+	IconDistort
+	
+	IconPencil
+	IconBrush
+	IconEraser
+	IconFill
+	IconText)
 
 // Hints specifies rendering hints for a particular pattern. Elements can take
 // these into account in order to gain extra performance.
diff --git a/xcf/large.xcf b/xcf/large.xcf
index ff64f0f..db5d636 100644
Binary files a/xcf/large.xcf and b/xcf/large.xcf differ
diff --git a/xcf/small.xcf b/xcf/small.xcf
index c19733e..5b11c43 100644
Binary files a/xcf/small.xcf and b/xcf/small.xcf differ