diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index fc2e7592c..d94becd3b 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -2008,7 +2008,7 @@ void UICodeEditor::drawCursor( const Vector2f& startScroll, const Float& lineHei
 	if ( mCursorVisible && !mLocked && isTextSelectionEnabled() &&
 		 !mDocView.isFolded( cursor.line(), true ) ) {
 		auto offset = getTextPositionOffset( cursor, lineHeight );
-		Vector2f cursorPos( startScroll.x + offset.x, startScroll.y + offset.y );
+		Vector2f cursorPos( startScroll.x + offset.x, startScroll.y + offset.y + getLineOffset() );
 		Primitives primitives;
 		primitives.setColor( Color( mCaretColor ).blendAlpha( mAlpha ) );
 		primitives.drawRectangle(
diff --git a/src/thirdparty/SOIL2 b/src/thirdparty/SOIL2
index 572b7013d..bc9b68d3e 160000
--- a/src/thirdparty/SOIL2
+++ b/src/thirdparty/SOIL2
@@ -1 +1 @@
-Subproject commit 572b7013d2613f4ef8e337b28b25452a9bd60e14
+Subproject commit bc9b68d3eb6511bade642ce23a5f42043a942b05
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 97554341e..654a23f73 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -3762,10 +3762,10 @@ void App::init( InitParameters& params ) {
 	mRedirectToFirstInstance = params.redirectToFirstInstance;
 
 #ifdef ECODE_SHAREDIR
-    mResPath = ECODE_SHAREDIR;
-    FileSystem::dirAddSlashAtEnd( mResPath );
+	mResPath = ECODE_SHAREDIR;
+	FileSystem::dirAddSlashAtEnd( mResPath );
 #else
-    mResPath = Sys::getProcessPath();
+	mResPath = Sys::getProcessPath();
 #endif
 
 #if EE_PLATFORM == EE_PLATFORM_LINUX