diff --git a/main.go b/main.go
index 69b0013..d323733 100644
--- a/main.go
+++ b/main.go
@@ -103,11 +103,13 @@ func (f *TMainForm) OnFormCreate(sender vcl.IObject) {
 
 	f.Tabs = vcl.NewPageControl(f)
 	f.Tabs.SetParent(f)
-	f.Tabs.SetAlign(types.AlClient)
+	f.Tabs.SetAlign(types.AlClient) // fill remaining space
+	f.Tabs.SetImages(f.ImageList)
 
 	propertiesTab := vcl.NewTabSheet(f.Tabs)
 	propertiesTab.SetParent(f.Tabs)
 	propertiesTab.SetCaption("Properties")
+	propertiesTab.SetImageIndex(imgChartBar)
 
 	f.propertiesBox = vcl.NewMemo(propertiesTab)
 	f.propertiesBox.SetParent(propertiesTab)
@@ -121,6 +123,7 @@ func (f *TMainForm) OnFormCreate(sender vcl.IObject) {
 	dataTab := vcl.NewTabSheet(f.Tabs)
 	dataTab.SetParent(f.Tabs)
 	dataTab.SetCaption("Data")
+	dataTab.SetImageIndex(imgTable)
 
 	f.contentBox = vcl.NewListView(dataTab)
 	f.contentBox.SetParent(dataTab)
@@ -210,6 +213,8 @@ func (f *TMainForm) OnNavExpanding(sender vcl.IObject, node *vcl.TTreeNode, allo
 
 			node := f.Buckets.Items().AddChild(node, formatUtf8([]byte(bucketName)))
 			node.SetHasChildren(true) // dynamically populate in OnNavExpanding
+			node.SetImageIndex(imgTable)
+			node.SetSelectedIndex(imgTable)
 			navData := &navData{
 				ld:             ndata.ld,
 				childrenLoaded: false,      // will be loaded dynamically