diff --git a/branding/Makefile.in b/branding/Makefile.in
index 049ae1a..c355d8b 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -40,7 +40,7 @@ MKDIR=@MKDIR_P@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
-SVG2PNG=@SVG2PNG@
+CONVERT=@CONVERT@
 OPTIPNG=@OPTIPNG@
 
 #---[ Rules ]----------------------------------------------------------------------------
@@ -50,11 +50,17 @@ $(BINDIR)/%.png: \
 
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
-	@$(SVG2PNG) $< --format=png > $@
+	@$(CONVERT) -background transparent $< $@
 	@$(OPTIPNG) -o7 $@
 
-$(SRCDIR):
+$(BINDIR)/%.ico: \
+	%.svg
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
 
+$(SRCDIR):
 	@$(MKDIR) $@
 	@$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@
 
diff --git a/configure.ac b/configure.ac
index 94cf4f1..a37b21d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,6 +229,7 @@ AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
 AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
 AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no])
+AC_PATH_TOOL([CONVERT], [convert], [no])
 AC_PATH_TOOL([OPTIPNG],[optipng],[no])
 
 AC_CHECK_HEADER(libintl.h, [
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index dca8fe9..99b8ba5 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -72,6 +72,7 @@ CC=@CC@
 LD=@CC@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+CONVERT=@CONVERT@
 WINDRES=@WINDRES@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \
@@ -87,7 +88,12 @@ APP_LDFLAGS=@APP_LDFLAGS@
 
 #---[ Rules ]----------------------------------------------------------------------------
 
-DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile
+DEPENDS=\
+	$(BASEDIR)/src/include/*.h \
+	$(BASEDIR)/src/include/lib3270/*.h \
+	$(BASEDIR)/src/include/pw3270/*.h \
+	*.h \
+	Makefile
 
 $(OBJDBG)/%.o: \
 	%.c \
@@ -100,11 +106,21 @@ $(OBJDBG)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"`\
 				-o $@ -c $<
 
+%.ico: \
+	$(BASEDIR)/branding/%.svg
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
+
 $(OBJDBG)/%.o: \
 	%.rc \
+	@PACKAGE_TARNAME@.ico \
 	$(DEPENDS)
 
-	@$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(WINDRES) -i $< -o $@
 
 $(BASEDIR)/.obj/Debug/%.a: \
 	./%/* \
@@ -253,7 +269,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
 	$(BINDBG)/$(LIBNAME) \
 	$(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
 
-	$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
+	@$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
 
 $(BINDBG)/$(LIBNAME): \
 	$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
diff --git a/src/pw3270/resources.rc.in b/src/pw3270/resources.rc.in
index edb9c66..6b43212 100644
--- a/src/pw3270/resources.rc.in
+++ b/src/pw3270/resources.rc.in
@@ -13,7 +13,7 @@ BEGIN
 		BLOCK "080904E4"
 		BEGIN
 			VALUE "FileDescription",	"@PACKAGE_DESCRIPTION@"
-			VALUE "CompanyName",        "Banco do Brasil S.A.\0"
+			VALUE "CompanyName",		"Banco do Brasil S.A.\0"
 			VALUE "FileVersion",		"@PACKAGE_VERSION@"
 			VALUE "InternalName",		"@PACKAGE_NAME@"
 			VALUE "LegalCopyright",		"Copyright (c) Banco do Brasil S.A."
diff --git a/win/install-cross.sh b/win/install-cross.sh
index b9fbdbd..e26b06a 100755
--- a/win/install-cross.sh
+++ b/win/install-cross.sh
@@ -42,7 +42,8 @@ sudo zypper --non-interactive in \
 	gettext-tools \
 	glib2-devel \
 	optipng \
-	rsvg-view
+	rsvg-view \
+	ImageMagick
 
 while read FILE
 do
--
libgit2 0.21.2