diff --git a/Source/GUIBase/uDialogBase.dfm b/Source/GUIBase/uDialogBase.dfm
index e461fde9..ac043ae0 100644
--- a/Source/GUIBase/uDialogBase.dfm
+++ b/Source/GUIBase/uDialogBase.dfm
@@ -3,9 +3,9 @@ object fDialogBase: TfDialogBase
   Top = 0
   BorderStyle = bsDialog
   Caption = 'fDialogBase'
-  ClientHeight = 430
-  ClientWidth = 623
-  Color = clWindow
+  ClientHeight = 442
+  ClientWidth = 625
+  Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
@@ -16,34 +16,37 @@ object fDialogBase: TfDialogBase
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
-  object pnlBotones: TFlowPanel
+  object Bevel2: TBevel
     Left = 0
-    Top = 374
-    Width = 623
-    Height = 56
+    Top = 64
+    Width = 625
+    Height = 2
+    Align = alTop
+    Shape = bsTopLine
+    ExplicitWidth = 500
+  end
+  object Bevel3: TBevel
+    Left = 0
+    Top = 398
+    Width = 625
+    Height = 2
     Align = alBottom
-    FlowStyle = fsBottomTopRightLeft
-    Padding.Left = 20
-    Padding.Top = 20
-    Padding.Right = 20
-    Padding.Bottom = 15
-    ParentBackground = False
+    Shape = bsTopLine
+    ExplicitTop = 369
+    ExplicitWidth = 500
+  end
+  object pnlBotones: TPanel
+    Left = 0
+    Top = 400
+    Width = 625
+    Height = 42
+    Align = alBottom
+    BevelOuter = bvNone
     TabOrder = 0
-    VerticalAlignment = taAlignTop
-    object Button1: TButton
-      Left = 527
-      Top = 15
-      Width = 75
-      Height = 25
-      Action = actCancelar
-      Cancel = True
-      ModalResult = 2
-      TabOrder = 1
-    end
-    object Button2: TButton
+    object btnAceptar: TButton
       AlignWithMargins = True
-      Left = 437
-      Top = 15
+      Left = 464
+      Top = 8
       Width = 75
       Height = 25
       Margins.Left = 0
@@ -54,51 +57,83 @@ object fDialogBase: TfDialogBase
       ModalResult = 1
       TabOrder = 0
     end
+    object btnCancelar: TButton
+      Left = 543
+      Top = 8
+      Width = 75
+      Height = 25
+      Action = actCancelar
+      Cancel = True
+      ModalResult = 2
+      TabOrder = 1
+    end
   end
-  object FlowPanel1: TFlowPanel
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 623
-    Height = 374
-    Align = alClient
-    Padding.Left = 30
-    Padding.Top = 30
-    Padding.Right = 30
-    Padding.Bottom = 30
-    ParentColor = True
+    Width = 625
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
     TabOrder = 1
     object lblInstruccion: TLabel
       AlignWithMargins = True
-      Left = 31
-      Top = 31
-      Width = 78
-      Height = 19
+      Left = 25
+      Top = 8
+      Width = 575
+      Height = 13
       Margins.Left = 0
       Margins.Top = 0
       Margins.Right = 0
-      Margins.Bottom = 20
+      Margins.Bottom = 8
       Align = alTop
-      Caption = 'Instrucci'#243'n'
+      Caption = 'T'#237'tulo'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -11
       Font.Name = 'Tahoma'
-      Font.Style = []
+      Font.Style = [fsBold]
       ParentFont = False
+      ExplicitWidth = 32
     end
     object Label2: TLabel
-      Left = 31
-      Top = 70
-      Width = 571
-      Height = 81
-      Align = alTop
-      AutoSize = False
-      Caption = 'Comentarios'
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 550
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 0
+      Align = alClient
+      Caption = 'Bla Bla Bla'
+      ExplicitWidth = 48
+      ExplicitHeight = 13
     end
   end
