Index: AAPClient/UI/LoginScherm2.dfm
===================================================================
diff -u -r223 -r227
--- AAPClient/UI/LoginScherm2.dfm	(.../LoginScherm2.dfm)	(revision 223)
+++ AAPClient/UI/LoginScherm2.dfm	(.../LoginScherm2.dfm)	(revision 227)
@@ -303,6 +303,110 @@
       6C0B21060000B68510030000DB7285D8FF00D013E466C9D4881A000000004945
       4E44AE426082}
   end
+  object imgAfmelden: TImage
+    Left = 408
+    Top = 16
+    Width = 48
+    Height = 48
+    Picture.Data = {
+      0954506E67496D61676589504E470D0A1A0A0000000D49484452000000300000
+      003008060000005702F987000001177A5458745261772070726F66696C652074
+      7970652065786966000078DAAD9B697225B77285FF63155E02E661391823BC03
+      2FDFDF41D565B35B2D59925F339A97BC431580CC3C430234FB7FFEFB98FFE25F
+      F1D69A984ACD2D67CBBFD862F39D1FAA7DFE3D8FCEC6FBFDFE0BEF4BFCFED3F3
+      E6EB05CF53E1C73BF37EDFDF793EFDF84089EFF3E3E7E74D99EF75EA7BA1F785
+      CF0583EECCD0ED7A07F95E28F8E779F7FE6E9A7F7EE8F9DB74DEFF73DF4B58F7
+      5EF4D7DF63613156E2C9E08DDF81E7EF77FFDC29308AD042E7BBE3BB0DD1EB19
+      CFCF2994FBFD73B36FEB67BE96EE370BF8F5D32FEB67E7FB7CF8B11CCF853ED3
+      CABFACD3FBBC4BBF5FBFBB4ADF47E4FCD79DFD4F23AAC4E6FBBF6FEB77CEAAE7
+      EC67763D66C372E5775218AB80C800000184694343504943432070726F66696C
+      650000789C7D913B48C3501486FFA6958A561CEC20E290A13A59105F384A158B
+      60A1B4155A7530B9E90B9A3424292E8E826BC1C1C762D5C1C55957075741107C
+      80B8B83A29BA4889E7268516315E38DC8FFFDEFFE7DC7301A15161AA19180754
+      CD3252F19898CDAD8AC157F42240358DA8C44C3D915ECCC0737DDDC3C7F7BB28
+      CFF2BEF7E7EA53F226037C22F11CD30D8B78837866D3D239EF138759495288CF
+      89C70C6A90F891EBB2CB6F9C8B0E0B3C336C6452F3C46162B1D8C17207B392A1
+      124F11471455A37C21EBB2C2798BB35AA9B1569FFC85A1BCB692E63AD530E258
+      4202498890514319155888D2AE91622245E7310FFF90E34F924B2657198C1C0B
+      A84285E4F8C1FFE0F76CCDC2E4849B148A015D2FB6FD310204778166DDB6BF8F
+      6DBB7902F89F812BADEDAF3680D94FD2EB6D2D7204F46F0317D76D4DDE032E77
+      80C1275D322447F253098502F07E46DF9403066E819E35776EAD739C3E00199A
+      D5F20D7070088C16297BDDE3DDDD9D73FBF74E6B7E3FBD3B72C5B795062E0000
+      0006624B474400FF00FF00FFA0BDA793000000097048597300000EC300000EC3
+      01C76FA8640000000774494D4507E30B040B393A606BDE23000008B149444154
+      78DAED99095093671AC7FF5FBE0408090904C2A950D12E8A5AAF4EBB9E20DA05
+      1C5D11C1AD825AAA5540B10A75F13E90025E50AD072AF528D675716754F016B7
+      DE62DDD5D595454ACB2172953B8170E4DA37E84C215F0209E0ACCEF699C96426
+      F9DEF7797EEFFBBCCFF17ED423408DB758A8DF007E03780301A83F04803BDC1D
+      26BC56B4E6DC83ECE48DB707800E590771903F046E8EA0392AA8EA8A2039B517
+      65EB8FBF0500E3E743BCF6CF107BBA81CD6181A2C86F6A1594958F50B22204B5
+      7F79FA8603CCDF0CE7354B603940F4D2F857A26E95A076EF7C14479D7DB301A8
+      45F170890E85A09F10EDEC875ADE00C937E1280CEF7D37FAFF03A0C67B826DCE
+      01144D905FBBDD2300D6780FD05CCD5C32C8FF7EF735038C180B93E1E3210C98
+      0E8BFE22A0AE10D2CC33A83B7713F2AC6CE3005C5C61E233079653BDC1732573
+      D5FE04E9F9B3A8BB7C0B8A8779AF01608C37B81303210E99012B57AB575669A2
+      4B0E6A8E7D85D2E86F8C0260CF23A1362214D6C31D40D32F9F544B0B517B2A05
+      556997D074E5612F027C3819E67E0B6117EC0BBE031F2C563BD3548D68BA770A
+      259BB6A3F15A8E6100C3BCC09F1D0587081F9873A98EBA5AAA20BD7008A5FBD3
+      D09CF9B81700467A813B6D1EEC17F881EF68D1D1F836CB9AD1FC281D659B6320
+      C9F88F6100237C20F864151CC226C08CAD43A7BC1692337B509A948A96AC9F7A
+      06C009DD06BBB0B9B072B7058BA618FFAB9BABD070F110F267AE7D3999812E64
+      169D0287E54110D899EAD4ABAA2B40DDF1ED285E96DC7D00CA773E6C2256423C
+      712038A62C6DD3A156B4A0E5E15994EF4946FDF11B4601505E1F4310BC18F6FE
+      A3612A3081F6D2A8550A288A7E40C5F6CDA84EBEDA0D80115EC4EF17C1316206
+      CC859C0E59B54D8192B84ED67778B1ED086419BF863F63C228356E3AF84161B0
+      0F9800AEB5991684BA6D4CE3B5232849D887E69B3F1A07C00A0883CD8A75B0FB
+      D09EE9F7E4F1D687DFA270D51E3465FEB3E36446E601EA83A9E07D1609A7C031
+      CC9DD044B9F227A83A9080F298342300DEF384F9D45038AC0A049FCFF47B54DE
+      C0CFF342D170399739597732F1C800586DDA08276F7752BD6AE953D6A3E1CA51
+      3C8FDE01F9D312030148821145C4C0C9D7150CCF5754A13AE64F2889FD5EF764
+      DD2D2502BFC43B894B2170E413776D3F520545FE4D54EC8E43D5EE4CC300D841
+      D1B0252B22EE6FA6653D99ECE931640F5BA07F3B7B500B99A73E42BF5943DBCA
+      F00E6A25F9A839B20B2F567C6D00808D23B89F24C269732078DA4946B3FADB3F
+      C38BB5FA4BE21E15730189E8971C0681482BB4AA881B9D4F41D1173BA0C8ABE8
+      02E07D0FF0E7C7C1397C34B4DD515D7D1B4521D1A83F774FBF110BBF84CBAA70
+      085DB5005A1B507F68118A224EEA1F3BD40FA2C329E83B4AA4A5588EE6072751
+      BA3511D2D3CCECDC1160DC471046ED81F3F477B5FC5F0DE5E3C3C899BB15CAA7
+      9D6447FF95705ABF02A2A19AE8D56E7453392A63835016FF3D3A13D3EF72E036
+      DB8D1152E5B997084002EA8EDEEA02C0D307561BC82A783A6A4DA242F3954DC8
+      F589EDD4008C9A4C767019EC66798167C305A509C18A06C8EE9C40F1C62412CF
+      733B1D4EC55FC790E809CCC57B7E1BA50909A849BED83900E5E50B51CC51F419
+      23D67A4C05D9E965C89BB90F5D0935D91F7C0F02326A204C7872B27A0F20C9BC
+      8A8634036E26569F877BACAF96FBAAA12AF981EC403CAAF7A477013051037004
+      7DC6DA3201CE4422CF7F77D746BC12FA236FB0384AC82F641A3C066B2F62708C
+      37D80C80FB640708C0DE8CCE01E0E10DAB7587D077521F861FB65E8F478ED73A
+      C38DE986D04977E1FEF9EF992E5478AB6D076A0E5CEE0260CC64083EDF05E780
+      41A0B55721F7247283E2481991FDDA00CC4F1760C07417E6E26567B41DE2FAE3
+      595D008C9C00DEC79BD037D213DA05A85AF66F948484A3FAD49DD7633D499076
+      695FC1FE5D9E96E21634DD4945E9B6DD6838C7BC57626462D3B083708C5B0081
+      50BB0E6A86F4D862E487A4BE1E802527F0BBAD33C1D55C18B417452524690750
+      10BC41E73006003D6B096CD7C741EC6EC12CA34B2EE149DF29BD6FFC50927F76
+      1E84F34467ADC68994D535CF507D3009256B520C03C08419107EBA1A4E734681
+      C3D62690417A220AF9730FF4AAFD9C9547F1CEEA59E00ACD3A2E1AC9C22D4FCE
+      A13C711BEA52EF1B0860ED08D3D96B60BFFA53081DCC18DD121A7F44D9C6E5F8
+      25F152AF184FCF5E07DBA8C5B019E6C85C7D92C125A7935118BC45EF789D0D0D
+      E5130CABD068384C71079BCDEC099445D7495448229931033D11DA2F02A2F0C5
+      108F7303C78CEEF8A75A0179DE4DFCB22B0155FBF5E712BD3DB1C9D224384486
+      40E822609E05D2B32A9FFF0395DFA6A026FD36140FF5B77C3A65C0209878CC84
+      28780EAC3E18000E97CD089D2A5905247FDD89A2053B3B9D4AFFADC4B83F42B8
+      2012F633348D374767E3AD2C7F86FA6B17517FFD1EA447CE18643B6BCA6C526A
+      4C8270F2240806F705DB84C57846D373B712DF2F89DD492AD0FB9DCED7E9B50A
+      6BDA52582F0985ADE7409D8A344D8EAA458AD6A25C343EFA1764B9B990653F43
+      F3DF3A165D2C6F3F98BA0F81B9DB407007BF07DE60579808CDC1A274EB5514DF
+      45C58E58547DDDF539EBF2668E1DBC9E1CB2508806DB8366EBD1D8062283A2AE
+      06F2CA4A28EBEAA16A68844A498365CE074B20042DB60547640936CF4CC74541
+      3B692C40F9F6D5A8E8A491370A40239C85F1B05D1602D120B1CE0B2E26108920
+      2A25F9A240D134E30CE91D26C943E5BE2D285B63F835BCC1B7D32CBF48587F11
+      0187312E30D01E2384146CA4E22C236E53BDEB8251238D7A3F40BD3F0DBCC80D
+      E8E33712A666BD84A16C84ECC159522E27A331FDB6D1C3BBF58686151C0BDBE5
+      F348F2E9039A3676F42BD1C4F9E2C7A83EB11F156B0E779BBF47AF9838A15B60
+      E93D161683FAC3D4D612B429A7CDE7350D31A5698A2932B54A45CE838AAC3439
+      13F2562825D568F9F929A477AEA236E33A14593D2BCF7BE71D19E923CC467B80
+      37848088ADC0B6B0201F3ED91D25F1900628A412286A89E105D968BC9785E6F4
+      5B3D56D9BB00FF4379EB01FE0B5630E8FEC0B386C90000000049454E44AE4260
+      82}
+    OnClick = imgAfmeldenClick
+  end
   object btnLogin: TButton
     Left = 64
     Top = 496
