diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po b/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po
index 52c63cfbbf..069afc5e44 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.cs.po
@@ -35,7 +35,7 @@ msgid "Tables"
 msgstr "Tabulky"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -43,16 +43,16 @@ msgid "Results"
 msgstr "Výsledky"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.de.po b/components/sqldb/languages/sqlstringspropertyeditordlg.de.po
index fadaf7c42a..e4d9df5129 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.de.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.de.po
@@ -34,7 +34,7 @@ msgid "Tables"
 msgstr "Tabellen"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -42,16 +42,16 @@ msgid "Results"
 msgstr "Ergebnisse"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.es.po b/components/sqldb/languages/sqlstringspropertyeditordlg.es.po
index b2c3c2d3af..cf464c2041 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.es.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.es.po
@@ -34,7 +34,7 @@ msgid "Tables"
 msgstr "Tablas"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -42,16 +42,16 @@ msgid "Results"
 msgstr "Resultados"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.it.po b/components/sqldb/languages/sqlstringspropertyeditordlg.it.po
index a39980bad3..d399c0eba2 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.it.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.it.po
@@ -35,7 +35,7 @@ msgid "Tables"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -43,16 +43,16 @@ msgid "Results"
 msgstr "Risultati"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po b/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po
index 5cbb3f8697..b5182a5848 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.lt.po
@@ -36,7 +36,7 @@ msgid "Tables"
 msgstr "Lentelės"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -44,16 +44,16 @@ msgid "Results"
 msgstr "Rezultatai"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.po b/components/sqldb/languages/sqlstringspropertyeditordlg.po
index dddd2777e7..25f04fc8ce 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.po
@@ -26,7 +26,7 @@ msgid "Tables"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -34,16 +34,16 @@ msgid "Results"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po b/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po
index 2695556ebf..1811836e04 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.pt_BR.po
@@ -34,7 +34,7 @@ msgid "Tables"
 msgstr "Tabelas"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -42,16 +42,16 @@ msgid "Results"
 msgstr "Resultados"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po b/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po
index dea96ac055..bcdd1651ae 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.ru.po
@@ -34,7 +34,9 @@ msgid "Tables"
 msgstr "Таблицы"
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+#, fuzzy
+#| msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr "Выражение SQL не содержит синтаксических ошибок."
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -42,16 +44,24 @@ msgid "Results"
 msgstr "Результаты"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+#, fuzzy
+#| msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr "Код SQL некорректен"
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+#, fuzzy
+#| msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr "Код SQL корректен"
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
+#, fuzzy
+#| msgid ""
+#| "Syntax error in SQL statement:\n"
+#| "%s\n"
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 "Синтаксическая ошибка в выражении SQL:\n"
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po b/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po
index 909682fa2a..31bd4f7831 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.uk.po
@@ -34,7 +34,7 @@ msgid "Tables"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -42,16 +42,16 @@ msgid "Results"
 msgstr "Результати"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po b/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po
index 813d962c85..0b21849b60 100644
--- a/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po
+++ b/components/sqldb/languages/sqlstringspropertyeditordlg.zh_CN.po
@@ -37,7 +37,7 @@ msgid "Tables"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sqlsyntaxok
-msgid "No syntax errors in SQL statement."
+msgid "No syntax errors in SQL statement found."
 msgstr ""
 
 #: sqlstringspropertyeditordlg.sresulttabcaption
@@ -45,16 +45,16 @@ msgid "Results"
 msgstr "返回值"
 
 #: sqlstringspropertyeditordlg.ssqlerror
-msgid "SQL Error"
+msgid "Probable SQL error"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlok
-msgid "SQL OK"
+msgid "Quick SQL check OK"
 msgstr ""
 
 #: sqlstringspropertyeditordlg.ssqlsyntaxerror
 msgid ""
-"Syntax error in SQL statement:\n"
+"Probable syntax error in SQL statement:\n"
 "%s\n"
 msgstr ""
 
diff --git a/components/sqldb/sqlstringspropertyeditordlg.lfm b/components/sqldb/sqlstringspropertyeditordlg.lfm
index 81e00e564f..20f0d98615 100644
--- a/components/sqldb/sqlstringspropertyeditordlg.lfm
+++ b/components/sqldb/sqlstringspropertyeditordlg.lfm
@@ -9,11 +9,11 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
   ClientWidth = 494
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.1'
+  LCLVersion = '1.3'
   object ButtonsPanel: TButtonPanel
     Left = 6
