diff --git a/dlgAdd.xeto b/dlgAdd.xeto
index 3b1fd8b..eb3f0d1 100644
--- a/dlgAdd.xeto
+++ b/dlgAdd.xeto
@@ -61,7 +61,7 @@
 			<StackLayout Orientation="Horizontal">
 				<Label>Description</Label>
 				<StackLayoutItem Expand="True">
-					<TextBox ID="txtDescription" />
+					<TextArea ID="txtDescription" />
 				</StackLayoutItem>
 			</StackLayout>
 		</StackLayoutItem>
diff --git a/dlgAdd.xeto.cs b/dlgAdd.xeto.cs
index 39b0bb6..c2a21bf 100644
--- a/dlgAdd.xeto.cs
+++ b/dlgAdd.xeto.cs
@@ -176,6 +176,28 @@ namespace apprepodbmgr.Eto
             });
 
             treeApps.AllowMultipleSelection = false;
+
+            txtArchitecture.ToolTip = "This field contains a comma separated list of architectures the application can run on. To edit its contents use the metadata editor.";
+            txtDescription.ToolTip = "This field contains a free-form text description of this application.";
+            txtDeveloper.ToolTip = "This field contains the developer of the application.";
+            txtFormat.ToolTip = "This field is contains the name of the format of the disk images, when it is not a byte-by-byte format like .iso or .img.";
+            txtLanguages.ToolTip = "This field contains a comma separated list of languages the application includes.";
+            txtProduct.ToolTip = "This field contains the application name.";
+            txtTargetOs.ToolTip = "This field contains a comma separated list of operating systems this application can run on.";
+            txtVersion.ToolTip = "This field contains the application version.";
+            chkFiles.ToolTip = "If this field is checked it indicates the application is already installed.";
+            chkInstaller.ToolTip = "If this field is checked it indicates the application comes as an installer (one or several files), but it's not installed neither disk images.";
+            chkOem.ToolTip = "If this field is checked it indicates the application came bundled with hardware (aka OEM distributed).";
+            chkSource.ToolTip = "If this field is checked it indicates this is the source code for the application.";
+            chkUpdate.ToolTip = "If this field is checked it indicates this version is a minor version update that requires a previous version of the application already installed.";
+            chkUpgrade.ToolTip = "If this field is checked it indicates this version is a major version upgrade that requires a previous version of the application already installed.";
+            txtArchitecture.ReadOnly = true;
+            txtDeveloper.ReadOnly = true;
+            txtFormat.ReadOnly = true;
+            txtLanguages.ReadOnly = true;
+            txtProduct.ReadOnly = true;
+            txtTargetOs.ReadOnly = true;
+            txtVersion.ReadOnly = true;
         }
 
         public event OnAddedAppDelegate OnAddedApp;
@@ -1152,7 +1174,7 @@ namespace apprepodbmgr.Eto
         TextBox     txtArchitecture;
         TextBox     txtTargetOs;
         TextBox     txtFormat;
-        TextBox     txtDescription;
+        TextArea    txtDescription;
         CheckBox    chkOem;
         CheckBox    chkUpdate;
         CheckBox    chkUpgrade;
diff --git a/dlgBlockMedia.xeto.cs b/dlgBlockMedia.xeto.cs
index 0add99b..cb5b7be 100644
--- a/dlgBlockMedia.xeto.cs
+++ b/dlgBlockMedia.xeto.cs
@@ -591,6 +591,38 @@ namespace apprepodbmgr.Eto
             });
             treeAdditionalInformation.DataStore              = lstAdditionalInformation;
             treeAdditionalInformation.AllowMultipleSelection = false;