@@ -356,13 +460,4 @@
     TextHint = 'Initialen'
     OnKeyUp = edtInitialenKeyUp
   end
-  object btnAfmelden: TButton
-    Left = 408
-    Top = 8
-    Width = 49
-    Height = 49
-    ImageIndex = 2
-    TabOrder = 3
-    OnClick = btnAfmeldenClick
-  end
 end
Index: AAPClient/UI/LoginScherm2.pas
===================================================================
diff -u -r195 -r227
--- AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 195)
+++ AAPClient/UI/LoginScherm2.pas	(.../LoginScherm2.pas)	(revision 227)
@@ -13,14 +13,14 @@
     btnLogin: TButton;
     edtPincode: TEdit;
     edtInitialen: TEdit;
-    btnAfmelden: TButton;
+    imgAfmelden: TImage;
     procedure FormShow(Sender: TObject);
     procedure edtInitialenKeyUp(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure edtPincodeKeyUp(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure actVolgendeExecute(Sender: TObject);
-    procedure btnAfmeldenClick(Sender: TObject);
+    procedure imgAfmeldenClick(Sender: TObject);
   private
     procedure SetStatusLoginButton;
     procedure HuidigeGebruikerAfmelden;
@@ -59,12 +59,6 @@
   end;
 end;
 
-procedure TfmLoginScherm2.btnAfmeldenClick(Sender: TObject);
-begin
-  Self.ModalResult := mrAbort;
-  HuidigeGebruikerAfmelden;
-end;
-
 procedure TfmLoginScherm2.edtInitialenKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -98,6 +92,13 @@
   TAgent.Create(UiContext).GebruikerAfmelden();
 end;
 
+procedure TfmLoginScherm2.imgAfmeldenClick(Sender: TObject);
+begin
+  inherited;
+  Self.ModalResult := mrAbort;
+  HuidigeGebruikerAfmelden;
+end;
+
 procedure TfmLoginScherm2.SetContext;
 begin
   UiContext.Initialen := edtInitialen.Text;