diff --git a/res/icons/magnifier.png b/res/icons/magnifier.png
new file mode 100644
index 00000000..cf3d97f7
Binary files /dev/null and b/res/icons/magnifier.png differ
diff --git a/source/main.dfm b/source/main.dfm
index de0d67c9..71ea7019 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -1559,6 +1559,9 @@ object MainForm: TMainForm
       object Replacetext1: TMenuItem
         Action = actQueryReplace
       end
+      object actFindTextOnServer1: TMenuItem
+        Action = actFindTextOnServer
+      end
     end
     object Extra1: TMenuItem
       Tag = 19
@@ -1606,9 +1609,6 @@ object MainForm: TMainForm
       object menuMaintenance: TMenuItem
         Action = actMaintenance
       end
-      object actFindTextOnServer1: TMenuItem
-        Action = actFindTextOnServer
-      end
       object Bulktableeditor1: TMenuItem
         Action = actBulkTableEdit
       end
@@ -1796,7 +1796,7 @@ object MainForm: TMainForm
       Category = 'Tools'
       Caption = 'Find text on server'
       Hint = 'Searches selected tables for text occurences'
-      ImageIndex = 30
+      ImageIndex = 146
       ShortCut = 24646
       OnExecute = actTableToolsExecute
     end
@@ -2417,7 +2417,7 @@ object MainForm: TMainForm
     Left = 104
     Top = 232
     Bitmap = {
-      494C010192009C00040010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
+      494C010193009C00040010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000005002000001002000000000000050
       02000000000000000000000000000000000000000000349CD9FF2F98D8FF2A93
       D7FF268FD6FF218BD5FF1C87D4FF1883D3FF137ED2FF107AD1FF0D77D1FF0974
@@ -2433,110 +2433,110 @@ object MainForm: TMainForm
       7AFF772C79FFC53812FFC53511FFC32F11FFBF2C10FFBF280FFFBE250EFF7A4D
       23FF78481FFF75441CFF734019FF713D17FF0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      020302080F1A0000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000041A7DBFFBEECFBFF57CF
       F5FF3FAFECFF4CB9EFFF58C1EFFF5EC5EFFF5AC3EFFF4AB5EFFF35A4E6FF2899
       E1FF36B7EEFFB0E3F8FF0873D0FF000000003F3BF3FF989AFEFF9597FEFF9294
       FEFF9092FEFFC94113FFE0925BFFDF8E57FFDF8C53FFDE894FFFBF2C10FFA1C9
       9DFF9CC598FF97C294FF93BF90FF256B2AFF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000010104061241
+      68AD20659CFF082F4C8700000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000047ACDCFFC0EEFBFF5DD3
       F7FF6ADBFCFF7DE5FFFF8EEDFFFF96F2FFFF92EDFFFF7ADFFFFF59CCF8FF44BD
       EFFF3AB9EEFFB2E3F9FF0D77D1FF000000004845F5FF9D9FFEFF595CFEFF5457
       FEFF9496FEFFCD4A14FFE19661FFDA7E3FFFD97B39FFDF8E56FFC53311FFA7CD
       A3FF75AF6FFF6EAA68FF99C395FF2C7431FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000010304061B486FAD538C
+      BBFF88B4DDFF165D96FF00000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000004CB1DDFFC2EFFBFF63D6
       F8FF4AB5ECFF58BCEFFF94EBFFFF2E96DDFF4B81AAFF83E1FFFF3FA8E9FF309E
       E1FF40BDEFFFB3E5F9FF127CD2FF00000000514FF6FFA1A3FEFF6064FEFF5B5F
       FEFF989AFEFFCF5316FFE39B6AFFDC8548FFDB8242FFE0935CFFC53A12FFAED1
       AAFF7EB678FF77B171FF9FC89BFF337E3AFF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000001030406275076AD6296C4FF9CC0
+      E4FF6498C7FF1B5B90EB00000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000051B6DEFFC5F0FCFF68D9
       F8FF7AE2FDFF8FE8FFFF98E9FFFF309EDFFF528AB1FF89E2FFFF68D0F9FF4EC4
       F1FF44C0F0FFB5E7F9FF1682D3FF000000005959F8FFA7A9FEFF696DFEFF6367
       FEFF9D9FFEFFD15E18FFE5A172FFDE8B51FFDD884BFFE29864FFC94313FFB4D5
-      AFFF89BC82FF82B77BFFA6CDA2FF3B8A42FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      AFFF89BC82FF82B77BFFA6CDA2FF3B8A42FF0000000000000000020101027F66
+      5197BF9676E3D1A37CFDCE9E78FDB78A68E48C7F77DE73A1CCFFAACBE8FF74A3
+      CEFF2B659AEB050F182700000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000056BADFFFC7F1FCFF6DDC
       F9FF54BAEDFF5FBCEFFF9AE7FFFF33A5E2FF49A3E1FF8FE2FFFF47ACE9FF36A3
       E3FF47C3F0FFB7E8F9FF1C87D4FF000000006162FAFFABAEFEFF7074FEFF6B6F
       FEFFA1A3FEFFD6671CFFE7A679FFE0915AFFDF8E54FFE49D6CFFCD4C14FFB9D9
-      B4FFB6D6B0FFB2D3ADFFADD1A8FF43954BFF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      B4FFB6D6B0FFB2D3ADFFADD1A8FF43954BFF0000000002010102A88A70C0E8C9
+      ADFFF5E1CDFFF7E5D3FFF7E5D1FFF3DDC8FFDFB99BFFC7A790FF85ADD5FF3A71
+      A6EB08111B270000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000005ABEE0FFC8F3FCFF73DF
       F9FF88E6FDFF94E7FFFF99E5FFFFA9EEFFFFA7EDFFFF98E3FFFF72D5F9FF57CC
       F3FF4DC8F1FFBAE9FAFF228CD5FF00000000686AFCFFAFB2FEFF777CFEFF7377
       FEFFA7A9FEFFD87228FFE8AC82FFE29763FFE1945EFFE5A274FFCF5516FF5EBB
-      6AFF5AB565FF55AF5FFF50A75AFF4BA053FF0000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      6AFF5AB565FF55AF5FFF50A75AFF4BA053FF0000000088735E97EDD0B6FFF8E8
+      D9FFF5DEC8FFF3D8BCFFF3D6BAFFF4DBC1FFF7E4D2FFDFBA9CFF978E8CF70A14
+      1D27000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000005EC1E1FFC9F3FCFFCBF3
       FDFFD4F6FEFFD7F6FFFFD8F4FFFFE0F8FFFFDFF8FFFFDAF5FFFFCDF1FCFFC1ED
       FAFFBCEBFAFFBCEBFAFF2992D6FF000000006E71FDFFB3B6FEFF8084FEFF7A80
       FEFFABAEFEFFD97937FFEAB189FFE49E6CFFE39B68FFE7A77BFFD16018FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000D2B294E3F7E7D7FFF6E1
+      CCFFF4DBC1FFF4DABFFFF3D8BCFFF3D7BAFFF4DBC1FFF3DEC9FFB98F6EE70000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000005FC2E1FF879FA7FF9090
       90FF8D8D8DFF58B8DCFF53B7DFFF4FB4DEFF4BB0DDFF47ACDCFF44A7D7FF7676
       76FF747474FF637C8CFF2F98D8FF000000007276FEFFB7BAFEFFB5B8FEFFB2B5
       FEFFAFB2FEFFDF8343FFECB691FFE6A476FFE6A171FFE9AC84FFD6691CFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000EECCABFDF9ECDFFFF5DF
+      C8FFF5DDC5FFF4DCC2FFF4DAC0FFF3D9BDFFF3D7BCFFF8E6D3FFD1A37CFD0000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000747474C3C5C5
       C5FF939393FF0404040800000000000000000000000000000000040404087B7B
       7BFFAAAAAAFF585858C300000000000000007276FEFF7276FEFF7074FEFF6C6F
       FDFF686AFCFFE18C50FFEDBA98FFE9AB80FFE7A77AFFEAB28CFFD8722AFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000F2D1B1FDF9EDE1FFF6E1
+      CCFFF5DFC9FFF5DEC7FFF4DCC3FFF4DBC1FFF4DABFFFF8E7D6FFD5A884FD0000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000000000006A6A6AAEC3C3
       C3FFA0A0A0FF1717172900000000000000000000000000000000151515298888
       88FFA8A8A8FF515151AE00000000000000000000000000000000000000000000
       000000000000E2915AFFEEC09FFFEAB088FFE9AD84FFEDB693FFDB7A38FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000DBBFA4E3F9EBDEFFF7E7
+      D6FFF6E1CCFFF5E0CAFFF5DEC8FFF5DDC4FFF6E1CBFFF5E2D0FFC39C7CE30000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000000000000000000049494975B9B9
       B9FFBEBEBEFF838383DD1212121F03030305030303051111111F787878E5A7A7
       A7FF9D9D9DFF3838387500000000000000000000000000000000000000000000
       000000000000E69A65FFF0C4A5FFECB590FFEBB28BFFEEBB9AFFDF8445FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000094826E97F8E2CCFFFAEE
+      E3FFF7E7D6FFF6E2CEFFF6E1CBFFF6E3D0FFF9EADDFFECCFB4FF846B56970000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000000000000808080C8989
       89DBC3C3C3FFBDBDBDFFA0A0A0FF959595FF929292FF969696FFADADADFFADAD
       ADFF717171DB0505050900000000000000000000000000000000000000000000
       000000000000E89F6EFFF2C8ABFFF0C5A7FFF0C4A5FFEFC1A1FFE18D51FF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000002020102BCA58EC0F9E2
+      CDFFFAECDEFFF9EEE2FFF9EDE2FFF8E9DAFFF0D5BCFFAE9077C0020101020000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000001F1F
       1F308C8C8CDEBBBBBBFFCACACAFFCCCCCCFFCACACAFFC1C1C1FFACACACFF7979
       79DE1A1A1A300000000000000000000000000000000000000000000000000000
       000000000000EAA575FFE8A372FFE89F6CFFE69C69FFE49863FFE2945CFF0000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000020202029482
+      7197DDC1A5E3F4D4B5FDF2D1B1FDD7B89BE38C78659702020102000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000