diff --git a/regamedll/dlls/API/CSPlayer.cpp b/regamedll/dlls/API/CSPlayer.cpp
index e55afd082..219dca12c 100644
--- a/regamedll/dlls/API/CSPlayer.cpp
+++ b/regamedll/dlls/API/CSPlayer.cpp
@@ -249,11 +249,13 @@ EXT_FUNC CBaseEntity *CCSPlayer::GiveNamedItemEx(const char *pszName)
 
 	if (FStrEq(pszName, "weapon_c4")) {
 		pPlayer->m_bHasC4 = true;
-		pPlayer->SetBombIcon();
 
 		if (pPlayer->m_iTeam == TERRORIST) {
 			pPlayer->pev->body = 1;
 		}
+
+		pPlayer->SetBombIcon();
+
 	} else if (FStrEq(pszName, "weapon_shield")) {
 		pPlayer->DropPrimary();
 		pPlayer->DropPlayerItem("weapon_elite");
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index 030c4c045..99bf2b982 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -1695,7 +1695,6 @@ void EXT_FUNC CBasePlayer::__API_HOOK(GiveDefaultItems)()
 
 void CBasePlayer::RemoveAllItems(BOOL removeSuit)
 {
-	bool bKillProgBar = false;
 	int i;
 
 #ifdef REGAMEDLL_FIXES
@@ -1715,20 +1714,12 @@ void CBasePlayer::RemoveAllItems(BOOL removeSuit)
 	{
 		m_bHasC4 = false;
 		pev->body = 0;
-
-		MESSAGE_BEGIN(MSG_ONE, gmsgStatusIcon, nullptr, pev);
-			WRITE_BYTE(STATUSICON_HIDE);
-			WRITE_STRING("c4");
-		MESSAGE_END();
-
-		bKillProgBar = true;
+		SetBombIcon(FALSE);
+		SetProgressBarTime(0);
 	}
 
 	RemoveShield();
 
-	if (bKillProgBar)
-		SetProgressBarTime(0);
-
 	if (m_pActiveItem)
 	{
 		ResetAutoaim();
@@ -10361,8 +10352,8 @@ bool EXT_FUNC CBasePlayer::__API_HOOK(MakeBomber)()
 	}
 
 	m_bHasC4 = true;
-	SetBombIcon();
 	pev->body = 1;
+	SetBombIcon();
 
 	m_flDisplayHistory |= DHF_BOMB_RETRIEVED;
 	HintMessage("#Hint_you_have_the_bomb", FALSE, TRUE);
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
index 2d5b5ed57..3baa8a44e 100644
--- a/regamedll/dlls/weapons.cpp
+++ b/regamedll/dlls/weapons.cpp
@@ -1920,8 +1920,8 @@ void CWeaponBox::Touch(CBaseEntity *pOther)
 				MESSAGE_END();
 
 				pPlayer->m_bHasC4 = true;
-				pPlayer->SetBombIcon(FALSE);
 				pPlayer->pev->body = 1;
+				pPlayer->SetBombIcon(FALSE);
 
 				CBaseEntity *pEntity = nullptr;
 				while ((pEntity = UTIL_FindEntityByClassname(pEntity, "player")))