+  object pnlCuerpo: TPanel
+    Left = 0
+    Top = 66
+    Width = 625
+    Height = 332
+    Align = alClient
+    BevelOuter = bvNone
+    Padding.Left = 50
+    Padding.Top = 15
+    Padding.Right = 50
+    Padding.Bottom = 15
+    TabOrder = 2
+  end
   object ActionList1: TActionList
-    Left = 16
-    Top = 384
+    Left = 8
+    Top = 400
     object actAceptar: TAction
       Caption = '&Aceptar'
     end
diff --git a/Source/GUIBase/uDialogBase.pas b/Source/GUIBase/uDialogBase.pas
index dffb39d9..01f37755 100644
--- a/Source/GUIBase/uDialogBase.pas
+++ b/Source/GUIBase/uDialogBase.pas
@@ -8,15 +8,18 @@ uses
 
 type
   TfDialogBase = class(TForm)
-    pnlBotones: TFlowPanel;
-    Button1: TButton;
-    Button2: TButton;
     ActionList1: TActionList;
     actAceptar: TAction;
     actCancelar: TAction;
-    FlowPanel1: TFlowPanel;
+    pnlBotones: TPanel;
+    btnAceptar: TButton;
+    btnCancelar: TButton;
+    pnlHeader: TPanel;
     lblInstruccion: TLabel;
     Label2: TLabel;
+    Bevel3: TBevel;
+    Bevel2: TBevel;
+    pnlCuerpo: TPanel;
     procedure FormShow(Sender: TObject);
   private
     { Private declarations }
@@ -29,7 +32,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uDMBase, JvNavigationPane;
+  uDMBase;
 
 procedure TfDialogBase.FormShow(Sender: TObject);
 begin
diff --git a/Source/GUIBase/uDialogElegirEMail.dfm b/Source/GUIBase/uDialogElegirEMail.dfm
index 5ff71d5f..a85c941a 100644
--- a/Source/GUIBase/uDialogElegirEMail.dfm
+++ b/Source/GUIBase/uDialogElegirEMail.dfm
@@ -1,103 +1,120 @@
 inherited fDialogElegirEMail: TfDialogElegirEMail
   Caption = 'Elegir direcci'#243'n de correo electr'#243'nico'
-  ClientHeight = 220
-  ClientWidth = 533
+  ClientHeight = 307
+  ClientWidth = 572
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  ExplicitWidth = 539
-  ExplicitHeight = 252
+  ExplicitWidth = 578
+  ExplicitHeight = 339
   PixelsPerInch = 96
   TextHeight = 13
-  inherited pnlBotones: TFlowPanel
-    Top = 164
-    Width = 533
-    ExplicitTop = 164
-    ExplicitWidth = 533
-    inherited Button1: TButton
-      Left = 437
-      ExplicitLeft = 437
+  inherited Bevel2: TBevel
+    Width = 572
+    ExplicitWidth = 572
+  end
+  inherited Bevel3: TBevel
+    Top = 262
+    Width = 572
+    ExplicitWidth = 572
+  end
+  inherited pnlBotones: TPanel
+    Top = 264
+    Width = 572
+    Height = 43
+    ExplicitLeft = -8
+    ExplicitTop = 280
+    ExplicitWidth = 572
+    ExplicitHeight = 43
+    inherited btnAceptar: TButton
+      Left = 408
+      Top = 10
+      ExplicitLeft = 408
+      ExplicitTop = 10
     end
-    inherited Button2: TButton
-      Left = 347
-      ExplicitLeft = 347
+    inherited btnCancelar: TButton
+      Left = 487
+      Top = 9
+      ExplicitLeft = 487
+      ExplicitTop = 9
     end
   end
-  inherited FlowPanel1: TFlowPanel
-    Width = 533
-    Height = 164
-    ExplicitWidth = 533
-    ExplicitHeight = 164
+  inherited pnlHeader: TPanel
+    Width = 572
+    ExplicitWidth = 572
     inherited lblInstruccion: TLabel