+
+            txtImage.ToolTip = "This is the disk image containing this media.";
+            txtFormat.ToolTip = "This is the format of the disk image.";
+            txtOffset.ToolTip = "Byte offset where the media dump starts in the disk image.";
+            txtSize.ToolTip = "Size of the disk dump.";
+            txtManufacturer.ToolTip = "Disk manufacturer.";
+            txtModel.ToolTip = "Disk model.";
+            txtSerial.ToolTip = "Disk serial number.";
+            txtFirmware.ToolTip = "Disk firmware revision.";
+            txtInterface.ToolTip = "Disk interface.";
+            txtCopyProtection.ToolTip = "Disk copy protection.";
+            txtMediaType.ToolTip = "Disk type.";
+            txtMediaSubtype.ToolTip = "Disk subtype.";
+            chkSequence.ToolTip = "If checked means this disk is one in a sequence of several.";
+            txtMediaTitle.ToolTip = "Title of disk.";
+            spSequence.ToolTip = "Number of this disk in the sequence.";
+            spTotalMedia.ToolTip = "How many disks make the sequence.";
+            spSide.ToolTip = "On flippy disks, which side of the disk is represented by this dump.";
+            spLayer.ToolTip = "On PTP layered disks, which layer of the side of the disk is represented by this dump.";
+            txtBlocks.ToolTip = "How many individual blocks (sectors) are in this dump.";
+            spPhysicalBlockSize.ToolTip = "Size of the biggest physical block in bytes.";
+            spLogicalBlockSize.ToolTip = "Size of the biggest logical block in bytes.";
+            spCylinders.ToolTip = "Cylinders of disk.";
+            spHeads.ToolTip = "Heads of disk.";
+            spSectors.ToolTip = "Sectors per track of disk.";
+            chkDimensions.ToolTip = "If checked, physical dimensions of disk are known.";
+            chkRound.ToolTip = "If checked, disk is physicaly round.";
+            spDiameter.ToolTip = "Diameter in milimeters of disk.";
+            spHeight.ToolTip = "Height in milimeters of disk.";
+            spWidth.ToolTip = "Width in milimeters of disk.";
+            spThickness.ToolTip = "Thickness in milimeters of disk.";
+            chkATA.ToolTip = "If checked, disk dump contains ATA(PI) IDENTIFY information.";
         }
 
         public void FillFields()
diff --git a/dlgMetadata.xeto.cs b/dlgMetadata.xeto.cs
index 55e735f..adbcb8d 100644
--- a/dlgMetadata.xeto.cs
+++ b/dlgMetadata.xeto.cs
@@ -183,6 +183,16 @@ namespace apprepodbmgr.Eto
             FillLanguagesCombo();
             FillArchitecturesCombo();
             FillFilesCombos();
+
+            txtDeveloper.ToolTip  = "Who developed the application.";
+            txtPublisher.ToolTip  = "Who published the application.";
+            txtAuthor.ToolTip     = "Author of the audiovisual media.";
+            txtPerformer.ToolTip  = "Performer of the audiovisual media.";
+            txtName.ToolTip       = "Application name.";
+            txtVersion.ToolTip    = "Application version.";
+            txtPartNumber.ToolTip = "Part number of the application distribution.";
+            txtSerialNumber.ToolTip =
+                "Serial number of the application distribution. Not to be confused with serial number required to install.";
         }
 
         void FillBarcodeCombo()
diff --git a/dlgOpticalDisc.xeto.cs b/dlgOpticalDisc.xeto.cs
index 349d8c8..5289280 100644
--- a/dlgOpticalDisc.xeto.cs
+++ b/dlgOpticalDisc.xeto.cs
@@ -822,6 +822,29 @@ namespace apprepodbmgr.Eto
 
             spExtentStart.MaxValue = double.MaxValue;
             spExtentEnd.MaxValue   = double.MaxValue;
+
+            txtImage.ToolTip          = "This is the disc image containing this media.";
+            txtFormat.ToolTip         = "This is the format of the disc image.";
+            txtOffset.ToolTip         = "Byte offset where the media dump starts in the disc image.";
+            txtSize.ToolTip           = "Size of the disc dump.";
+            txtWriteOffset.ToolTip    = "Write offset in bytes (can be negative).";
+            txtMediaTracks.ToolTip    = "How many tracks?";
+            txtMediaSessions.ToolTip  = "How many sessions?";
+            txtCopyProtection.ToolTip = "Disc copy protection.";
+            txtDiscType.ToolTip       = "Disc type.";
+            txtDiscSubtype.ToolTip    = "Disc subtype.";
+            chkSequence.ToolTip       = "If checked means this disc is one in a sequence of several.";
+            txtDiscTitle.ToolTip      = "Title of disc.";
+            spSequence.ToolTip        = "Number of this disc in the sequence.";
+            spTotalMedia.ToolTip      = "How many diskc make the sequence.";
+            spSide.ToolTip            = "On double sided discs, which side of the disc is represented by this dump.";
+            spLayer.ToolTip           = "On PTP layered discs, which layer of the side of the disc is represented by this dump.";
+            chkDimensions.ToolTip     = "If checked, physical dimensions of disk are known.";
+            chkRound.ToolTip          = "If checked, disk is physicaly round.";
+            spDiameter.ToolTip        = "Diameter in milimeters of disk.";
+            spHeight.ToolTip          = "Height in milimeters of disk.";
+            spWidth.ToolTip           = "Width in milimeters of disk.";
+            spThickness.ToolTip       = "Thickness in milimeters of disk.";
         }
 
         public void FillFields()