diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 9a109bbf..9c175bf8 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -24,6 +24,7 @@ GNU General Public License for more details.
 #include "vid_common.h"
 #include "pm_local.h"
 #include "multi_emulator.h"
+#include "cl_spray.h"
 
 #define MAX_CMD_BUFFER        8000
 #define CL_CONNECTION_TIMEOUT 15.0f
@@ -1317,19 +1318,16 @@ static void CL_CreateResourceList( void )
 	cl.num_resources = 0;
 	memset( rgucMD5_hash, 0, sizeof( rgucMD5_hash ));
 
+	// sanitize cvar value
+	if( Q_strcmp( cl_logoext.string, "bmp" ) && Q_strcmp( cl_logoext.string, "png" ))
+		Cvar_DirectSet( &cl_logoext, "bmp" );
+
+	Q_snprintf( szFileName, sizeof( szFileName ), "logos/remapped.%s", cl_logoext.string );
 	if( cls.legacymode == PROTO_GOLDSRC )
 	{
-		// TODO: actually repack remapped.bmp into a WAD for GoldSrc servers
+		CL_ConvertImageToWAD3( szFileName );
 		Q_strncpy( szFileName, "tempdecal.wad", sizeof( szFileName ));
 	}
-	else
-	{
-		// sanitize cvar value
-		if( Q_strcmp( cl_logoext.string, "bmp" ) && Q_strcmp( cl_logoext.string, "png" ))
-			Cvar_DirectSet( &cl_logoext, "bmp" );
-
-		Q_snprintf( szFileName, sizeof( szFileName ), "logos/remapped.%s", cl_logoext.string );
-	}
 	fp = FS_Open( szFileName, "rb", true );
 
 	if( !fp )