-      Width = 411
-      Caption = 'Indique la direcci'#243'n de correo electr'#243'nico del destinatario:'
-      ExplicitWidth = 411
+      Width = 522
+      Caption = 'Elegir la direcci'#243'n de correo electr'#243'nico'
+      ExplicitWidth = 221
     end
     inherited Label2: TLabel
-      Height = 3
+      Width = 497
+      Height = 27
       Visible = False
-      ExplicitHeight = 3
     end
-    object Panel1: TPanel
-      Left = 31
-      Top = 73
-      Width = 482
-      Height = 80
-      Align = alClient
-      BevelOuter = bvNone
-      ParentColor = True
+  end
+  inherited pnlCuerpo: TPanel
+    Width = 572
+    Height = 196
+    ExplicitWidth = 572
+    ExplicitHeight = 208
+    object Label1: TLabel
+      Left = 25
+      Top = 16
+      Width = 277
+      Height = 13
+      Caption = 'Indique la direcci'#243'n de correo electr'#243'nico del destinatario:'
+    end
+    object cbEMail: TComboBox
+      Left = 250
+      Top = 46
+      Width = 262
+      Height = 21
+      Style = csDropDownList
+      ItemHeight = 13
       TabOrder = 0
-      object rbCombo: TRadioButton
-        Tag = 1
-        Left = 10
-        Top = 6
-        Width = 170
-        Height = 17
-        Caption = 'Usar esta direcci'#243'n de correo:'
-        TabOrder = 0
-        OnClick = rbComboClick
-      end
-      object cbEMail: TComboBox
-        Left = 211
-        Top = 6
-        Width = 262
-        Height = 21
-        Style = csDropDownList
-        ItemHeight = 0
-        TabOrder = 1
-      end
-      object rbEdit: TRadioButton
-        Tag = 2
-        Left = 10
-        Top = 41
-        Width = 202
-        Height = 17
-        Caption = 'Usar la siguiente direcci'#243'n de correo:'
-        TabOrder = 2
-        OnClick = rbEditClick
-      end
-      object edtEMail: TcxHyperLinkEdit
-        Left = 211
-        Top = 39
-        Properties.UsePrefix = upNever
-        Properties.ValidateOnEnter = True
-        Properties.Prefix = ''
-        Style.LookAndFeel.Kind = lfStandard
-        Style.LookAndFeel.NativeStyle = True
-        StyleDisabled.LookAndFeel.Kind = lfStandard
-        StyleDisabled.LookAndFeel.NativeStyle = True
-        StyleFocused.LookAndFeel.Kind = lfStandard
-        StyleFocused.LookAndFeel.NativeStyle = True
-        StyleHot.LookAndFeel.Kind = lfStandard
-        StyleHot.LookAndFeel.NativeStyle = True
-        TabOrder = 3
-        Width = 262
-      end
+    end
+    object edtEMail: TcxHyperLinkEdit
+      Left = 250
+      Top = 79
+      Properties.UsePrefix = upNever
+      Properties.ValidateOnEnter = True
+      Properties.Prefix = ''
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 1
+      Width = 262
+    end
+    object rbCombo: TRadioButton
+      Tag = 1
+      Left = 49
+      Top = 46
+      Width = 170
+      Height = 17
+      Caption = 'Usar esta direcci'#243'n de correo:'
+      TabOrder = 2
+      OnClick = rbComboClick
+    end
+    object rbEdit: TRadioButton
+      Tag = 2
+      Left = 49
+      Top = 81
+      Width = 202
+      Height = 17
+      Caption = 'Usar la siguiente direcci'#243'n de correo:'
+      TabOrder = 3
+      OnClick = rbEditClick
     end
   end
   inherited ActionList1: TActionList
-    Left = 8
-    Top = 8
+    Left = 16
+    Top = 48
     inherited actAceptar: TAction
       OnExecute = actAceptarExecute
     end
