diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index fd8569433..dd3516bfa 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -59,7 +59,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
                                                         iconSize ) );
 
     QFontMetrics fm = QFontMetrics( QFont() );
-    m_ptLabel->setMinimumWidth( fm.boundingRect( "MSDOS" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
+    m_ptLabel->setMinimumWidth( fm.boundingRect( "Amiga" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
     m_bootLabel->setMinimumWidth( fm.boundingRect( "BIOS" ).width() + CalamaresUtils::defaultFontHeight() / 2 );
     m_ptLabel->setAlignment( Qt::AlignCenter );
     m_bootLabel->setAlignment( Qt::AlignCenter );
@@ -79,17 +79,10 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
     m_bootIcon->setToolTip( tr( "The <strong>boot environment</strong> of this system.<br><br>"
                                 "Older x86 systems only support <strong>BIOS</strong>.<br>"
                                 "Modern systems usually use <strong>EFI</strong>, but "
-                                "may also show up as BIOS if the boot "
-                                "environment runs in compatibility mode.<br>"
-                                "Relevant entries in the system setup utility "
-                                "include: CSM, compatibility support module, "
-                                "Legacy boot mode, BIOS mode, etc." ) );
-    m_ptIcon->setToolTip( tr( "The type of <strong>partition table</strong> currently "
-                              "present on the selected storage device.<br><br>"
-                              "Common values on x86-compatible systems include "
-                              "<strong>GPT</strong> and <strong>MSDOS</strong>.<br>"
-                              "Some systems may use other, less common partition table "
-                              "types, like BSD or Sun.<br>"
+                                "may also show up as BIOS if started in compatibility "
+                                "mode." ) );
+    m_ptIcon->setToolTip( tr( "The type of <strong>partition table</strong> on the "
+                              "selected storage device.<br><br>"
                               "The only way to change the partition table type is to "
                               "erase and recreate the partition table from scratch, "
                               "which destroys all data on the storage device.<br>"
@@ -107,11 +100,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
         m_bootLabel->setText( "EFI " );
         bootToolTip = tr( "This system was started with an <strong>EFI</strong> "
                           "boot environment.<br><br>"
-                          "Most consumer systems nowadays use EFI, along with a "
-                          "GPT partition table.<br>"
-                          "Current versions of other operating systems, like Windows "
-                          "and Mac OS X also support EFI, and dual boot is possible.<br>"
-                          "In order to boot from an EFI environment, this installer "
+                          "To configure startup from an EFI environment, this installer "
                           "must deploy a boot loader application, like <strong>GRUB"
                           "</strong> or <strong>systemd-boot</strong> on an <strong>"
                           "EFI System Partition</strong>. This is automatic, unless "
@@ -123,15 +112,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
         m_bootLabel->setText( "BIOS" );
         bootToolTip = tr( "This system was started with a <strong>BIOS</strong> "
                           "boot environment.<br><br>"
-                          "Older systems which do not support EFI start from BIOS.<br>"
-                          "New systems that support EFI can also start in BIOS mode "
-                          "through a compatibility layer, sometimes known as "
-                          "CSM, Legacy boot mode or BIOS mode. On such systems "
-                          "EFI should be preferred, unless you wish to dual boot "
-                          "with an old operating system, like Windows XP. In that "
-                          "case, a MSDOS partition table should also be used instead "
-                          "of GPT.<br>"
-                          "In order to boot from a BIOS environment, this installer "
+                          "To configure startup from a BIOS environment, this installer "
                           "must install a boot loader, like <strong>GRUB"
                           "</strong>, either at the beginning of a partition or "
                           "on the <strong>Master Boot Record</strong> near the "
@@ -154,6 +135,10 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type )
     // fix up if the name shouldn't be uppercase:
     switch ( type )
     {
+    case PartitionTable::msdos:
+    case PartitionTable::msdos_sectorbased:
+        typeString = "MBR";
+        break;
     case PartitionTable::loop:
         typeString = "loop";
         break;
@@ -171,8 +156,8 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type )
     }
 
 
-    QString toolTipString = tr( "The selected storage device has a partition "
-                                "table. The partition table type is <strong>%1</strong>." )
+    QString toolTipString = tr( "The selected storage device has a partition table of "
+                                "type <strong>%1</strong>." )
                             .arg( typeString );
 
     switch ( type )
@@ -203,18 +188,12 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type )
     case PartitionTable::msdos_sectorbased:
         toolTipString += tr( "<br><br>This partition table type is only advisable on older "
                              "systems which start from a <strong>BIOS</strong> boot "
-                             "environment. For most uses GPT should be preferred "
-                             "instead.<br>"
-                             "<strong>Warning:</strong> the MSDOS partition table "
-                             "is an obsolete standard with important drawbacks.<br>"
+                             "environment. GPT is recommended in most other cases.<br><br>"
+                             "<strong>Warning:</strong> the MBR partition table "
+                             "is an obsolete standard.<br>"
                              "Only 4 <em>primary</em> partitions may be created, and of "
                              "those 4, one can be an <em>extended</em> partition, which "
-                             "may in turn contain many <em>logical</em> partitions."
-                             "<br>For compatibility reasons, it is recommended for a "
-                             "setup based on an MSDOS partition table to have a "
-                             "separate boot partition. This installer can create "
-                             "the boot partition for you automatically, or you may "
-                             "set it up yourself on the manual partitioning page." );
+                             "may in turn contain many <em>logical</em> partitions." );
     }
 
     m_ptLabel->setText( typeString );