diff --git a/bolt.go b/bolt.go
index a0b4ca7..733b77d 100644
--- a/bolt.go
+++ b/bolt.go
@@ -98,6 +98,7 @@ func (f *TMainForm) boltAddDatabaseFromFile(path string) {
 
 	ld.nav = f.Buckets.Items().Add(nil, ld.displayName)
 	ld.nav.SetHasChildren(true) // dynamically populate in OnNavExpanding
+	ld.nav.SetImageIndex(imgDatabase)
 	navData := &navData{
 		ld:             ld,
 		childrenLoaded: false,      // will be loaded dynamically
diff --git a/main.go b/main.go
index 2a56a98..dd26446 100644
--- a/main.go
+++ b/main.go
@@ -46,17 +46,20 @@ func (f *TMainForm) OnFormCreate(sender vcl.IObject) {
 
 	mnuFileOpen := vcl.NewMenuItem(mnuFile)
 	mnuFileOpen.SetCaption("Open Bolt database...")
+	mnuFileOpen.SetImageIndex(imgDatabaseAdd)
 	mnuFileOpen.SetShortCutFromString("Ctrl+O")
 	mnuFileOpen.SetOnClick(f.OnMnuFileOpenClick)
 	mnuFile.Add(mnuFileOpen)
 
 	mnuFileSqliteOpen := vcl.NewMenuItem(mnuFile)
 	mnuFileSqliteOpen.SetCaption("Open SQLite database...")
+	mnuFileSqliteOpen.SetImageIndex(imgDatabaseAdd)
 	mnuFileSqliteOpen.SetOnClick(f.OnMnuFileSqliteOpenClick)
 	mnuFile.Add(mnuFileSqliteOpen)
 
 	mnuFileSqliteMemory := vcl.NewMenuItem(mnuFile)
 	mnuFileSqliteMemory.SetCaption("New SQLite in-memory database")
+	mnuFileSqliteMemory.SetImageIndex(imgDatabaseAdd)
 	mnuFileSqliteMemory.SetOnClick(f.OnMnuFileSqliteMemoryClick)
 	mnuFile.Add(mnuFileSqliteMemory)
 
@@ -70,10 +73,12 @@ func (f *TMainForm) OnFormCreate(sender vcl.IObject) {
 	mnuFile.Add(mnuFileExit)
 
 	f.Menu = vcl.NewMainMenu(f)
+	f.Menu.SetImages(f.ImageList)
 	f.Menu.Items().Add(mnuFile)
 
 	f.Buckets = vcl.NewTreeView(f)
 	f.Buckets.SetParent(f)
+	f.Buckets.SetImages(f.ImageList)
 	f.Buckets.SetAlign(types.AlLeft)
 	f.Buckets.SetWidth(MY_WIDTH)
 	f.Buckets.SetReadOnly(true) // prevent click to rename on nodes
diff --git a/sqlite.go b/sqlite.go
index 0984552..62a0fc7 100644
--- a/sqlite.go
+++ b/sqlite.go
@@ -136,6 +136,7 @@ func (f *TMainForm) sqliteAddDatabaseFromFile(path string) {
 	}
 
 	ld.nav = f.Buckets.Items().Add(nil, ld.displayName)
+	ld.nav.SetImageIndex(imgDatabase)
 	ld.nav.SetHasChildren(true) // dynamically populate in OnNavExpanding
 	navData := &navData{
 		ld:             ld,