diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 0f6031e3bc..17dd498f1d 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -1691,30 +1691,57 @@ QPixmap MainWindow::aboutImage() const
     return about_image;
 }
 
-void MainWindow::RenderDevBuildWarning(QPainter &painter, int x, int y) const
+/**
+ * Displays a warning about this being a developer build. Designed for display in the Splashscreen.
+ * \param painter The painter to draw the warning into
+ * \param startPosition The painter-space coordinates to start the warning box at.
+ * \param maxSize The maximum extents for the box that is drawn. If the text exceeds this size it
+ * will be scaled down to fit.
+ * \note The text string is translatable, so its length is somewhat unpredictable. It is always
+ * displayed as two lines, regardless of the length of the text (e.g. no wrapping is done). Only the
+ * width is considered, the height simply follows from the font size.
+ */
+void MainWindow::renderDevBuildWarning(
+    QPainter &painter,
+    const QPoint startPosition,
+    const QSize maxSize)
 {
     // Create a background box that fades out the artwork for better legibility
     QColor fader (Qt::black);
-    const float halfDensity (0.5);
+    constexpr float halfDensity (0.5);
     fader.setAlphaF(halfDensity);
     QBrush fillBrush(fader, Qt::BrushStyle::SolidPattern);
     painter.setBrush(fillBrush);
 
     // Construct the lines of text and figure out how much space they need
-    auto devWarningLine1 = tr("WARNING: This is a development version.");
-    auto devWarningLine2 = tr("Please do not use in a production environment.");
-    QFontMetrics fontMetrics(painter.font());
+    const auto devWarningLine1 = tr("WARNING: This is a development version.");
+    const auto devWarningLine2 = tr("Please do not use in a production environment.");
+    QFontMetrics fontMetrics(painter.font()); // Try to use the existing font
     int padding = QtTools::horizontalAdvance(fontMetrics, QLatin1String("M")); // Arbitrary
     int line1Width = QtTools::horizontalAdvance(fontMetrics, devWarningLine1);
     int line2Width = QtTools::horizontalAdvance(fontMetrics, devWarningLine2);
     int boxWidth = std::max(line1Width,line2Width) + 2 * padding;
     int lineHeight = fontMetrics.lineSpacing();
-    int boxHeight = static_cast<int>(lineHeight*2.3);
+    if (boxWidth > maxSize.width()) {
+        // Especially if the text was translated, there is a chance that using the existing font
+        // will exceed the width of the Splashscreen graphic. Resize down so that it fits, no matter
+        // how long the text strings are.
+        float reductionFactor = static_cast<float>(maxSize.width()) / static_cast<float>(boxWidth);
+        int newFontSize = static_cast<int>(painter.font().pointSize() * reductionFactor);
+        padding *= reductionFactor;
+        QFont newFont = painter.font();
+        newFont.setPointSize(newFontSize);
+        painter.setFont(newFont);
+        lineHeight = painter.fontMetrics().lineSpacing();
+        boxWidth = maxSize.width();
+    }
+    constexpr float lineExpansionFactor(2.3);
+    int boxHeight = static_cast<int>(lineHeight*lineExpansionFactor);
 
     // Draw the background rectangle and the text
-    painter.drawRect(x, y, boxWidth, boxHeight);
-    painter.drawText(x+padding, y+lineHeight, devWarningLine1);
-    painter.drawText(x+padding, y+2*lineHeight, devWarningLine2);
+    painter.drawRect(startPosition.x(), startPosition.y(), boxWidth, boxHeight);
+    painter.drawText(startPosition.x()+padding, startPosition.y()+lineHeight, devWarningLine1);
+    painter.drawText(startPosition.x()+padding, startPosition.y()+2*lineHeight, devWarningLine2);
 }
 
 QPixmap MainWindow::splashImage() const
@@ -1738,12 +1765,14 @@ QPixmap MainWindow::splashImage() const
     }
 
     // now try the icon paths
+    float pixelRatio (1.0);
     if (splash_image.isNull()) {
         if (qApp->devicePixelRatio() > 1.0) {
             // For HiDPI screens, we have a double-resolution version of the splash image
             splash_path += "2x";
             splash_image = Gui::BitmapFactory().pixmap(splash_path.c_str());
             splash_image.setDevicePixelRatio(2.0);
+            pixelRatio = 2.0;
         }
         else {
             splash_image = Gui::BitmapFactory().pixmap(splash_path.c_str());
@@ -1821,7 +1850,11 @@ QPixmap MainWindow::splashImage() const
             painter.setFont(fontVer);
             painter.drawText(x + (l + 5), y, version);
             if (suffix == QLatin1String("dev")) {
-                RenderDevBuildWarning(painter, x + l + 5, y + 10);
+                const int lineHeight = metricVer.lineSpacing();
+                const int padding {10}; // Distance from the edge of the graphic's bounding box
+                QPoint startPosition(padding, y + lineHeight);
+                QSize maxSize(w/pixelRatio - 2*padding, lineHeight * 3);
+                MainWindow::renderDevBuildWarning(painter, startPosition, maxSize);
             }
             painter.end();
         }
diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index ab9fb87528..780c095338 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -292,7 +292,7 @@ private:
     bool setupReportView(const std::string&);
     bool setupPythonConsole(const std::string&);
 
-    void RenderDevBuildWarning(QPainter &painter, int x, int y) const;
+    static void renderDevBuildWarning(QPainter &painter, const QPoint startPosition, const QSize maxSize);
 
 private Q_SLOTS:
     /**