diff --git a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe
index 9d5d424a..6d01ac2f 100644
Binary files a/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe and b/gtk-nsis-pack/bin/gdk-pixbuf-query-loaders.exe differ
diff --git a/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe b/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe
index 90aae80c..0a348131 100644
Binary files a/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe and b/gtk-nsis-pack/bin/gtk-query-immodules-2.0.exe differ
diff --git a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe
index ae7ab7b6..3e45796d 100644
Binary files a/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe and b/gtk-nsis-pack/bin/gtk-query-immodules-3.0.exe differ
diff --git a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe
index b5e418a1..b3ea75be 100644
Binary files a/gtk-nsis-pack/bin/gtk-update-icon-cache.exe and b/gtk-nsis-pack/bin/gtk-update-icon-cache.exe differ
diff --git a/gtk-nsis-pack/bin/libbz2-1.dll b/gtk-nsis-pack/bin/libbz2-1.dll
index 238e4ed2..553478e6 100644
Binary files a/gtk-nsis-pack/bin/libbz2-1.dll and b/gtk-nsis-pack/bin/libbz2-1.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-2.dll b/gtk-nsis-pack/bin/libcairo-2.dll
index a80c4f69..e8c823d9 100644
Binary files a/gtk-nsis-pack/bin/libcairo-2.dll and b/gtk-nsis-pack/bin/libcairo-2.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-gobject-2.dll b/gtk-nsis-pack/bin/libcairo-gobject-2.dll
index 8a30d71d..40accde6 100644
Binary files a/gtk-nsis-pack/bin/libcairo-gobject-2.dll and b/gtk-nsis-pack/bin/libcairo-gobject-2.dll differ
diff --git a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll
index afc30f7b..e39e6abc 100644
Binary files a/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll and b/gtk-nsis-pack/bin/libcairo-script-interpreter-2.dll differ
diff --git a/gtk-nsis-pack/bin/libexpat-1.dll b/gtk-nsis-pack/bin/libexpat-1.dll
index bd0a0e8d..ed385d9b 100644
Binary files a/gtk-nsis-pack/bin/libexpat-1.dll and b/gtk-nsis-pack/bin/libexpat-1.dll differ
diff --git a/gtk-nsis-pack/bin/libfreetype-6.dll b/gtk-nsis-pack/bin/libfreetype-6.dll
index 07412aab..996c5403 100644
Binary files a/gtk-nsis-pack/bin/libfreetype-6.dll and b/gtk-nsis-pack/bin/libfreetype-6.dll differ
diff --git a/gtk-nsis-pack/bin/libgailutil-18.dll b/gtk-nsis-pack/bin/libgailutil-18.dll
index 91f18194..855afc82 100644
Binary files a/gtk-nsis-pack/bin/libgailutil-18.dll and b/gtk-nsis-pack/bin/libgailutil-18.dll differ
diff --git a/gtk-nsis-pack/bin/libgailutil-3-0.dll b/gtk-nsis-pack/bin/libgailutil-3-0.dll
index eb458b3b..79e318d8 100644
Binary files a/gtk-nsis-pack/bin/libgailutil-3-0.dll and b/gtk-nsis-pack/bin/libgailutil-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgcc_s_seh-1.dll b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll
index 57745c03..c7665ecc 100644
Binary files a/gtk-nsis-pack/bin/libgcc_s_seh-1.dll and b/gtk-nsis-pack/bin/libgcc_s_seh-1.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk-3-0.dll b/gtk-nsis-pack/bin/libgdk-3-0.dll
index 07f86326..a386c434 100644
Binary files a/gtk-nsis-pack/bin/libgdk-3-0.dll and b/gtk-nsis-pack/bin/libgdk-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll
index cadd6359..fea79408 100644
Binary files a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll
index a4a1bad3..ddb72b05 100644
Binary files a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgtk-3-0.dll b/gtk-nsis-pack/bin/libgtk-3-0.dll
index 8f0aaa5d..6500254d 100644
Binary files a/gtk-nsis-pack/bin/libgtk-3-0.dll and b/gtk-nsis-pack/bin/libgtk-3-0.dll differ
diff --git a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll
index 753dc446..9458244c 100644
Binary files a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll differ
diff --git a/gtk-nsis-pack/bin/libharfbuzz-0.dll b/gtk-nsis-pack/bin/libharfbuzz-0.dll
index 834eda84..c240b862 100644
Binary files a/gtk-nsis-pack/bin/libharfbuzz-0.dll and b/gtk-nsis-pack/bin/libharfbuzz-0.dll differ
diff --git a/gtk-nsis-pack/bin/libintl-8.dll b/gtk-nsis-pack/bin/libintl-8.dll
index 695abb9c..b7fad98e 100644
Binary files a/gtk-nsis-pack/bin/libintl-8.dll and b/gtk-nsis-pack/bin/libintl-8.dll differ
diff --git a/gtk-nsis-pack/bin/liblzma-5.dll b/gtk-nsis-pack/bin/liblzma-5.dll
index 393b60c1..129766f9 100644
Binary files a/gtk-nsis-pack/bin/liblzma-5.dll and b/gtk-nsis-pack/bin/liblzma-5.dll differ
diff --git a/gtk-nsis-pack/bin/libpcre-1.dll b/gtk-nsis-pack/bin/libpcre-1.dll
index 4010c514..e6ab1819 100644
Binary files a/gtk-nsis-pack/bin/libpcre-1.dll and b/gtk-nsis-pack/bin/libpcre-1.dll differ
diff --git a/gtk-nsis-pack/bin/libpng16-16.dll b/gtk-nsis-pack/bin/libpng16-16.dll
index d512d797..4be82981 100644
Binary files a/gtk-nsis-pack/bin/libpng16-16.dll and b/gtk-nsis-pack/bin/libpng16-16.dll differ
diff --git a/gtk-nsis-pack/bin/libstdc++-6.dll b/gtk-nsis-pack/bin/libstdc++-6.dll
index 4bad4fba..af54ffbd 100644
Binary files a/gtk-nsis-pack/bin/libstdc++-6.dll and b/gtk-nsis-pack/bin/libstdc++-6.dll differ
diff --git a/gtk-nsis-pack/bin/libtiff-5.dll b/gtk-nsis-pack/bin/libtiff-5.dll
index 72e4dfe8..5afe64f4 100644
Binary files a/gtk-nsis-pack/bin/libtiff-5.dll and b/gtk-nsis-pack/bin/libtiff-5.dll differ
diff --git a/gtk-nsis-pack/bin/libwinpthread-1.dll b/gtk-nsis-pack/bin/libwinpthread-1.dll
index 142f2e9a..b07d407d 100644
Binary files a/gtk-nsis-pack/bin/libwinpthread-1.dll and b/gtk-nsis-pack/bin/libwinpthread-1.dll differ
diff --git a/gtk-nsis-pack/bin/zlib1.dll b/gtk-nsis-pack/bin/zlib1.dll
index 5ac41bb7..1f160888 100644
Binary files a/gtk-nsis-pack/bin/zlib1.dll and b/gtk-nsis-pack/bin/zlib1.dll differ
diff --git a/gtk-nsis-pack/copy-msys2-files.sh b/gtk-nsis-pack/copy-msys2-files.sh
index 01ffbf0b..e049bbb0 100644
--- a/gtk-nsis-pack/copy-msys2-files.sh
+++ b/gtk-nsis-pack/copy-msys2-files.sh
@@ -131,7 +131,7 @@ find $INSTALL_SRC_LIB/gtk-2.0 -name *.dll.a -type f -delete
cd $INSTALL_SRC_MSYS2_LIB/gdk-pixbuf-2.0
cp -r ./ $INSTALL_SRC_LIB/gdk-pixbuf-2.0
# Delete static libraries
-find $INSTALL_SRC_LIB/gdk-pixbuf-2.0 -name *.dll.a -type f -delete
+find $INSTALL_SRC_LIB/gdk-pixbuf-2.0 -name *.a -type f -delete
# Copy /share/locale/locale.alias
cp $INSTALL_SRC_MSYS2/share/locale/locale.alias $INSTALL_SRC_DIR/share/locale
diff --git a/gtk-nsis-pack/gtk2-runtime.ts.nsi b/gtk-nsis-pack/gtk2-runtime.ts.nsi
index 6d6c9b0c..1f9a2b14 100644
--- a/gtk-nsis-pack/gtk2-runtime.ts.nsi
+++ b/gtk-nsis-pack/gtk2-runtime.ts.nsi
@@ -14,7 +14,7 @@
!define GTK_VERSION "2.24.31"
!define GTK_BIN_VERSION "2.10.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2016-11-29-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2017-01-18-ts-win64"
!define PRODUCT_NAME "GTK2-Runtime Win64"
!define PRODUCT_PUBLISHER "Tom Schoonjans"
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
diff --git a/gtk-nsis-pack/gtk3-runtime.ts.nsi b/gtk-nsis-pack/gtk3-runtime.ts.nsi
index 1768df80..c586f64e 100644
--- a/gtk-nsis-pack/gtk3-runtime.ts.nsi
+++ b/gtk-nsis-pack/gtk3-runtime.ts.nsi
@@ -11,9 +11,9 @@
; Directory and package names: gtk3-runtime.
-!define GTK_VERSION "3.22.4"
+!define GTK_VERSION "3.22.6"
!define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2016-11-29-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2017-01-18-ts-win64"
!define PRODUCT_NAME "GTK3-Runtime Win64"
!define PRODUCT_PUBLISHER "Tom Schoonjans"
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
diff --git a/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache b/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
index 156b3f65..bf2ad4b4 100644
--- a/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+++ b/gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
@@ -1,47 +1,47 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.0
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.4
#
# LoaderDir = C:\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders
#
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ani.dll"
"ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-bmp.dll"
"bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-gif.dll"
"gif" 4 "gdk-pixbuf" "GIF" "LGPL"
"image/gif" ""
"gif" ""
"GIF8" "" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-icns.dll"
"icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
"image/x-icns" ""
"icns" ""
"icns" "" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ico.dll"
"ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
"image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
"ico" "cur" ""
" \001 " "zz znz" 100
" \002 " "zz znz" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
"jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
"pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
@@ -52,21 +52,21 @@
"P5" "" 100
"P6" "" 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-qtif.dll"
"qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
"image/x-quicktime" "image/qtif" ""
"qtif" "qif" ""
"abcdidsc" "xxxx " 100
"abcdidat" "xxxx " 100
-"C:/msys64/mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll"
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-svg.dll"
"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
"svg" "svgz" "svg.gz" ""
"
diff --git a/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/edit-clear-all-symbolic.svg b/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/edit-clear-all-symbolic.svg
index 15a3441d..332f5670 100644
--- a/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/edit-clear-all-symbolic.svg
+++ b/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/edit-clear-all-symbolic.svg
@@ -1,7 +1,7 @@
-