diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index e45d5b07b6..a5f9c1927d 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -82,11 +82,12 @@ Rectangle {
                     } else if (base.progress < 0.99) {
                         //: Save button label
                         return qsTr("Calculating Print-time");
-                    } else if (base.progress > 0.99){
+                    } else if (base.printDuration.days > 0 || base.progress == null){
+                        return qsTr("");
+                    }
+                    else if (base.progress > 0.99){
                         //: Save button label
                         return qsTr("Estimated Print-time");
-                    } else if (base.progress == null){
-                        return qsTr("");
                     }
             }
             Label {
@@ -104,8 +105,12 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: printDurationLabel.right;
                 anchors.leftMargin: UM.Theme.sizes.save_button_text_margin.width;
-                color: UM.Theme.colors.save_button_printtime_text;
+                color: base.printDuration.days > 0 ? UM.Theme.colors.save_button_estimated_text : UM.Theme.colors.save_button_printtime_text;
                 font: UM.Theme.fonts.small;
+
+                property bool mediumLengthDuration: base.printDuration.hours > 9 && base.printMaterialAmount > 9.99 && base.printDuration.days == 0
+                width: mediumLengthDuration ? 50 : undefined
+                elide: mediumLengthDuration ? Text.ElideRight : Text.ElideNone
                 visible: base.progress < 0.99 ? false : true
                 //: Print material amount save button label
                 text: base.printMaterialAmount < 0 ? "" : qsTr("%1m material").arg(base.printMaterialAmount);
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 88a236d7ce..a2b7514966 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -160,7 +160,7 @@
         "tooltip_margins": [1.0, 1.0],
 
         "save_button_border": [0.06, 0.06],
-        "save_button_text_margin": [0.6, 0.6],
+        "save_button_text_margin": [0.3, 0.6],
         "save_button_slicing_bar": [0.0, 2.2],
         "save_button_label_margin": [0.5, 0.5],
         "save_button_save_to_button": [0.3, 2.7],