diff --git a/Versions/build.txt b/Versions/build.txt
index 57bf58ca8..54c9fc81b 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1727
+1728
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 2e09a7354..64614fd3f 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.526.1727"
+    version="5.19.526.1728"
     type="win32"
   />
   <description>Notepad3 ONIGURUMA</description>
diff --git a/src/Edit.c b/src/Edit.c
index 82e318496..2a8ca6f62 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4399,7 +4399,6 @@ void EditSetSelectionEx(HWND hwnd, DocPos iAnchorPos, DocPos iCurrentPos, DocPos
   // remember x-pos for moving caret vertically
   SciCall_ChooseCaretX();
 
-  UpdateVisibleUrlIndics();
   UpdateToolbar();
   UpdateStatusbar(false);
 }
@@ -6910,7 +6909,6 @@ void EditHideNotMarkedLineRange(HWND hwnd, bool bHideLines)
     Style_SetFolding(hwnd, FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding);
     Sci_ApplyLexerStyle(0, -1);
     EditMarkAllOccurrences(hwnd, true);
-    UpdateVisibleUrlIndics();
   }
   else // =====   fold lines without marker   =====
   {
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 027420631..f99107a77 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1326,7 +1326,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 
     // update Scintilla colors
     case WM_SYSCOLORCHANGE:
-      UpdateVisibleUrlIndics();
+      EditUpdateUrlIndicators(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
       MarkAllOccurrences(0, true);
       UpdateAllBars(false);
       return DefWindowProc(hwnd,umsg,wParam,lParam);
@@ -2302,7 +2302,8 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
   SendWMSize(hwnd, rc);
 
   UpdateUI();
-  UpdateVisibleUrlIndics();
+  EditUpdateUrlIndicators(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
+  MarkAllOccurrences(0, true);
   UpdateAllBars(false);
   
   return 0;
@@ -2363,9 +2364,9 @@ LRESULT MsgThemeChanged(HWND hwnd, WPARAM wParam ,LPARAM lParam)
 
   SendWMSize(hwnd, NULL);
 
-  if (FocusedView.HideNonMatchedLines) { EditToggleView(Globals.hwndEdit); }
-  UpdateVisibleUrlIndics();
+  EditUpdateUrlIndicators(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
   MarkAllOccurrences(0, true);
+  if (FocusedView.HideNonMatchedLines) { EditToggleView(Globals.hwndEdit); }
   UpdateUI();
   UpdateAllBars(false);
 
@@ -3565,7 +3566,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
         }
         _OBSERVE_NOTIFY_CHANGE_;
         EndWaitCursor();
-        UpdateVisibleUrlIndics();
         UpdateStatusbar(false);
       }
       break;
@@ -4975,7 +4975,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
     case IDM_VIEW_TOGGLE_VIEW:
       if (FocusedView.HideNonMatchedLines) {
         EditToggleView(Globals.hwndEdit);
-        UpdateVisibleUrlIndics();
         MarkAllOccurrences(0, true);
       }
       else {
@@ -5060,7 +5059,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 
     case IDM_VIEW_HYPERLINKHOTSPOTS:
       Settings.HyperlinkHotspot = !Settings.HyperlinkHotspot;
-      UpdateVisibleUrlIndics();
+      EditUpdateUrlIndicators(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
       break;
 
     case IDM_VIEW_ZOOMIN:
@@ -6658,6 +6657,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
           MarkAllOccurrences(Settings2.UpdateDelayMarkAllOccurrences, false);
         }
       }
+
       if (Settings.HyperlinkHotspot) {
         UpdateVisibleUrlIndics();
       }
@@ -6733,6 +6733,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
       DocLn const iFirstLine = SciCall_LineFromPosition((DocPos)scn->position);
       DocLn const iLastLine = SciCall_LineFromPosition((DocPos)(scn->position + scn->length - 1));
       for (DocLn i = iFirstLine; i <= iLastLine; ++i) { SciCall_EnsureVisible(i); }
+      UpdateVisibleUrlIndics();
     }
     break;
 
@@ -10026,7 +10027,6 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
 
     //bReadOnly = false;
     _SetSaveNeededFlag(bReload);
-    UpdateVisibleUrlIndics();
     UpdateAllBars(true);
 
     // consistent settings file handling (if loaded in editor)
diff --git a/src/Styles.c b/src/Styles.c
index c7a038ae0..a286192cb 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -1426,8 +1426,10 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
 
   // apply lexer styles
   Sci_ApplyLexerStyle(0, -1);
+  EditUpdateUrlIndicators(Globals.hwndEdit, 0, -1, Settings.HyperlinkHotspot);
+
   if (bFocusedView) { EditToggleView(Globals.hwndEdit); }
-  UpdateVisibleUrlIndics();
+
   UpdateAllBars(false);
 }
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 91bf19d9f..539e5641f 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 526
-#define VERSION_BUILD 1727
+#define VERSION_BUILD 1728
 #define SCINTILLA_VER 415+
 #define ONIGURUMA_REGEX_VER 6.9.2
 #define VERSION_PATCH ONIGURUMA