diff --git a/data/char_teefault.png b/data/char_teefault.png
deleted file mode 100644
index 5305abd1b..000000000
Binary files a/data/char_teefault.png and /dev/null differ
diff --git a/data/chatbubble.png b/data/chatbubble.png
deleted file mode 100644
index 8bf5df242..000000000
Binary files a/data/chatbubble.png and /dev/null differ
diff --git a/data/chatbubbles.png b/data/chatbubbles.png
deleted file mode 100644
index 5d41edcea..000000000
Binary files a/data/chatbubbles.png and /dev/null differ
diff --git a/data/gui_connecting.png b/data/gui_connecting.png
deleted file mode 100644
index f8a823212..000000000
Binary files a/data/gui_connecting.png and /dev/null differ
diff --git a/data/gui_tee.png b/data/gui_tee.png
deleted file mode 100644
index 4ecfc6e1d..000000000
Binary files a/data/gui_tee.png and /dev/null differ
diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index cb08ab853..744116a44 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -191,26 +191,10 @@ images {
 		filename "data/sun.png"
 	}
 	
-	char_default {
-		filename "data/char_teefault.png"
-	}
-	
 	backdrop {
 		filename "data/mountain_paralax.png"
 	}
 
-	gui_widgets {
-		filename "data/gui_widgets.png"
-	}
-
-	menu_background {
-		filename "data/menu_background.png"
-	}
-
-	menu_butterfly {
-		filename "data/menu_butterfly.png"
-	}
-
 	cursor {
 		filename "data/gui_cursor.png"
 	}
@@ -223,10 +207,6 @@ images {
 		filename "data/cloudmap.png"
 	}
 
-	chat_bubbles {
-		filename "data/chatbubbles.png"
-	}
-
 	emoticons {
 		filename "data/emoticons.png"
 	}
@@ -619,10 +599,6 @@ sprites {
 		tee_eye_surprise 7 3 1 1
 	}
 
-	chatbubbles images.chat_bubbles 4 4 {
-		chat_dotdot 0 1 1 1
-	}
-
 	emoticons images.emoticons 4 4 {
 		oop 0 0 1 1
 		exclamation 1 0 1 1
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 1e0c81e62..f04d77129 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1539,9 +1539,9 @@ static void render_player(
 
 	if(player.state == STATE_CHATTING)
 	{
-		gfx_texture_set(data->images[IMAGE_CHAT_BUBBLES].id);
+		gfx_texture_set(data->images[IMAGE_EMOTICONS].id);
 		gfx_quads_begin();
-		select_sprite(SPRITE_CHAT_DOTDOT);
+		select_sprite(SPRITE_DOTDOT);
 		gfx_quads_draw(position.x + 24, position.y - 40, 64,64);
 		gfx_quads_end();
 	}
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
index a0099929d..6067edf0f 100644
--- a/src/game/client/menu.cpp
+++ b/src/game/client/menu.cpp
@@ -37,6 +37,7 @@ enum gui_tileset_enum
 
 void draw_area(gui_tileset_enum tileset, int areax, int areay, int areaw, int areah, float x, float y, float w, float h)
 {
+/*
 	const float tex_w = 512.0, tex_h = 512.0;
 
 	switch (tileset)
@@ -69,6 +70,7 @@ void draw_area(gui_tileset_enum tileset, int areax, int areay, int areaw, int ar
 		te_y); // endy								
     gfx_quads_drawTL(x,y,w,h);
     gfx_quads_end();
+    */
 }
 
 void draw_part(int part_type, gui_tileset_enum tileset, float x, float y, float w, float h)
@@ -163,11 +165,14 @@ void draw_background(float t)
 		draw_sprite(4000 - fmod(t * 60 + 500, 4512), 300+130, 256);
     gfx_quads_end();
 
+	/*
     gfx_texture_set(data->images[IMAGE_MENU_BACKGROUND].id);
     gfx_quads_begin();
 	    gfx_quads_drawTL(0, 430, 1600, 1600/2);
     gfx_quads_end();
+    */
 
+/*
 	int frame = int(t * 10) % 3;
 
 	//float x_path = -t
@@ -193,6 +198,7 @@ void draw_background(float t)
 		0.5f); // endy								
     gfx_quads_drawTL(1250 + x_nudge, 480 + y_nudge, 64, 64);
     gfx_quads_end();
+    */
 }
 
 void draw_image_button(const void *id, const char *text, int checked, float x, float y, float w, float h, void *extra)