diff --git a/Source/GUIBase/uDialogElegirEMail.pas b/Source/GUIBase/uDialogElegirEMail.pas
index 1d9e5b35..d9eff26e 100644
--- a/Source/GUIBase/uDialogElegirEMail.pas
+++ b/Source/GUIBase/uDialogElegirEMail.pas
@@ -9,11 +9,11 @@ uses
 
 type
   TfDialogElegirEMail = class(TfDialogBase)
-    Panel1: TPanel;
     rbCombo: TRadioButton;
     cbEMail: TComboBox;
     rbEdit: TRadioButton;
     edtEMail: TcxHyperLinkEdit;
+    Label1: TLabel;
     procedure rbComboClick(Sender: TObject);
     procedure rbEditClick(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
diff --git a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm
index f1a68858..9922c1fd 100644
--- a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm	
@@ -1,70 +1,81 @@
 inherited fDialogOpcionesImpresionFacturasCliente: TfDialogOpcionesImpresionFacturasCliente
   Caption = 'Opciones para facturas de cliente'
-  ClientHeight = 197
-  ClientWidth = 488
-  ExplicitWidth = 494
-  ExplicitHeight = 229
+  ClientHeight = 240
+  ClientWidth = 418
+  ExplicitWidth = 424
+  ExplicitHeight = 272
   PixelsPerInch = 96
   TextHeight = 13
-  inherited pnlBotones: TFlowPanel
-    Top = 141
-    Width = 488
-    ExplicitTop = 141
-    ExplicitWidth = 488
-    inherited Button1: TButton
-      Left = 392
-      ExplicitLeft = 392
+  inherited Bevel2: TBevel
+    Width = 418
+    ExplicitWidth = 418
+  end
+  inherited Bevel3: TBevel
+    Top = 196
+    Width = 418
+    ExplicitTop = 196
+    ExplicitWidth = 418
+  end
+  inherited pnlBotones: TPanel
+    Top = 198
+    Width = 418
+    ExplicitTop = 198
+    ExplicitWidth = 418
+    inherited btnAceptar: TButton
+      Left = 254
+      ExplicitLeft = 254
     end
-    inherited Button2: TButton
-      Left = 302
-      ExplicitLeft = 302
+    inherited btnCancelar: TButton
+      Left = 333
+      ExplicitLeft = 333
     end
   end
-  inherited FlowPanel1: TFlowPanel
-    Width = 488
-    Height = 141
-    ExplicitWidth = 488
-    ExplicitHeight = 141
+  inherited pnlHeader: TPanel
+    Width = 418
+    ExplicitWidth = 418
     inherited lblInstruccion: TLabel
-      Width = 397
+      Width = 368
       Margins.Bottom = 10
       Caption = 'Indique las siguiente opciones para la factura de cliente:'
-      ExplicitWidth = 397
+      ExplicitWidth = 317
     end
     inherited Label2: TLabel
-      Top = 60
-      Width = 195
-      Height = 11
+      Top = 31
+      Width = 343
+      Height = 25
       Visible = False
-      ExplicitTop = 60
-      ExplicitWidth = 195
-      ExplicitHeight = 11
+      ExplicitTop = 31
     end
-    object cbVerSello: TCheckBox
+  end
+  inherited pnlCuerpo: TPanel
+    Width = 418
+    Height = 130
+    ExplicitWidth = 418
+    ExplicitHeight = 130
+    object cbVerCopia: TCheckBox
       AlignWithMargins = True
-      Left = 34
-      Top = 74
-      Width = 415
+      Left = 50
+      Top = 51
+      Width = 279
       Height = 17
-      Caption = 'Mostrar sello de la empresa'
+      Caption = 'Indicar '#39'COPIA'#39' en la cabecera'
       Checked = True
       State = cbChecked
       TabOrder = 0
     end
-    object cbVerCopia: TCheckBox
+    object cbVerSello: TCheckBox
       AlignWithMargins = True
-      Left = 34
-      Top = 97
-      Width = 441
+      Left = 50
+      Top = 28
+      Width = 200
       Height = 17
-      Caption = 'Mostrar copia de factura'
+      Caption = 'Mostrar sello de la empresa'
       Checked = True
       State = cbChecked
       TabOrder = 1
     end
   end
   inherited ActionList1: TActionList
-    Left = 8
     Top = 16
     inherited actAceptar: TAction
       OnExecute = actAceptarExecute
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.dfm
index c18c2b8b..0a122bcb 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.dfm	
@@ -1,49 +1,61 @@
 inherited fDialogOpcionesImpresionPedidosProveedor: TfDialogOpcionesImpresionPedidosProveedor
   Caption = 'Opciones para pedido a proveedor'
-  ClientHeight = 197
-  ClientWidth = 488
-  ExplicitWidth = 494
-  ExplicitHeight = 229
+  ClientHeight = 239
+  ClientWidth = 393
+  ExplicitWidth = 399
+  ExplicitHeight = 271
   PixelsPerInch = 96
   TextHeight = 13
-  inherited pnlBotones: TFlowPanel
-    Top = 141
-    Width = 488
-    ExplicitTop = 141
-    ExplicitWidth = 488
-    inherited Button1: TButton
-      Left = 392
-      ExplicitLeft = 392
+  inherited Bevel2: TBevel
+    Width = 393
+  end
+  inherited Bevel3: TBevel
+    Top = 195
+    Width = 393
+  end
+  inherited pnlBotones: TPanel
+    Top = 197
+    Width = 393
+    ExplicitLeft = -8
+    ExplicitTop = 320
+    ExplicitWidth = 637
+    inherited btnAceptar: TButton
+      Left = 229
+      ExplicitLeft = 229
     end
-    inherited Button2: TButton
-      Left = 302
-      ExplicitLeft = 302
+    inherited btnCancelar: TButton
+      Left = 308
+      ExplicitLeft = 308
     end
   end
-  inherited FlowPanel1: TFlowPanel
-    Width = 488
-    Height = 141
+  inherited pnlHeader: TPanel
+    Width = 393
     ExplicitWidth = 488
-    ExplicitHeight = 141
     inherited lblInstruccion: TLabel
-      Width = 415
+      Width = 343
       Margins.Bottom = 10
       Caption = 'Indique las siguiente opciones para el pedido a proveedor:'
-      ExplicitWidth = 415
+      ExplicitWidth = 328
     end
     inherited Label2: TLabel
-      Top = 60
-      Width = 195
-      Height = 11
+      Top = 31
+      Width = 318
+      Height = 25
       Visible = False
       ExplicitTop = 60
-      ExplicitWidth = 195
-      ExplicitHeight = 11
     end
+  end
+  inherited pnlCuerpo: TPanel
+    Width = 393
+    Height = 129
+    ExplicitLeft = -8
+    ExplicitTop = 70
+    ExplicitWidth = 637
+    ExplicitHeight = 222
     object cbVerPrecios: TCheckBox
       AlignWithMargins = True
-      Left = 34
-      Top = 74
+      Left = 50
+      Top = 29
       Width = 415
       Height = 17
       Caption = 'Mostrar los precios en los conceptos'
@@ -53,8 +65,8 @@ inherited fDialogOpcionesImpresionPedidosProveedor: TfDialogOpcionesImpresionPed
     end
     object cbVerRefProveedor: TCheckBox
       AlignWithMargins = True
-      Left = 34
-      Top = 97
+      Left = 50
+      Top = 52
       Width = 441
       Height = 17
       Caption = 'Mostrar las referencias de proveedor de los conceptos'
@@ -64,7 +76,6 @@ inherited fDialogOpcionesImpresionPedidosProveedor: TfDialogOpcionesImpresionPed
     end
   end
   inherited ActionList1: TActionList
-    Left = 8
     Top = 16
     inherited actAceptar: TAction
       OnExecute = actAceptarExecute