diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 984cadd33..7b7f48769 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -175,6 +175,14 @@ std::string AmsTray::get_filament_type()
         return "PLA-S";
     } else if (type == "Support G") {
         return "PA-S";
+    } else if (type == "Support") {
+        if (setting_id == "GFS00") {
+            type = "PLA-S";
+        } else if (setting_id == "GFS01") {
+            type = "PA-S";
+        } else {
+            return "PLA-S";
+        }
     } else {
         return type;
     }
@@ -2251,7 +2259,14 @@ int MachineObject::parse_json(std::string payload)
                                         if (tray_it->contains("tray_info_idx") && tray_it->contains("tray_type")) {
                                             curr_tray->setting_id       = (*tray_it)["tray_info_idx"].get<std::string>();
                                             std::string type            = (*tray_it)["tray_type"].get<std::string>();
-                                            curr_tray->type = type;
+                                            if (curr_tray->setting_id == "GFS00") {
+                                                curr_tray->type = "PLA-S";
+                                            }
+                                            else if (curr_tray->setting_id == "GFS01") {
+                                                curr_tray->type = "PA-S";
+                                            } else {
+                                                curr_tray->type = type;
+                                            }
                                         } else {
                                             curr_tray->setting_id = "";
                                             curr_tray->type       = "";
diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index 5ec6963c3..2b43c0864 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -98,7 +98,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer = new wxBoxSizer(wxHORIZONTAL);
     m_cb_spaghetti_print_halt = new CheckBox(parent);
     text_spaghetti_print_halt = new wxStaticText(parent, wxID_ANY, _L("Stop printing when spaghetti detected"));
-    text_spaghetti_print_halt->SetFont(Label::Body_12);
+    text_spaghetti_print_halt->SetFont(Label::Body_14);
     line_sizer->Add(FromDIP(30), 0, 0, 0);
     line_sizer->Add(m_cb_spaghetti_print_halt, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add(text_spaghetti_print_halt, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));