diff --git a/engine/client/cl_spray.c b/engine/client/cl_spray.c
new file mode 100644
index 00000000..efdddeaa
--- /dev/null
+++ b/engine/client/cl_spray.c
@@ -0,0 +1,209 @@
+/*
+cl_spray.c - spray conversion for GoldSrc protocol
+Copyright (C) 2025 Xash3D FWGS contributors
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*/
+
+#include "common.h"
+#include "filesystem.h"
+#include "imagelib.h"
+#include "cl_spray.h"
+
+// adjusts spray dimensions
+static void CL_AdjustSprayDimensions( int *width, int *height )
+{
+	float aspect = (float)( *width ) / (float)( *height );
+	int   h, w;
+	for( h = (( *height ) / 16 ) * 16; h >= 16; h -= 16 )
+	{
+		w = ((int)( h * aspect ) / 16 ) * 16;
+		if( w < 16 || w > *width )
+			continue;
+		if( w * h < SPRAY_MAX_SURFACE )
+		{
+			*width = w;
+			*height = h;
+			return;
+		}
+	}
+	// fallback: minimal size
+	*width = 16;
+	*height = 16;
+}
+
+// loads and prepares the image
+static rgbdata_t *CL_LoadAndPrepareImage( const char *filename, int *width, int *height, qboolean keep8bit )
+{
+	rgbdata_t *image = NULL;
+	rgbdata_t *scaled = NULL;
+	byte      *pix;
+	byte      *resampled_buf;
+	qboolean  resampled = false;
+	int bpp, i;
+
+	if( keep8bit )
+	{
+		Image_SetForceFlags( IL_KEEP_8BIT );
+		image = FS_LoadImage( filename, NULL, 0 );
+		Image_SetForceFlags( 0 );
+	}
+	else
+	{
+		image = FS_LoadImage( filename, NULL, 0 );
+	}
+	if( !image )
+		return NULL;
+
+	bpp = ( image->type == PF_RGBA_32 ) ? 4 : ( image->type == PF_INDEXED_32 ? 1 : 3 );
+	if( !keep8bit && ( bpp == 3 || bpp == 4 ))
+	{
+		pix = image->buffer;
+		for( i = 0; i < image->width * image->height; i++, pix += bpp )
+		{
+			if( bpp == 4 && pix[3] <= 128 )
+			{
+				pix[0] = 0;
+				pix[1] = 0;
+				pix[2] = 255;
+				pix[3] = 255;
+			}
+			else if( bpp == 3 && pix[0] == 0 && pix[1] == 0 && pix[2] == 255 )
+			{
+				pix[2] = 254;
+			}
+		}
+	}
+
+	*width = image->width;
+	*height = image->height;
+	CL_AdjustSprayDimensions( width, height );
+
+	if( *width != image->width || *height != image->height )
+	{
+		// resample image to fit spray size constraints
+		resampled_buf = Image_ResampleInternal(
+			image->buffer, image->width, image->height,
+			*width, *height, image->type, &resampled
+			);
+		if( !resampled_buf )
+		{
+			FS_FreeImage( image );
+			return NULL;
+		}
+		scaled = Mem_Malloc( host.imagepool, sizeof( rgbdata_t ));
+		*scaled = *image;
+		scaled->width = *width;
+		scaled->height = *height;
+		scaled->size = *width * *height * (( image->type == PF_RGBA_32 ) ? 4 : ( image->type == PF_INDEXED_32 ? 1 : 3 ));
+		scaled->buffer = Mem_Malloc( host.imagepool, scaled->size );
+		memcpy( scaled->buffer, resampled_buf, scaled->size );
+		if( keep8bit && image->palette )
+		{
+			// copy 8-bit palette for resampled bmp
+			scaled->palette = Mem_Malloc( host.imagepool, 256 * 4 );
+			memcpy( scaled->palette, image->palette, 256 * 4 );
+		}
+		FS_FreeImage( image );
+		image = scaled;
+	}
+
+	return image;
+}
+
+// converts an image to WAD3 spray or miptex format
+qboolean CL_ConvertImageToWAD3( const char *filename )
+{
+	const char *ext;
+	qboolean   is_bmp;
+	int       width = 0, height = 0;
+	int       i, idx;
+	byte      palette[SPRAY_PALETTE_BYTES];
+	byte      *indexed = NULL;
+	byte      *bmp_palette = NULL;
+	rgbdata_t *image = NULL;
+	rgbdata_t *quant = NULL;
+	rgbdata_t temp_image = {0};
+
+	ext = Q_strrchr( filename, '.' );
+	is_bmp = ( ext && !Q_stricmp( ext, ".bmp" ));
+
+	image = CL_LoadAndPrepareImage( filename, &width, &height, is_bmp );
+	if( !image )
+		return false;
+
+	if( is_bmp )
+	{
+		// copy bmp palette from rgba to rgb
+		for( i = 0; i < 256; ++i )
+		{
+			palette[i * 3 + 0] = image->palette[i * 4 + 0]; // R
+			palette[i * 3 + 1] = image->palette[i * 4 + 1]; // G
+			palette[i * 3 + 2] = image->palette[i * 4 + 2]; // B
+		}
+		indexed = image->buffer;
+	}
+	else
+	{
+		quant = Image_Quantize( image );
+		if( !quant || !quant->buffer || !quant->palette )
+			goto cleanup;
+		// remap palette index 255 to 254 to avoid transparency conflicts
+		for( i = 0; i < 3; ++i )
+			quant->palette[254 * 3 + i] = quant->palette[255 * 3 + i];
+		for( i = 0; i < width * height; ++i )
+		{
+			if( quant->buffer[i] == 255 )
+				quant->buffer[i] = 254;
+		}
+		// set index 255 for transparent pixels in rgba images
+		if( image->type == PF_RGBA_32 )
+		{
+			for( i = 0; i < width * height; ++i )
+			{
+				if( image->buffer[i * 4 + 3] < 128 )
+					quant->buffer[i] = 255;
+			}
+		}
+		quant->palette[255 * 3 + 0] = 0;
+		quant->palette[255 * 3 + 1] = 0;
+		quant->palette[255 * 3 + 2] = 255;
+		memcpy( palette, quant->palette, SPRAY_PALETTE_BYTES );
+		indexed = quant->buffer;
+		// ensure blue (0,0,255) is always transparent for non-rgba images
+		if( image->type != PF_RGBA_32 )
+		{
+			for( i = 0; i < width * height; ++i )
+			{
+				idx = indexed[i];
+				if( quant->palette[idx * 3 + 0] == 0
+				    && quant->palette[idx * 3 + 1] == 0
+				    && quant->palette[idx * 3 + 2] == 255 )
+					indexed[i] = 255;
+			}
+		}
+	}
+
+	temp_image.width = width;
+	temp_image.height = height;
+	temp_image.type = PF_INDEXED_32;
+	temp_image.buffer = indexed;
+	temp_image.size = width * height;
+	temp_image.palette = palette;
+	if( is_bmp )
+		temp_image.flags |= IMAGE_GRADIENT_DECAL;
+	return Image_SaveWAD( SPRAY_FILENAME, &temp_image );
+
+cleanup:
+	if( image )
+		FS_FreeImage( image );
+	return false;
+}
\ No newline at end of file
diff --git a/engine/client/cl_spray.h b/engine/client/cl_spray.h
new file mode 100644
index 00000000..e7a7c5a2
--- /dev/null
+++ b/engine/client/cl_spray.h
@@ -0,0 +1,25 @@
+/*
+cl_spray.h - spray conversion for GoldSrc protocol
+Copyright (C) 2025 Xash3D FWGS contributors
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*/
+
+#ifndef CL_SPRAY_H
+#define CL_SPRAY_H
+
+// constants
+#define SPRAY_MAX_SURFACE   12228
+#define SPRAY_PALETTE_SIZE  256
+#define SPRAY_PALETTE_BYTES ( SPRAY_PALETTE_SIZE * 3 )
+#define SPRAY_FILENAME      "tempdecal.wad"
+
+qboolean CL_ConvertImageToWAD3( const char *filename );
+
+#endif // CL_SPRAY_H
\ No newline at end of file
diff --git a/engine/common/custom.c b/engine/common/custom.c
index 0d691852..22f03d6f 100644
--- a/engine/common/custom.c
+++ b/engine/common/custom.c
@@ -25,6 +25,8 @@ static rgbdata_t *CustomDecal_LoadImage( const char *path, void *raw, int size )
 	// this way we limit file types
 	if( !Q_stricmp( COM_FileExtension( path ), "png" ))
 		testname = "#logo.png";
+	else if( !Q_stricmp( COM_FileExtension( path ), "wad" ))
+		testname = "#logo.wad";
 	else testname = "#logo.bmp";
 
 	Image_SetForceFlags( IL_LOAD_PLAYER_DECAL );