diff --git a/bin/nwg-drawer b/bin/nwg-drawer
index 7a5106a..6852e85 100755
Binary files a/bin/nwg-drawer and b/bin/nwg-drawer differ
diff --git a/main.go b/main.go
index 7aac751..a4272d9 100644
--- a/main.go
+++ b/main.go
@@ -111,7 +111,7 @@ var displayVersion = flag.Bool("v", false, "display Version information")
 var iconSizeLarge = flag.Int("isl", 64, "Icon Size Large")
 var iconSizeSmall = flag.Int("iss", 16, "Icon Size Small")
 var columnsNumber = flag.Uint("c", 6, "number of Columns")
-var itemPadding = flag.Uint("padding", 2, "vertical item padding")
+var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
 var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
 var fileManager = flag.String("fm", "thunar", "File Manager")
 var term = flag.String("term", "alacritty", "Terminal emulator")
diff --git a/uicomponents.go b/uicomponents.go
index 95cc774..603120a 100644
--- a/uicomponents.go
+++ b/uicomponents.go
@@ -21,9 +21,9 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 		flowBox.SetMaxChildrenPerLine(uint(len(pinned)))
 	}
 
-	flowBox.SetColumnSpacing(20)
+	flowBox.SetColumnSpacing(*itemSpacing)
+	flowBox.SetRowSpacing(*itemSpacing)
 	flowBox.SetHomogeneous(true)
-	flowBox.SetRowSpacing(20)
 	flowBox.SetProperty("name", "pinned-box")
 	flowBox.SetSelectionMode(gtk.SELECTION_NONE)
 
@@ -49,7 +49,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 			}
 			if len(name) > 20 {
 				r := []rune(name)
-				name = string(r[:20])
+				name = string(r[:17])
 				name = fmt.Sprintf("%s…", name)
 			}
 			btn.SetLabel(name)
@@ -175,8 +175,8 @@ func setUpAppsFlowBox(categoryList []string, searchPhrase string) *gtk.FlowBox {
 	flowBox, _ := gtk.FlowBoxNew()
 	flowBox.SetMinChildrenPerLine(*columnsNumber)
 	flowBox.SetMaxChildrenPerLine(*columnsNumber)
-	flowBox.SetColumnSpacing(20)
-	flowBox.SetRowSpacing(20)
+	flowBox.SetColumnSpacing(*itemSpacing)
+	flowBox.SetRowSpacing(*itemSpacing)
 	flowBox.SetHomogeneous(true)
 	flowBox.SetSelectionMode(gtk.SELECTION_NONE)
 
@@ -226,7 +226,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	name := entry.NameLoc
 	if len(name) > 20 {
 		r := []rune(name)
-		name = string(r[:20])
+		name = string(r[:17])
 		name = fmt.Sprintf("%s…", name)
 	}
 	button.SetLabel(name)
@@ -277,7 +277,6 @@ func walk(path string, d fs.DirEntry, e error) error {
 	if e != nil {
 		return e
 	}
-	//if !d.IsDir() {
 	// don't search leading part of the path, as e.g. '/home/user/Pictures'
 	toSearch := strings.Split(path, ignore)[1]
 	if strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
@@ -288,8 +287,6 @@ func walk(path string, d fs.DirEntry, e error) error {
 			fileSearchResults = append(fileSearchResults, path)
 		}
 	}
-
-	//}
 	return nil
 }