diff --git a/bin/nwg-drawer b/bin/nwg-drawer
index d99df46..d269474 100755
Binary files a/bin/nwg-drawer and b/bin/nwg-drawer differ
diff --git a/uicomponents.go b/uicomponents.go
index 2b0f651..b7aac1a 100644
--- a/uicomponents.go
+++ b/uicomponents.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/gtk"
 )
@@ -33,13 +34,19 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 
 			btn, _ := gtk.ButtonNew()
 
+			var pixbuf *gdk.Pixbuf
 			var img *gtk.Image
+			var err error
 			if entry.Icon != "" {
-				pixbuf, _ := createPixbuf(entry.Icon, *iconSize)
-				img, _ = gtk.ImageNewFromPixbuf(pixbuf)
+				pixbuf, err = createPixbuf(entry.Icon, *iconSize)
 			} else {
-				img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
+				pixbuf, err = createPixbuf("image-missing", *iconSize)
 			}
+			if err != nil {
+				log.Error(err)
+				pixbuf, _ = createPixbuf("unknown", *iconSize)
+			}
+			img, _ = gtk.ImageNewFromPixbuf(pixbuf)
 
 			btn.SetImage(img)
 			btn.SetAlwaysShowImage(true)
@@ -233,13 +240,19 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	button, _ := gtk.ButtonNew()
 	button.SetAlwaysShowImage(true)
 
+	var pixbuf *gdk.Pixbuf
 	var img *gtk.Image
+	var err error
 	if entry.Icon != "" {
-		pixbuf, _ := createPixbuf(entry.Icon, *iconSize)
-		img, _ = gtk.ImageNewFromPixbuf(pixbuf)
+		pixbuf, err = createPixbuf(entry.Icon, *iconSize)
 	} else {
-		img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
+		pixbuf, err = createPixbuf("image-missing", *iconSize)
 	}
+	if err != nil {
+		log.Error(err)
+		pixbuf, _ = createPixbuf("unknown", *iconSize)
+	}
+	img, _ = gtk.ImageNewFromPixbuf(pixbuf)
 
 	button.SetImage(img)
 	button.SetImagePosition(gtk.POS_TOP)