diff --git a/res/icons/paypal.png b/res/icons/paypal.png
new file mode 100644
index 00000000..5360fc0d
Binary files /dev/null and b/res/icons/paypal.png differ
diff --git a/source/main.dfm b/source/main.dfm
index 656d0f69..96cb854f 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -1501,7 +1501,7 @@ object MainForm: TMainForm
       TabOrder = 0
       object lblDonate: TLabel
         AlignWithMargins = True
-        Left = 671
+        Left = 644
         Top = 3
         Width = 35
         Height = 17
@@ -1509,7 +1509,7 @@ object MainForm: TMainForm
         Hint = 
           'Send an arbitrary amount as donation to the author - per PayPal ' +
           '(also supports credit cards)'
-        Margins.Right = 10
+        Margins.Right = 15
         Align = alRight
         Caption = 'Donate'
         Font.Charset = DEFAULT_CHARSET
@@ -1547,6 +1547,82 @@ object MainForm: TMainForm
         OnMouseLeave = lblMenuMouseLeave
         ExplicitHeight = 13
       end
+      object imgDonate: TImage
+        AlignWithMargins = True
+        Left = 622
+        Top = 3
+        Width = 16
+        Height = 17
+        Cursor = crHandPoint
+        Align = alRight
+        Picture.Data = {
+          0954506E67496D61676589504E470D0A1A0A0000000D49484452000000100000
+          001008060000001FF3FF61000000017352474200AECE1CE90000000467414D41
+          0000B18F0BFC6105000000097048597300000EC300000EC301C76FA864000000
+          1A74455874536F667477617265005061696E742E4E45542076332E352E313147
+          F342370000021B4944415478DA6364400646A98940320488BD1830C15920BE0B
+          C41B19CECD5E06136444D22C09246700B11F030EC0CEC6F28F8991F15F735640
+          4B49AC5B23BA01E1427CDC2BDE7DFA0AE68A09F131E4473A31BCF9F085E1D9EB
+          8F0C176F3F61B871FF3958CEDE44FDBF9FB3756371B86523B201FD40B200C4E4
+          E162670872326258D89808974E6A5CC8307FD351309B859989E1F7A9190CC669
+          33AD900D3800321CC454911363985E19C3E062A60197AE9EBA81A16DDE369857
+          18BE1E9DC26096317B2F2392FFCF03B13888EB62AEC9B07B5A215CF325A0F3F3
+          BA57301C3C7B0BCC37D35164383CB78CC1326BCE1F9801E14072054C4366A803
+          839DA11AC3D3D7EF196E3C78C1F0E0D91B863D27AF83E564C405193282ED19FC
+          9D4C18E2DBD7FF841900F73F3EA0AB2AC3A0A528C930B12C9261CD81EB0CF3B6
+          9F3B093300EE7F6C4042849F41464C90C1D35A8721D6C786E1DEF3F70C55B3F7
+          3C06453B23BAFF4160DFAC12064763351443DE7CFCC6F0EAFD578623971F33CC
+          DC7CFA1250E8DAB9D919912003C2809C953085DACA520C57563530A4F56C6638
+          7BEB19BA634009E109106F076AAE87242434FF77E6053304BB9A328435AC0671
+          1D810A0FE00B179001FB81B40388232B21C4F0686B07C3C435271916EDBA7005
+          A8599750C0820C7801F37FB89B29C384D24806EF8AA5206E19D0806EC20600C1
+          FFFFFFE186EC3C7D1714C28F809AE50969861B0089C919704380600528848931
+          000099A7B755E4EFAE610000000049454E44AE426082}
+        OnClick = DonateClick
+        OnMouseEnter = lblMenuMouseEnter
+        OnMouseLeave = lblMenuMouseLeave
+      end
+      object imgUpdateAvailable: TImage
+        AlignWithMargins = True
+        Left = 697
+        Top = 3
+        Width = 16
+        Height = 17
+        Cursor = crHandPoint
+        Align = alRight
+        Picture.Data = {
+          0954506E67496D61676589504E470D0A1A0A0000000D49484452000000100000
+          001008060000001FF3FF610000000467414D410000AFC837058AE90000001974
+          455874536F6674776172650041646F626520496D616765526561647971C9653C
+          000002FF4944415478DA7D926B48544114C7CFDDEB5EDD355DD3945C4BD084ED
+          8386F4A1D230A520A2E881E43711A3941EC842121488191814821856A85F94D6
+          0DC43092C84AF3515951549621898AE6636DD3D57CECBD7BEFDC99E9AC106C66
+          0D0CE7CEDCF3FBCF7FCE1C81730E81E36EAFC786A19072C8A43A4F25F89B52D6
+          A711DE4338AB2B3E183B18982F040A207C1EC1728B5934058B06104500861B5E
+          4261D1CB60624E53880E255772AC957F082028A1CC03B36438202138E725B0E4
+          A3A0EB001A6540740EC62003848788302FEB3035A73DC6FDA3352713B41501C7
+          4B4FD53AC960E782003F16348A76F7A3DDD76857F19F52D23469D2284F233A7B
+          1A63318ACB283E3E472A1D67128B85FA9E99144AE1E38670519C9C4598B12D68
+          D3A3E9FC22C6BD7E0728D8E9A3EC9A4E58944AF948427488D83F215374B64DA8
+          ED705745848AF64599C14F59DF87C98378E5175887045CAFD8978C024CCCA8A3
+          787006A1CC66920CCF2C2611065DBE4AE1C6A3EF5F37474BB6219702AA0E6695
+          B03B516141C7C767D5664D67B7541450299CB35A8C39236EDF3D8D401E012E6F
+          8F3741EFD0D28070BDD5A5266D0C913E8D29FE8205A18325A35130CD2F91AC13
+          296E8BCFE71BBED9B7291A0BDCED59260A5E2D4CA74CCFD81A0E1DFD8B0B4259
+          F3946AB386481F46BDE023CC4C189789C6669263BCD9A9919E2E4551F86777F0
+          91AEE9B85A9DF178AC91995390F7A040E797C565E182737CC8623224B9E63505
+          ED46A0DD5D58DDE7DDDDDD8E586B5C2EBE34BC7BFBC6919B9B9B9771792019DB
+          629033185D1F1A1437EFD50784B3F56376ACAE82D56D6A389DB8E07F368423F1
+          E46F38436559068CD3186D76BB7DF97703A5950C6462881156B7B27FB4B5B5DD
+          46A870C7CE74913106F75B9A290A545CC2B13AF72F018453117E8F8080F195DF
+          01CE74FC9671A65654540CFF57A0A5A5A50381DD98EC2C282838E5DF2B2D2D75
+          E0FA18BE487B757575F63F05103E84702D26D7205C1E9858545454A6AA6A96A6
+          69571B1A1ADAD714686C6CAC43F821C2ADB0C6C8CFCF3F4C08F629C013A7D3E9
+          8FF00B0ACCFCAF73E8594B0000000049454E44AE426082}
+        OnClick = actUpdateCheckExecute
+        OnMouseEnter = lblMenuMouseEnter
+        OnMouseLeave = lblMenuMouseLeave
+      end
       object ToolBarMainMenu: TToolBar
         Left = 0
         Top = 0
