diff --git a/Source/client/valve/hud.c b/Source/client/valve/hud.c
index cfdd6842..189c6458 100644
--- a/Source/client/valve/hud.c
+++ b/Source/client/valve/hud.c
@@ -198,7 +198,7 @@ void HUD_DrawAmmo1(void)
 		ammo1_alpha = HUD_ALPHA;
 	}
 	
-	pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
 
 	/* Magazine/Clip */
 	if (pl.a_ammo1 != -1) {
@@ -227,7 +227,7 @@ void HUD_DrawAmmo2(void)
 		ammo2_alpha = HUD_ALPHA;
 	}
 
-	pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
 
 	/* Leftover Ammo */
 	HUD_DrawNums(pl.a_ammo2, pos, ammo2_alpha, g_hud_color);
@@ -252,7 +252,7 @@ void HUD_DrawAmmo3(void)
 		ammo3_alpha = HUD_ALPHA;
 	}
 	
-	pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
 
 	/* Special */
 	//if (pl.a_ammo3) {
diff --git a/Source/shared/valve/w_crossbow.c b/Source/shared/valve/w_crossbow.c
index 2f9a5232..51399e9a 100644
--- a/Source/shared/valve/w_crossbow.c
+++ b/Source/shared/valve/w_crossbow.c
@@ -66,10 +66,10 @@ void w_crossbow_draw(void)
 	Weapons_SetModel("models/v_crossbow.mdl");
 
 	if (pl.a_ammo1) {
-        Weapons_ViewAnimation(CROSSBOW_DRAW1);
-    } else {
-        Weapons_ViewAnimation(CROSSBOW_DRAW2);
-    }
+		Weapons_ViewAnimation(CROSSBOW_DRAW1);
+	} else {
+		Weapons_ViewAnimation(CROSSBOW_DRAW2);
+	}
 }
 
 void w_crossbow_holster(void)
@@ -225,6 +225,8 @@ void w_crossbow_crosshair(void)
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_egon.c b/Source/shared/valve/w_egon.c
index fede4d5d..801cb671 100644
--- a/Source/shared/valve/w_egon.c
+++ b/Source/shared/valve/w_egon.c
@@ -134,6 +134,8 @@ void w_egon_crosshair(void)
 	cross_pos = (video_res / 2) + [-12,-12];
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_gauss.c b/Source/shared/valve/w_gauss.c
index 11e749df..11c00af7 100644
--- a/Source/shared/valve/w_gauss.c
+++ b/Source/shared/valve/w_gauss.c
@@ -348,6 +348,8 @@ void w_gauss_crosshair(void)
 	cross_pos = (video_res / 2) + [-12,-12];
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_glock.c b/Source/shared/valve/w_glock.c
index 88036958..39aa9697 100644
--- a/Source/shared/valve/w_glock.c
+++ b/Source/shared/valve/w_glock.c
@@ -219,6 +219,8 @@ void w_glock_hud(void)
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [0.1875,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 void w_glock_hudpic(int s, vector pos)
diff --git a/Source/shared/valve/w_handgrenade.c b/Source/shared/valve/w_handgrenade.c
index c32a957b..c998e2bd 100644
--- a/Source/shared/valve/w_handgrenade.c
+++ b/Source/shared/valve/w_handgrenade.c
@@ -166,6 +166,8 @@ void w_handgrenade_hud(void)
 {
 #ifdef CSQC
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_hornetgun.c b/Source/shared/valve/w_hornetgun.c
index e2d87c9a..9fd0b669 100644
--- a/Source/shared/valve/w_hornetgun.c
+++ b/Source/shared/valve/w_hornetgun.c
@@ -206,6 +206,8 @@ void w_hornetgun_crosshair(void)
 	cross_pos = (video_res / 2) + [-12,-12];
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_mp5.c b/Source/shared/valve/w_mp5.c
index 43786c34..8cd015c0 100644
--- a/Source/shared/valve/w_mp5.c
+++ b/Source/shared/valve/w_mp5.c
@@ -231,6 +231,10 @@ void w_mp5_crosshair(void)
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
 	HUD_DrawAmmo3();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
+	aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 74];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_python.c b/Source/shared/valve/w_python.c
index d0cf4ff2..deffa69b 100644
--- a/Source/shared/valve/w_python.c
+++ b/Source/shared/valve/w_python.c
@@ -179,6 +179,8 @@ void w_python_crosshair(void)
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_rpg.c b/Source/shared/valve/w_rpg.c
index ee9ccc79..59331645 100644
--- a/Source/shared/valve/w_rpg.c
+++ b/Source/shared/valve/w_rpg.c
@@ -222,6 +222,8 @@ void w_rpg_laser(void)
 	drawpic(cross_pos, "sprites/laserdot.spr_0.tga", lasersize, [1,1,1], 1.0f, DRAWFLAG_ADDITIVE);
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_satchel.c b/Source/shared/valve/w_satchel.c
index 3e16a471..e3587dd2 100644
--- a/Source/shared/valve/w_satchel.c
+++ b/Source/shared/valve/w_satchel.c
@@ -222,6 +222,8 @@ void w_satchel_hud(void)
 {
 #ifdef CSQC
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_shotgun.c b/Source/shared/valve/w_shotgun.c
index d82aecbf..7d10bbb3 100644
--- a/Source/shared/valve/w_shotgun.c
+++ b/Source/shared/valve/w_shotgun.c
@@ -248,6 +248,8 @@ void w_shotgun_crosshair(void)
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo1();
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_snark.c b/Source/shared/valve/w_snark.c
index 084a5b32..a982bbb4 100644
--- a/Source/shared/valve/w_snark.c
+++ b/Source/shared/valve/w_snark.c
@@ -198,8 +198,8 @@ void w_snark_precache(void)
 	precache_sound("squeek/sqk_die1.wav");
 	precache_sound("squeek/sqk_blast1.wav");
 	precache_sound("squeek/sqk_hunt1.wav");
-    precache_sound("squeek/sqk_hunt2.wav");
-    precache_sound("squeek/sqk_hunt3.wav");
+	precache_sound("squeek/sqk_hunt2.wav");
+	precache_sound("squeek/sqk_hunt3.wav");
 }
 void w_snark_updateammo(player pl)
 {
@@ -230,6 +230,8 @@ void w_snark_hud(void)
 {
 #ifdef CSQC
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/Source/shared/valve/w_tripmine.c b/Source/shared/valve/w_tripmine.c
index c6e6540d..8fbf7f8a 100644
--- a/Source/shared/valve/w_tripmine.c
+++ b/Source/shared/valve/w_tripmine.c
@@ -244,6 +244,8 @@ void w_tripmine_hud(void)
 {
 #ifdef CSQC
 	HUD_DrawAmmo2();
+	vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
 #endif
 }