diff --git a/resources/shapes/3DBenchy.png b/resources/shapes/3DBenchy.png
new file mode 100644
index 0000000000..645a1b9512
Binary files /dev/null and b/resources/shapes/3DBenchy.png differ
diff --git a/resources/shapes/3DBenchy.stl b/resources/shapes/3DBenchy.stl
new file mode 100644
index 0000000000..1f268d5835
Binary files /dev/null and b/resources/shapes/3DBenchy.stl differ
diff --git a/resources/shapes/sign_base.png b/resources/shapes/sign_base.png
new file mode 100644
index 0000000000..aefe8e012e
Binary files /dev/null and b/resources/shapes/sign_base.png differ
diff --git a/resources/shapes/sign_base.stl b/resources/shapes/sign_base.stl
new file mode 100644
index 0000000000..1ddc722282
Binary files /dev/null and b/resources/shapes/sign_base.stl differ
diff --git a/resources/shapes/sign_base_rounded.png b/resources/shapes/sign_base_rounded.png
new file mode 100644
index 0000000000..393fc2c456
Binary files /dev/null and b/resources/shapes/sign_base_rounded.png differ
diff --git a/resources/shapes/sign_base_rounded.stl b/resources/shapes/sign_base_rounded.stl
new file mode 100644
index 0000000000..3ee0251573
Binary files /dev/null and b/resources/shapes/sign_base_rounded.stl differ
diff --git a/src/libslic3r/GCode/LabelObjects.cpp b/src/libslic3r/GCode/LabelObjects.cpp
index 4c32122ad2..c7eb8c2fb7 100644
--- a/src/libslic3r/GCode/LabelObjects.cpp
+++ b/src/libslic3r/GCode/LabelObjects.cpp
@@ -147,11 +147,12 @@ std::string LabelObjects::start_object(const PrintInstance& print_instance, Incl
         out += std::string("; printing object ") + label.name + "\n";
     else if (m_label_objects_style == LabelObjectsStyle::Firmware) {
         if (m_flavor == GCodeFlavor::gcfMarlinFirmware || m_flavor == GCodeFlavor::gcfMarlinLegacy || m_flavor == GCodeFlavor::gcfRepRapFirmware) {
-            out += std::string("M486 S") + std::to_string(label.unique_id) + "\n";
+            out += std::string("M486 S") + std::to_string(label.unique_id);
             if (include_name == IncludeName::Yes) {
-                out += std::string("M486 A");
-                out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? (std::string("\"") + label.name + "\"") : label.name) + "\n";
+                out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? " A" : "\nM486 A");
+                out += (m_flavor == GCodeFlavor::gcfRepRapFirmware ? (std::string("\"") + label.name + "\"") : label.name);
             }
+            out += "\n";
         } else if (m_flavor == gcfKlipper)
             out += "EXCLUDE_OBJECT_START NAME=" + label.name + "\n";
         else {