diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 45de84d52..116d064fd 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -81,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
                    .arg( KFormat().formatByteSize( device->capacity() ) )
                    .arg( device->deviceNode() );
     case Qt::DecorationRole:
-        return CalamaresUtils::defaultPixmap( CalamaresUtils::Partitions,
+        return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual,
                                               CalamaresUtils::Original,
                                               QSize( CalamaresUtils::defaultIconSize().width() * 3,
                                                      CalamaresUtils::defaultIconSize().height() * 3 ) );
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 008f1a204..0b4a5b32a 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -85,21 +85,21 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
 
     PrettyRadioButton* alongsideButton = new PrettyRadioButton;
     alongsideButton->setIconSize( iconSize );
-    alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information,
+    alongsideButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionAlongside,
                                                              CalamaresUtils::Original,
                                                              iconSize ) );
     grp->addButton( alongsideButton->buttonWidget() );
 
     PrettyRadioButton* eraseButton = new PrettyRadioButton;
     eraseButton->setIconSize( iconSize );
-    eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Magic,
+    eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
                                                          CalamaresUtils::Original,
                                                          iconSize ) );
     grp->addButton( eraseButton->buttonWidget() );
 
     PrettyRadioButton* replaceButton = new PrettyRadioButton;
     replaceButton->setIconSize( iconSize );
-    replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Replace,
+    replaceButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionReplaceOs,
                                                            CalamaresUtils::Original,
                                                            iconSize ) );
     grp->addButton( replaceButton->buttonWidget() );
@@ -265,7 +265,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
                                               string( Calamares::Branding::ShortVersionedName ) ) );
     )
     somethingElseButton->setIconSize( iconSize );
-    somethingElseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Partitions,
+    somethingElseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionManual,
                                                                  CalamaresUtils::Original,
                                                                  iconSize ) );
     m_itemsLayout->addWidget( somethingElseButton );
diff --git a/src/modules/partition/gui/ReplacePage.cpp b/src/modules/partition/gui/ReplacePage.cpp
index 5e824ad0d..fc1a4a350 100644
--- a/src/modules/partition/gui/ReplacePage.cpp
+++ b/src/modules/partition/gui/ReplacePage.cpp
@@ -105,7 +105,7 @@ ReplacePage::onPartitionSelected()
 {
     if ( m_ui->partitionTreeView->currentIndex() == QModelIndex() )
     {
-        updateStatus( CalamaresUtils::Partitions,
+        updateStatus( CalamaresUtils::PartitionReplaceOs,
                       tr( "Select where to install %1.<br/>"
                           "<font color=\"red\">Warning: </font>this will delete all files "
                           "on the selected partition." )
@@ -216,7 +216,7 @@ ReplacePage::onPartitionSelected()
             return;
         }
 
-        updateStatus( CalamaresUtils::Partitions,
+        updateStatus( CalamaresUtils::PartitionReplaceOs,
                       tr( "<b>%3</b><br/><br/>"
                           "%1 will be installed on %2.<br/>"
                           "<font color=\"red\">Warning: </font>all data on partition"