diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp
index 4c722f5fc40..0195a53a7d2 100644
Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ
diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg
new file mode 100644
index 00000000000..0320420388f
--- /dev/null
+++ b/dll/win32/msgina/resources/svg/rosbanner.svg
@@ -0,0 +1,1788 @@
+
+
diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc
index 4014180e00e..417239c77a7 100644
--- a/dll/win32/shell32/bitmap_res.rc
+++ b/dll/win32/shell32/bitmap_res.rc
@@ -1,5 +1,7 @@
-IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp"
-IDB_LINEBAR BITMAP "res/bitmaps/line.bmp"
+IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp"
+IDB_REACTOS_WORKSTATION BITMAP "res/bitmaps/reactosworkstation.bmp"
+IDB_REACTOS_SERVER BITMAP "res/bitmaps/reactosserver.bmp"
+IDB_LINEBAR BITMAP "res/bitmaps/line.bmp"
IDB_DLG_BG BITMAP "res/bitmaps/dlg_bg.bmp"
IDB_REACTOS_FLAG BITMAP "res/bitmaps/reactos_flag.bmp"
diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp
index 4c722f5fc40..0195a53a7d2 100644
Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ
diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp
new file mode 100644
index 00000000000..9410cfd6896
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/reactosserver.bmp differ
diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp
new file mode 100644
index 00000000000..27921a18fb3
Binary files /dev/null and b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp differ
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index f7229bb66b5..dcad860d37f 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -28,6 +28,8 @@
/* Bitmaps */
#define IDB_REACTOS 131
+#define IDB_REACTOS_WORKSTATION 400
+#define IDB_REACTOS_SERVER 401
#define IDB_LINEBAR 138
#define IDB_SHELL_IEXPLORE_LG 204
#define IDB_SHELL_IEXPLORE_LG_HOT 205
diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c
index a89999c4774..616356c00b1 100644
--- a/dll/win32/shell32/wine/shell32_main.c
+++ b/dll/win32/shell32/wine/shell32_main.c
@@ -45,6 +45,7 @@
#include
#include
+#include
WINE_DEFAULT_DEBUG_CHANNEL(shell);
const char * const SHELL_Authors[] = { "Copyright 1993-"COPYRIGHT_YEAR" WINE team", "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team", 0 };
@@ -1158,7 +1159,16 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
WCHAR szAuthorsText[20];
// Preload the ROS bitmap
- hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+ if (IsWindowsServer())
+ {
+ // Load Server Bitmap
+ hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_SERVER), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+ }
+ else
+ {
+ // Load Workstation Bitmap
+ hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+ }
hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if(hLogoBmp && hLineBmp)
diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp
index 4c722f5fc40..0195a53a7d2 100644
Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