diff --git a/cinnamon-control-center.pot b/cinnamon-control-center.pot
index 8ce98642..a0857071 100644
--- a/cinnamon-control-center.pot
+++ b/cinnamon-control-center.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-12 16:35+0100\n"
+"POT-Creation-Date: 2020-06-21 13:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -306,28 +306,28 @@ msgstr ""
 msgid "Unspecified"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:616 panels/display/cc-display-panel.c:1227
-#: panels/display/cc-display-panel.c:1234
+#: panels/display/cc-display-panel.c:599 panels/display/cc-display-panel.c:1208
+#: panels/display/cc-display-panel.c:1215
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:683
+#: panels/display/cc-display-panel.c:666
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:684
+#: panels/display/cc-display-panel.c:667
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:685
+#: panels/display/cc-display-panel.c:668
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:686
+#: panels/display/cc-display-panel.c:669
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr ""
@@ -343,75 +343,80 @@ msgstr ""
 #. * Here, "Mirrored" is being used as an adjective.  For example,
 #. * the Spanish translation could be "Pantallas en Espejo".
 #.
-#: panels/display/cc-display-panel.c:832 panels/display/cc-rr-labeler.c:404
+#: panels/display/cc-display-panel.c:814 panels/display/cc-rr-labeler.c:404
 msgid "Mirrored Displays"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:856
+#: panels/display/cc-display-panel.c:838
 msgid "Monitor"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:960
+#: panels/display/cc-display-panel.c:942
 #, c-format
 msgid "%d x %d%s (%s)"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:962
+#: panels/display/cc-display-panel.c:944
 #, c-format
 msgid "%d x %d%s"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:977
+#: panels/display/cc-display-panel.c:959
 #, c-format
 msgid "%.2lf Hz"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:1269
+#: panels/display/cc-display-panel.c:1238
 msgid "Normal"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:1271
+#: panels/display/cc-display-panel.c:1240
 msgid "Double (Hi-DPI)"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:2443
+#: panels/display/cc-display-panel.c:1280
+#, c-format
+msgid "Automatic (%ux)"
+msgstr ""
+
+#: panels/display/cc-display-panel.c:2444
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr ""
 
-#: panels/display/cc-display-panel.c:2889
+#: panels/display/cc-display-panel.c:2890
 msgid "DoubleScan"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:2927
+#: panels/display/cc-display-panel.c:2928
 msgid "VSync"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:2965
-#: panels/display/cc-display-panel.c:2993
+#: panels/display/cc-display-panel.c:2966
+#: panels/display/cc-display-panel.c:2994
 msgid "Recommended"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:3028
+#: panels/display/cc-display-panel.c:3029
 #, c-format
 msgid "<b>scaled resolution: %d x %d</b>"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:3220
-#: panels/display/cc-display-panel.c:3272
+#: panels/display/cc-display-panel.c:3218
+#: panels/display/cc-display-panel.c:3270
 msgid "Failed to apply configuration"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:3300
+#: panels/display/cc-display-panel.c:3298
 msgid "Could not save the monitor configuration"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:3360
+#: panels/display/cc-display-panel.c:3358
 msgid "Could not detect displays"
 msgstr ""
 
-#: panels/display/cc-display-panel.c:3558
+#: panels/display/cc-display-panel.c:3554
 msgid "Could not get screen information"
 msgstr ""
 
@@ -1367,39 +1372,36 @@ msgid "Mirror displays"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:5
-msgid ""
-"This controls the apparent size of the monitor as you view it.  A higher "
-"zoom level will make screen elements appear larger, but you will have less "
-"area to work with."
+msgid "Fractional scaling"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:6
-msgid "Zoom Level"
+msgid "Rotation"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:7
-msgid "Rotation"
+msgid "Refresh Rate"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:8
-msgid "Refresh Rate"
+msgid "User interface scale"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:9
-msgid "Base interface scale"
+msgid ""
+"This is the global scaling factor for all monitors. In automatic mode, it is "
+"chosen based on the primary monitor."
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:10
-msgid ""
-"This controls the global scale across all monitors.  Changing this does not "
-"change the apparent size of each monitor (as displayed in the Zoom level "
-"setting), but controls the starting global scale from which those individual "
-"monitors will achieve their zoom levels.   If you have performance issues, "
-"it may be helpful to lower this value."
+msgid "This option may limit resolution options"
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:11
-msgid "This option may limit resolution options"
+msgid ""
+"This feature is experimental and may not work well with all hardware and "
+"drivers. Enabling it may impact performance, vsync, resolution or screen "
+"ratio."
 msgstr ""
 
 #: panels/display/display-capplet.ui.h:12
diff --git a/panels/display/display-capplet.ui b/panels/display/display-capplet.ui
index 8093a2d4..89a627b4 100644
--- a/panels/display/display-capplet.ui
+++ b/panels/display/display-capplet.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="display-panel">
@@ -264,7 +264,7 @@
           <object class="GtkComboBox" id="base_scale_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Adjusts the global scaling factor. This is used for high-dpi monitors.  Setting it to auto will have the system decide the best scale based on the primary monitor.</property>
+            <property name="tooltip_text" translatable="yes">This is the global scaling factor for all monitors. In automatic mode, it is chosen based on the primary monitor.</property>
             <property name="hexpand">True</property>
             <child>
               <object class="GtkCellRendererText" id="cellrenderertext3"/>
@@ -301,6 +301,7 @@
               <object class="GtkSwitch" id="fractional_switch">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">This feature is experimental and may not work well with all hardware and drivers. Enabling it may impact performance, vsync, resolution or screen ratio.</property>
                 <property name="halign">start</property>
               </object>
               <packing>
@@ -313,7 +314,7 @@
               <object class="GtkComboBox" id="scale_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Allows adjustment of an individual monitor's scale factor.  This may not yield acceptable results on all hardware, and can be resource-intensive.</property>
+                <property name="tooltip_text" translatable="yes">This feature is experimental and may not work well with all hardware and drivers. Enabling it may impact performance, vsync, resolution or screen ratio.</property>
                 <property name="hexpand">True</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext2"/>