diff --git a/source/main.pas b/source/main.pas
index 257eb515..f915557e 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -581,6 +581,8 @@ type
     Fullstatusrefresh1: TMenuItem;
     N10: TMenuItem;
     actFullRefresh: TAction;
+    imgDonate: TImage;
+    imgUpdateAvailable: TImage;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);
@@ -2304,8 +2306,13 @@ procedure TMainForm.lblMenuMouseEnter(Sender: TObject);
 var
   lbl: TLabel;
 begin
-  lbl := Sender as TLabel;
-  lbl.Font.Style := lbl.Font.Style + [fsUnderline];
+  lbl := nil;
+  if (Sender = lblDonate) or (Sender = imgDonate) then
+    lbl := lblDonate
+  else if (Sender = lblUpdateAvailable) or (Sender = imgUpdateAvailable) then
+    lbl := lblUpdateAvailable;
+  if lbl <> nil then
+    lbl.Font.Style := lbl.Font.Style + [fsUnderline];
 end;
 
 
@@ -2313,7 +2320,12 @@ procedure TMainForm.lblMenuMouseLeave(Sender: TObject);
 var
   lbl: TLabel;
 begin
-  lbl := Sender as TLabel;
+  lbl := nil;
+  if (Sender = lblDonate) or (Sender = imgDonate) then
+    lbl := lblDonate
+  else if (Sender = lblUpdateAvailable) or (Sender = imgUpdateAvailable) then
+    lbl := lblUpdateAvailable;
+  if lbl <> nil then
   lbl.Font.Style := lbl.Font.Style - [fsUnderline];
 end;