-    Height = 34
-    Top = 317
+    Height = 41
+    Top = 310
     Width = 482
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -40,17 +40,23 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
     TabOrder = 1
     object OpenToolButton: TToolButton
       Left = 1
+      Hint = 'Load SQL code...'
       Top = 2
       Caption = 'OpenToolButton'
       ImageIndex = 0
       OnClick = OpenToolButtonClick
+      ParentShowHint = False
+      ShowHint = True
     end
     object SaveToolButton: TToolButton
       Left = 29
+      Hint = 'Save SQL code...'
       Top = 2
       Caption = 'SaveToolButton'
       ImageIndex = 1
       OnClick = SaveToolButtonClick
+      ParentShowHint = False
+      ShowHint = True
     end
     object DividerToolButton: TToolButton
       Left = 57
@@ -61,22 +67,28 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
     end
     object ExecuteToolButton: TToolButton
       Left = 62
+      Hint = 'Run SQL code'
       Top = 2
       Caption = 'ExecuteToolButton'
       ImageIndex = 2
       OnClick = ExecuteToolButtonClick
+      ParentShowHint = False
+      ShowHint = True
     end
     object TBCheck: TToolButton
       Left = 90
+      Hint = 'Quick check of SQL syntax'
       Top = 2
       Caption = 'TBCheck'
       ImageIndex = 3
       OnClick = TBCheckClick
+      ParentShowHint = False
+      ShowHint = True
     end
   end
   object PageControl: TPageControl
     Left = 0
-    Height = 281
+    Height = 274
     Top = 30
     Width = 494
     ActivePage = EditorTabSheet
@@ -84,13 +96,13 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
     TabIndex = 0
     TabOrder = 2
     object EditorTabSheet: TTabSheet
-      ClientHeight = 255
-      ClientWidth = 486
+      ClientHeight = 249
+      ClientWidth = 490
       inline SQLEditor: TSynEdit
         Left = 0
-        Height = 255
+        Height = 249
         Top = 0
-        Width = 486
+        Width = 490
         Align = alClient
         Font.Height = -16
         Font.Name = '-misc-dejavu sans mono-*-*-*-*-*-*-*-*-*-*-iso10646-1'
@@ -514,17 +526,31 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
             Command = emcStartDragMove
           end>
         VisibleSpecialChars = [vscSpace, vscTabAtLast]
+        SelectedColor.FrameEdges = sfeAround
+        SelectedColor.BackPriority = 50
+        SelectedColor.ForePriority = 50
+        SelectedColor.FramePriority = 50
+        SelectedColor.BoldPriority = 50
+        SelectedColor.ItalicPriority = 50
+        SelectedColor.UnderlinePriority = 50
+        SelectedColor.StrikeOutPriority = 50
+        IncrementColor.FrameEdges = sfeAround
+        HighlightAllColor.FrameEdges = sfeAround
         BracketHighlightStyle = sbhsBoth
         BracketMatchColor.Background = clNone
         BracketMatchColor.Foreground = clNone
+        BracketMatchColor.FrameEdges = sfeAround
         BracketMatchColor.Style = [fsBold]
         FoldedCodeColor.Background = clNone
         FoldedCodeColor.Foreground = clGray
         FoldedCodeColor.FrameColor = clGray
+        FoldedCodeColor.FrameEdges = sfeAround
         MouseLinkColor.Background = clNone
         MouseLinkColor.Foreground = clBlue
+        MouseLinkColor.FrameEdges = sfeAround
         LineHighlightColor.Background = clNone
         LineHighlightColor.Foreground = clNone
+        LineHighlightColor.FrameEdges = sfeAround
         inline SynGutterPartList1: TSynGutterPartList
           object SynGutterMarks1: TSynGutterMarks
             Width = 24
@@ -535,6 +561,7 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
             MouseActions = <>
             MarkupInfo.Background = clBtnFace
             MarkupInfo.Foreground = clNone
