diff --git a/data/editor/cursor.png b/data/editor/cursor.png
index 4e0f0cefc..0b292de70 100644
Binary files a/data/editor/cursor.png and b/data/editor/cursor.png differ
diff --git a/data/gui_cursor.png b/data/gui_cursor.png
index 4e0f0cefc..e5adb7733 100644
Binary files a/data/gui_cursor.png and b/data/gui_cursor.png differ
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp
index 421dd862e..a4c9e539a 100644
--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@@ -172,12 +172,14 @@ void CEmoticon::OnRender()
 	else
 		m_SelectedEyeEmote = -1;
 
+	Graphics()->WrapClamp();
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CURSOR].m_Id);
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(1,1,1,1);
 	IGraphics::CQuadItem QuadItem(m_SelectorMouse.x+Screen.w/2,m_SelectorMouse.y+Screen.h/2,24,24);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
 }
 
 void CEmoticon::Emote(int Emoticon)
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 5b3fcbfc7..08f5c395a 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -2136,12 +2136,14 @@ void CMenus::OnRender()
 	Render();
 
 	// render cursor
+	Graphics()->WrapClamp();
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CURSOR].m_Id);
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(1,1,1,1);
 	IGraphics::CQuadItem QuadItem(mx, my, 24, 24);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
 
 	// render debug information
 	if(g_Config.m_Debug)
diff --git a/src/game/client/components/spectator.cpp b/src/game/client/components/spectator.cpp
index 6e5e0e2db..0026cf866 100644
--- a/src/game/client/components/spectator.cpp
+++ b/src/game/client/components/spectator.cpp
@@ -445,12 +445,14 @@ void CSpectator::OnRender()
 	TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
 
 	// draw cursor
+	Graphics()->WrapClamp();
 	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_CURSOR].m_Id);
 	Graphics()->QuadsBegin();
 	Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
 	IGraphics::CQuadItem QuadItem(m_SelectorMouse.x+Width/2.0f, m_SelectorMouse.y+Height/2.0f, 48.0f, 48.0f);
 	Graphics()->QuadsDrawTL(&QuadItem, 1);
 	Graphics()->QuadsEnd();
+	Graphics()->WrapNormal();
 }
 
 void CSpectator::OnReset()
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index 2f05bf8b1..617dda9a9 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -6129,6 +6129,7 @@ void CEditor::Render()
 		// render butt ugly mouse cursor
 		float mx = UI()->MouseX();
 		float my = UI()->MouseY();
+		Graphics()->WrapClamp();
 		Graphics()->TextureSet(m_CursorTexture);
 		Graphics()->QuadsBegin();
 		if(ms_pUiGotContext == UI()->HotItem())
@@ -6136,6 +6137,7 @@ void CEditor::Render()
 		IGraphics::CQuadItem QuadItem(mx,my, 16.0f, 16.0f);
 		Graphics()->QuadsDrawTL(&QuadItem, 1);
 		Graphics()->QuadsEnd();
+		Graphics()->WrapNormal();
 	}
 }