Index: AAPClient/UI/PopupScherm.pas
===================================================================
diff -u -r143 -r144
--- AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 143)
+++ AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 144)
@@ -24,6 +24,8 @@
     procedure pnlbtnActie2Click(Sender: TObject);
     procedure imgActie1Click(Sender: TObject);
     procedure imgActie2Click(Sender: TObject);
+    procedure lblActie1Click(Sender: TObject);
+    procedure lblActie2Click(Sender: TObject);
   private
     { Private declarations }
   public
@@ -60,6 +62,18 @@
   CloseModal;
 end;
 
+procedure TfmPopupScherm.lblActie1Click(Sender: TObject);
+begin
+  ModalResult := mrNo;
+  CloseModal;
+end;
+
+procedure TfmPopupScherm.lblActie2Click(Sender: TObject);
+begin
+  ModalResult := mrNo;
+  CloseModal;
+end;
+
 procedure TfmPopupScherm.pnlbtnActie1Click(Sender: TObject);
 begin
   ModalResult := mrYes;
Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r128 -r144
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 128)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 144)
@@ -68,11 +68,11 @@
   if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin
     ZetToeleveringStatus(DnaCodeStatus.InBuffer);
   end else begin
-    fWaarschuwingModalResult := ToonPopupScherm('Onvolledige toelevering','Scan DNA-codes','Nieuwe toelevering');
+    fWaarschuwingModalResult := ToonPopupScherm('Onvolledige toelevering','Scan'+#13#10+'DNA-codes','Nieuwe'+#13#10+'toelevering');
     if fWaarschuwingModalResult = mrOk then begin
       Self.ModalResult := mrDnaCode;
     end else begin
-      fWaarschuwingModalResult := ToonPopupScherm('Nieuwe toelevering starten?','Ja','Nee');
+      fWaarschuwingModalResult := ToonPopupScherm('Nieuwe toelevering starten?','Ja','Nee',true,6,7);
       if fWaarschuwingModalResult = mrOk then begin
         ZetToeleveringStatus(DnaCodeStatus.OnHold);
         Self.ModalResult := mrPallet;
Index: AAPClient/UI/PopupScherm.dfm
===================================================================
diff -u -r143 -r144
--- AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 143)
+++ AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 144)
@@ -37,7 +37,8 @@
     Left = 48
     Top = 444
     Width = 300
-    Height = 60
+    Height = 64
+    BevelOuter = bvNone
     Color = 1513421
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWhite
@@ -56,26 +57,34 @@
       OnClick = imgActie1Click
     end
     object lblActie1: TLabel
-      Left = 1
-      Top = 1
-      Width = 298
-      Height = 58
+      Left = 0
+      Top = 0
+      Width = 300
+      Height = 64
       Align = alClient
       Alignment = taCenter
       AutoSize = False
       Caption = 'links'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWhite
+      Font.Height = -27
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
       Layout = tlCenter
       WordWrap = True
-      ExplicitTop = 20
-      ExplicitWidth = 62
-      ExplicitHeight = 39
+      OnClick = lblActie1Click
+      ExplicitLeft = 1
+      ExplicitTop = 1
+      ExplicitWidth = 298
     end
   end
   object pnlbtnActie2: TPanel
     Left = 214
     Top = 444
     Width = 134
-    Height = 60
+    Height = 64
+    BevelOuter = bvNone
     Color = 1513421
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWhite
@@ -96,19 +105,26 @@
       OnClick = imgActie2Click
     end
     object lblActie2: TLabel
-      Left = 1
-      Top = 1
-      Width = 132
-      Height = 58
+      Left = 0
+      Top = 0
+      Width = 134
+      Height = 64
       Align = alClient
       Alignment = taCenter
       AutoSize = False
       Caption = 'rechts'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWhite
+      Font.Height = -27
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
       Layout = tlCenter
       WordWrap = True
-      ExplicitTop = 20
-      ExplicitWidth = 62
-      ExplicitHeight = 39
+      OnClick = lblActie2Click
+      ExplicitLeft = 1
+      ExplicitTop = 1
+      ExplicitWidth = 132
     end
   end
   object pnlGroteImage: TPanel
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r143 -r144
--- AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 143)
+++ AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 144)
@@ -151,11 +151,13 @@
     PopupScherm.pnlbtnActie1.Height := PopupScherm.pnlbtnActie1.Height + 60;
     fImagesScherm.ilAlgemeen64.GetIcon(ImageIndex1, PopupScherm.imgActie1.Picture.Icon);
     PopupScherm.pnlbtnActie1.VerticalAlignment := taAlignBottom;
+    PopupScherm.lblActie1.Align := alBottom;
   end;
   if ImageIndex2 >= 0 then begin
     PopupScherm.pnlbtnActie2.Top := PopupScherm.pnlbtnActie2.Top - 60;
     PopupScherm.pnlbtnActie2.Height := PopupScherm.pnlbtnActie2.Height + 60;
     fImagesScherm.ilAlgemeen64.GetIcon(ImageIndex2, PopupScherm.imgActie2.Picture.Icon);
+    PopupScherm.lblActie2.Align := alBottom;
   end;