+            MarkupInfo.FrameEdges = sfeAround
             DigitCount = 2
             ShowOnlyLineNumbersMultiplesOf = 1
             ZeroStart = False
@@ -549,6 +576,9 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
           object SynGutterSeparator1: TSynGutterSeparator
             Width = 2
             MouseActions = <>
+            MarkupInfo.Background = clWhite
+            MarkupInfo.Foreground = clGray
+            MarkupInfo.FrameEdges = sfeAround
           end
           object SynGutterCodeFolding1: TSynGutterCodeFolding
             MouseActions = <            
@@ -579,6 +609,7 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
               end>
             MarkupInfo.Background = clNone
             MarkupInfo.Foreground = clGray
+            MarkupInfo.FrameEdges = sfeAround
             MouseActionsExpanded = <            
               item
                 ClickCount = ccAny
@@ -627,11 +658,11 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
       ClientWidth = 486
       object CbxMetaData: TComboBox
         Left = 8
-        Height = 21
+        Height = 23
         Hint = 'Select the type of metadata to retrieve.'
         Top = 9
         Width = 132
-        ItemHeight = 13
+        ItemHeight = 0
         ParentShowHint = False
         ShowHint = True
         TabOrder = 0
@@ -690,33 +721,33 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
     TableNameAttri.FrameEdges = sfeAround
     VariableAttri.FrameEdges = sfeAround
     SQLDialect = sqlInterbase6
-    left = 120
-    top = 156
+    left = 88
+    top = 136
   end
   object OpenDialog: TOpenDialog
     Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]
-    left = 156
-    top = 157
+    left = 152
+    top = 152
   end
   object SaveDialog: TSaveDialog
     Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing, ofViewDetail]
-    left = 188
-    top = 157
+    left = 208
+    top = 136
   end
   object SQLQuery: TSQLQuery
     FieldDefs = <>
     Params = <>
-    left = 220
-    top = 157
+    left = 264
+    top = 152
   end
   object SQLDataSource: TDatasource
     DataSet = SQLQuery
-    left = 252
-    top = 157
+    left = 336
+    top = 136
   end
   object ImageList: TImageList
-    left = 284
-    top = 156
+    left = 408
+    top = 152
     Bitmap = {
       4C69050000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00EAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96
@@ -883,8 +914,8 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
   end
   object PMSQL: TPopupMenu
     Images = ImageList
-    left = 155
-    top = 101
+    left = 152
+    top = 64
     object MICheck: TMenuItem
       Caption = 'Check syntax'
       Bitmap.Data = {
@@ -982,12 +1013,12 @@ object SQLStringsPropertyEditorDlg: TSQLStringsPropertyEditorDlg
   object SQLMeta: TSQLQuery
     FieldDefs = <>
     Params = <>
-    left = 220
+    left = 120
     top = 208
   end
   object SQLDataSource1: TDatasource
     DataSet = SQLMeta
-    left = 256
+    left = 208
     top = 208
   end
   object PMMeta: TPopupMenu
diff --git a/components/sqldb/sqlstringspropertyeditordlg.pas b/components/sqldb/sqlstringspropertyeditordlg.pas
index 8cbe7c324e..c5ea209972 100644
--- a/components/sqldb/sqlstringspropertyeditordlg.pas
+++ b/components/sqldb/sqlstringspropertyeditordlg.pas
@@ -94,10 +94,12 @@ resourcestring
   SMetaPleaseSpecifyATableInTheObjectField = 'Please specify a table in the '
     +'object field.';
   SMetaSysTables    = 'SysTables';
-  SSQLOK            = 'SQL OK';
-  SQLSyntaxOK       = 'No syntax errors in SQL statement.';
-  SSQLError         = 'SQL Error';
-  SSQLSyntaxError   = 'Syntax error in SQL statement:'+slineBreak+'%s';
+  // SQL Parser results:
+  // Note: sql parser is not quite exact, so indicate it's not completely sure
+  SSQLOK            = 'Quick SQL check OK';
+  SQLSyntaxOK       = 'No syntax errors in SQL statement found.';
+  SSQLError         = 'Probable SQL error';
+  SSQLSyntaxError   = 'Probable syntax error in SQL statement:'+slineBreak+'%s';
 
 { TSQLStringsPropertyEditorDlg }