diff --git a/src/objects/settings/gsettings.c b/src/objects/settings/gsettings.c
index 07fff92..d692fc7 100644
--- a/src/objects/settings/gsettings.c
+++ b/src/objects/settings/gsettings.c
@@ -99,7 +99,7 @@
 
 		} else {
 
-			g_message("Loading '%s' from default path","gschemas.compiled");
+			g_message("Can't find '%s' loading from default path",filename);
 			settings = g_settings_new(schema_id);
 
 		}
diff --git a/win/pack.sh b/win/pack.sh
index 6dc8fe4..bc02148 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -460,6 +460,24 @@ buildApplication()
 			failed "Can't configure ${1}"
 		fi
 
+		if [ ! -e "branding/${PRODUCT_NAME}.svg" ]; then
+		
+			if [ -e "${PROJECTDIR}/${PRODUCT_NAME}.svg" ]; then
+				echo "Getting icon from ${PROJECTDIR}/${PRODUCT_NAME}.svg"
+				ln -s "$(readlink -f "${PROJECTDIR}/${PRODUCT_NAME}.svg")" "branding/${PRODUCT_NAME}.svg"
+
+			elif [ -e "${PROJECTDIR}/branding/${PRODUCT_NAME}.svg" ]; then
+				echo "Getting icon from ${PROJECTDIR}/branding/${PRODUCT_NAME}.svg"
+				ln -s "$(readlink -f "${PROJECTDIR}/branding/${PRODUCT_NAME}.svg")" "branding/${PRODUCT_NAME}.svg"
+	
+			else
+				echo "Using default icon"
+				ln -s "pw3270.svg" "branding/${PRODUCT_NAME}.svg"
+			
+			fi
+		
+		fi
+		
 		make all
 		if [ "$?" != "0" ]; then
 			failed "Can't buid ${1}"
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 49caa81..1f3f3e8 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -121,8 +121,8 @@ SubSection "@PRODUCT_NAME@" SecMain
 
 		# Schema
 		CreateDirectory "$INSTDIR\schemas"
-		file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-application.gschema.xml"	"share\glib-2.0\schemas\pw3270-application.gschema.xml"
-		file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-window.gschema.xml"		"share\glib-2.0\schemas\pw3270-window.gschema.xml"
+		file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-application.gschema.xml"	"share\glib-2.0\schemas\@PRODUCT_NAME@-application.gschema.xml"
+		file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-window.gschema.xml"		"share\glib-2.0\schemas\@PRODUCT_NAME@-window.gschema.xml"
 
 		file "/oname=$INSTDIR\gschemas.compiled"								"runtime/share/glib-2.0/schemas/gschemas.compiled"
 
--
libgit2 0.21.2