diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
index 5a35e554da8c68f97d2d81db9accc04c096eb8e4..18afd17de7ad6a3cb8e25f4c447804f4ceabad42 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
@@ -191,7 +191,7 @@ void DetailedApplicationController::startScenario(ScenarioPtr scenario)
 {
 
     StatusManager statusManager;
-    auto mode = statusManager.isIceScenario(scenario) ? IceStart : LocalStart;
+    ScenarioStartModes mode = LocalStart;
     ScenarioListController::StartScenario(scenario, mode, executor, iceAdmin);
 
     //    StatusManager statusManager;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
index b9cc72b59d7abbc883acf6386f7b9e2e0e192ef4..7b7240b660883559849b0562332dafc57cc4a3de 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
@@ -69,12 +69,12 @@ QWidget* ButtonDelegate::createEditor(QWidget* parent, const QStyleOptionViewIte
         // IceStartQuickFix: TODO: This is just a very dirty fix. Either completely remove the Ice Start feature or fix it.
         //cb->addItem(startPixmap, "Ice");
 
-        ScenarioManager::StatusManager statusManager;
-        ScenarioItem* item = index.model()->data(index, SCENARIOITEMSOURCE).value<ScenarioItem*>();
-        if (statusManager.isIceScenario(item->getScenario()))
-        {
-            cb->setCurrentIndex(1);
-        }
+        //ScenarioManager::StatusManager statusManager;
+        //ScenarioItem* item = index.model()->data(index, SCENARIOITEMSOURCE).value<ScenarioItem*>();
+        //if (statusManager.isIceScenario(item->getScenario()))
+        //{
+        //    cb->setCurrentIndex(1);
+        //}
         cb->setIconSize(QSize(size, size));
         cb->setToolTip("Start");
         cb->setIceStatesActive(true);
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
index 47a933bdaeab8b2eb3ec77ec76782b81293fba3f..a459d3204ec1c4b33416d136b687cee51545dcec 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
@@ -83,14 +83,7 @@ void ComboBoxButton::onIndexChange(const QString& text)
     ScenarioItem* item = ScenarioModel::FindScenario(model, scenarioName);
     ARMARX_CHECK_EXPRESSION(item) << scenarioName.toStdString();
 
-    if (text == "Local")
-    {
-        statusManager.setIceScenario(item->getScenario(), false);
-    }
-    else if (text == "Ice")
-    {
-        statusManager.setIceScenario(item->getScenario(), true);
-    }
+    statusManager.setIceScenario(item->getScenario(), false);
 }
 
 
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
index f9ee3ba62c3b743c6ab9b718b4b94374b00ca6a8..63ba13ad97f68183560194d44c3e6d67531035c0 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
@@ -108,19 +108,12 @@ void ScenarioListView::on_searchBar_textEdited(const QString& text)
 
 void ScenarioListView::startComboBoxClicked(int row, int column, QModelIndex parent, QString text)
 {
-    if (text == "Local")
-    {
-        emit startApplication(row, column, parent, LocalStart);
-    }
-    else if (text == "Ice")
-    {
-        emit startApplication(row, column, parent, IceStart);
-    }
+    emit startApplication(row, column, parent, LocalStart);
 }
 
 void ScenarioListView::startButtonClicked(int row, int column, QModelIndex parent)
 {
-    emit startApplication(row, column, parent, ContextStart);
+    emit startApplication(row, column, parent, LocalStart);
 }
 
 void ScenarioListView::stopButtonClicked(int row, int column, QModelIndex parent)
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
index a315d88c9276f613d71883cf563e23716ba55908..8365c31dafccec6a155f688cd7b5b6c071ca2b04 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
@@ -43,9 +43,7 @@ namespace Ui
 
 enum ScenarioStartModes
 {
-    ContextStart = 0, //Used if the start mode is determind by the Scenario
     LocalStart = 1, //Start the Scenario Local
-    IceStart = 2 //Deploy the Scenario via Ice
 };
 
 /**