diff --git a/Makefile b/Makefile
index 48fe11a..c93307e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,8 @@ SRC_FILES := changes.txt license.txt Makefile mkstubs.pl readme.txt src/config.h
 	src/mswsock.def src/mswsock_stubs.txt src/stubdll.c src/winsock.c src/wsock32.def \
 	src/wsock32_stubs.txt src/directplay.c src/dpwsockx.def src/dpwsockx_stubs.txt src/common.c \
 	src/common.h src/router.c src/router.h src/router-exe.c src/interface.c src/interface.h \
-	src/ipxrouter.rc ipxrouter.ico include/dplay.h include/dplaysp.h include/dplobby.h \
-	include/wsnwlink.h
+	src/ipxrouter.rc ipxrouter.ico src/ipxconfig.rc ipxconfig.ico include/dplay.h \
+	include/dplaysp.h include/dplobby.h include/wsnwlink.h
 
 all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll ipxrouter.exe
 
@@ -59,8 +59,8 @@ dist: all
 ipxwrapper.dll: $(IPXWRAPPER_DEPS)
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) -liphlpapi
 
-ipxconfig.exe: src/ipxconfig.cpp
-	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe src/ipxconfig.cpp -liphlpapi -lcomctl32
+ipxconfig.exe: src/ipxconfig.cpp src/ipxconfig-rc.o
+	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe src/ipxconfig.cpp src/ipxconfig-rc.o -liphlpapi -lcomctl32
 
 dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -lwsock32
@@ -80,8 +80,8 @@ src/mswsock_stubs.s: src/mswsock_stubs.txt
 src/dpwsockx_stubs.s: src/dpwsockx_stubs.txt
 	perl mkstubs.pl src/dpwsockx_stubs.txt src/dpwsockx_stubs.s 3
 
-src/ipxrouter-rc.o: src/ipxrouter.rc
-	windres src/ipxrouter.rc -O coff -o src/ipxrouter-rc.o
+src/%-rc.o: src/%.rc
+	windres $< -O coff -o $@
 
 %.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/%.def
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o $@ $^
diff --git a/changes.txt b/changes.txt
index 3b6d2b6..35fcc5e 100644
--- a/changes.txt
+++ b/changes.txt
@@ -38,6 +38,8 @@ Version ???:
 	Update: Max packet (data) size reduced to 8KiB.
 	
 	Update: Implemented IPX_RECEIVE_BROADCAST option.
+	
+	Update: Added ipxconfig icon.
 
 Version 0.2.2:
 	Feature: Redesigned ipxconfig UI.
diff --git a/ipxconfig-16.png b/ipxconfig-16.png
new file mode 100644
index 0000000..fbca9b0
Binary files /dev/null and b/ipxconfig-16.png differ
diff --git a/ipxconfig-32.png b/ipxconfig-32.png
new file mode 100644
index 0000000..b1f0ecb
Binary files /dev/null and b/ipxconfig-32.png differ
diff --git a/ipxconfig.ico b/ipxconfig.ico
new file mode 100644
index 0000000..4dd9257
Binary files /dev/null and b/ipxconfig.ico differ
diff --git a/src/ipxconfig.cpp b/src/ipxconfig.cpp
index 373c7e2..98d24c5 100644
--- a/src/ipxconfig.cpp
+++ b/src/ipxconfig.cpp
@@ -571,11 +571,12 @@ static void init_windows() {
 	}
 	
 	WNDCLASS wclass;
-	
-	memset(&wclass, 0, sizeof(wclass));
 	wclass.style = 0;
 	wclass.lpfnWndProc = &main_wproc;
+	wclass.cbClsExtra = 0;
+	wclass.cbWndExtra = 0;
 	wclass.hInstance = GetModuleHandle(NULL);
+	wclass.hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(50), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
 	wclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
 	wclass.lpszMenuName  = NULL;
diff --git a/src/ipxconfig.rc b/src/ipxconfig.rc
new file mode 100644
index 0000000..a9e89ca
--- /dev/null
+++ b/src/ipxconfig.rc
@@ -0,0 +1 @@
+50 ICON "../ipxconfig.ico"