diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp
index 42ef15e7d4..157e40bb26 100644
--- a/ApplicationLibCode/Application/RiaPreferences.cpp
+++ b/ApplicationLibCode/Application/RiaPreferences.cpp
@@ -179,7 +179,9 @@ RiaPreferences::RiaPreferences()
     CAF_PDM_InitFieldNoDefault( &defaultSceneFontSize, "defaultSceneFontSizePt", "Viewer Font Size" );
     CAF_PDM_InitFieldNoDefault( &defaultAnnotationFontSize, "defaultAnnotationFontSizePt", "Annotation Font Size" );
     CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size" );
-    CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size" );
+
+    auto defaultValue = FontSizeEnum( RiaFontCache::FontSize::FONT_SIZE_10 );
+    CAF_PDM_InitField( &defaultPlotFontSize, "defaultPlotFontSizePt", defaultValue, "Plot Font Size" );
 
     CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground );
diff --git a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp
index 548876df9d..1fcceaf06b 100644
--- a/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp
+++ b/ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp
@@ -98,7 +98,7 @@ RimWellLogPlot* RicNewWellLogPlotFeatureImpl::createRftSegmentPlot()
     plot->setLegendItemsClickable( false );
     plot->enableDepthMarkerLine( true );
     plot->setLegendPosition( RimPlotWindow::LegendPosition::INSIDE_UPPER_RIGHT );
-    plot->setLegendFontSize( caf::FontTools::RelativeSize::XSmall );
+    plot->setLegendFontSize( caf::FontTools::RelativeSize::Small );
     plot->setLegendsHorizontal( false );
     plot->setAutoZoomMaximumDepthFactor( 0.1 );
 
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
index fdf4ba84fa..483af68266 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
@@ -79,13 +79,13 @@ RimAbstractCorrelationPlot::RimAbstractCorrelationPlot()
     CAF_PDM_InitField( &m_description, "PlotTitle", QString( "Correlation Plot" ), "Custom Plot Title" );
 
     CAF_PDM_InitFieldNoDefault( &m_labelFontSize, "LabelFontSize", "Label Font Size" );
-    m_labelFontSize = caf::FontTools::RelativeSize::XSmall;
+    m_labelFontSize = caf::FontTools::RelativeSize::Small;
 
     CAF_PDM_InitFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size" );
     CAF_PDM_InitFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size" );
-    m_axisValueFontSize = caf::FontTools::RelativeSize::XSmall;
+    m_axisValueFontSize = caf::FontTools::RelativeSize::Small;
 
-    m_legendFontSize = caf::FontTools::RelativeSize::XSmall;
+    m_legendFontSize = caf::FontTools::RelativeSize::Small;
 
     CAF_PDM_InitField( &m_useCaseFilter, "UseCaseFilter", false, "Use Ensemble Filter" );
     CAF_PDM_InitFieldNoDefault( &m_curveSetForFiltering, "CurveSetForFiltering", "  Ensemble Filter" );
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
index 561b24ae73..6d555730e5 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
@@ -123,7 +123,7 @@ RimCorrelationMatrixPlot::RimCorrelationMatrixPlot()
     CAF_PDM_InitField( &m_sortByAbsoluteValues, "CorrelationAbsSorting", true, "Sort by Absolute Values" );
     CAF_PDM_InitField( &m_excludeParametersWithoutVariation, "ExcludeParamsWithoutVariation", true, "Exclude Parameters Without Variation" );
     CAF_PDM_InitField( &m_showOnlyTopNCorrelations, "ShowOnlyTopNCorrelations", true, "Show Only Top Correlations" );
-    CAF_PDM_InitField( &m_topNFilterCount, "TopNFilterCount", 20, "Number rows/columns" );
+    CAF_PDM_InitField( &m_topNFilterCount, "TopNFilterCount", 5, "Number rows/columns" );
     CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendConfig", "" );
     CAF_PDM_InitFieldNoDefault( &m_selectedParametersList, "SelectedParameters", "Select Parameters" );
     m_selectedParametersList.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
@@ -629,7 +629,7 @@ void RimCorrelationMatrixPlot::createMatrix()
             cvf::Color3f contrastColor = RiaColorTools::contrastColor( cvf::Color3f( color ) );
             textLabel.setColor( RiaColorTools::toQColor( contrastColor ) );
             QFont font = textLabel.font();
-            font.setPixelSize( caf::FontTools::pointSizeToPixelSize( labelFontSize() ) );
+            font.setPointSize( labelFontSize() );
             textLabel.setFont( font );
             QwtPlotMarker* marker = new QwtPlotMarker();
             marker->setLabel( textLabel );
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
index 256c0c9a90..b6ac8bdf67 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
@@ -75,9 +75,9 @@ RimCorrelationReportPlot::RimCorrelationReportPlot()
 
     m_titleFontSize     = caf::FontTools::RelativeSize::XLarge;
     m_subTitleFontSize  = caf::FontTools::RelativeSize::Large;
-    m_labelFontSize     = caf::FontTools::RelativeSize::XSmall;
+    m_labelFontSize     = caf::FontTools::RelativeSize::Small;
     m_axisTitleFontSize = caf::FontTools::RelativeSize::Small;
-    m_axisValueFontSize = caf::FontTools::RelativeSize::XSmall;
+    m_axisValueFontSize = caf::FontTools::RelativeSize::Small;
 
     m_correlationMatrixPlot = new RimCorrelationMatrixPlot;
     m_correlationMatrixPlot->setLegendsVisible( false );
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
index 310724a729..dac1f19d4f 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
@@ -19,46 +19,33 @@
 #include "RimParameterResultCrossPlot.h"
 
 #include "RiaColorTables.h"
-#include "RiaPreferences.h"
-#include "RiaQDateTimeTools.h"
-#include "RiaTextStringTools.h"
 
 #include "RifSummaryReaderInterface.h"
 
 #include "RigEnsembleParameter.h"
 
-#include "RimDeltaSummaryCase.h"
-#include "RimEnsembleCurveSet.h"
-#include "RimMultiPlot.h"
-#include "RimPlotAxisProperties.h"
-#include "RimPlotAxisPropertiesInterface.h"
 #include "RimPlotDataFilterCollection.h"
 #include "RimProject.h"
 #include "RimSummaryAddress.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryEnsemble.h"
-#include "RimSummaryPlotAxisFormatter.h"
 
 #include "RiuPlotCurve.h"
-#include "RiuPlotMainWindowTools.h"
 #include "RiuQwtPlotCurve.h"
+#include "RiuQwtPlotWidget.h"
 #include "RiuQwtSymbol.h"
-#include "RiuSummaryQwtPlot.h"
-#include "RiuSummaryVectorSelectionDialog.h"
 
 #include "cafPdmUiComboBoxEditor.h"
-#include "cafPdmUiLineEditor.h"
-#include "cafPdmUiPushButtonEditor.h"
 
-#include "qwt_legend.h"
+#include "qwt_picker_machine.h"
 #include "qwt_plot.h"
 #include "qwt_plot_curve.h"
-#include "qwt_scale_engine.h"
+#include "qwt_plot_picker.h"
+#include "qwt_text.h"
 
 #include <QStringList>
 
 #include <limits>
-#include <map>
 #include <set>
 
 CAF_PDM_SOURCE_INIT( RimParameterResultCrossPlot, "ParameterResultCrossPlot" );
@@ -76,10 +63,12 @@ RimParameterResultCrossPlot::RimParameterResultCrossPlot()
 
     m_selectMultipleVectors = true;
 
-    m_legendFontSize = caf::FontTools::RelativeSize::XSmall;
+    m_legendFontSize = caf::FontTools::RelativeSize::Small;
 
     m_xRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
     m_yRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
+
+    m_showPlotLegends = false;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -164,14 +153,6 @@ void RimParameterResultCrossPlot::onLoadDataAndUpdate()
     if ( m_plotWidget && m_analyserOfSelectedCurveDefs )
     {
         createPoints();
-        if ( m_showPlotLegends && !isSubPlot<RimMultiPlot>() )
-        {
-            QwtLegend* legend = new QwtLegend( m_plotWidget );
-            m_plotWidget->qwtPlot()->insertLegend( legend, QwtPlot::RightLegend );
-            m_plotWidget->setLegendFontSize( legendFontSize() );
-            m_plotWidget->updateLegend();
-        }
-
         updateAxes();
         updatePlotTitle();
         m_plotWidget->scheduleReplot();
@@ -234,7 +215,6 @@ void RimParameterResultCrossPlot::createPoints()
     if ( addresses().empty() ) return;
 
     bool showEnsembleName = ensembles().size() > 1u;
-    bool showAddressName  = addresses().size() > 1u;
 
     m_xRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
     m_yRange = std::make_pair( std::numeric_limits<double>::infinity(), -std::numeric_limits<double>::infinity() );
@@ -248,9 +228,6 @@ void RimParameterResultCrossPlot::createPoints()
             RigEnsembleParameter parameter = ensembleParameter( m_ensembleParameter );
             if ( !( parameter.isNumeric() && parameter.isValid() ) ) return;
 
-            QStringList caseNames      = caseNamesOfValidEnsembleCases( ensemble );
-            QString     commonCaseRoot = RiaTextStringTools::commonRoot( caseNames );
-
             std::set<RimSummaryCase*> activeCases = filterEnsembleCases( ensemble );
 
             for ( size_t caseIdx = 0u; caseIdx < ensemble->allSummaryCases().size(); ++caseIdx )
@@ -298,14 +275,15 @@ void RimParameterResultCrossPlot::createPoints()
                     RiuQwtPlotCurve* plotCurve = new RiuQwtPlotCurve;
                     plotCurve->setSamplesValues( parameterValues, caseValuesAtTimestep );
                     plotCurve->setStyle( QwtPlotCurve::NoCurve );
+
                     RiuQwtSymbol* symbol = new RiuQwtSymbol( RiuPlotCurveSymbol::cycledSymbolStyle( ensembleIdx, addressIdx ), "" );
                     symbol->setSize( legendFontSize(), legendFontSize() );
                     symbol->setColor( colorTable.cycledQColor( caseIdx ) );
                     plotCurve->setSymbol( symbol );
+
                     QStringList curveName;
                     if ( showEnsembleName ) curveName += ensemble->name();
-                    curveName += summaryCase->displayCaseName().replace( commonCaseRoot, "" );
-                    if ( showAddressName ) curveName += QString::fromStdString( address.uiText() );
+                    curveName += summaryCase->displayCaseName();
 
                     plotCurve->setTitle( curveName.join( " - " ) );
 
@@ -318,6 +296,73 @@ void RimParameterResultCrossPlot::createPoints()
     }
 }
 
+namespace internal
+{
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+class CurveTracker : public QwtPlotPicker
+{
+public:
+    CurveTracker( QwtPlot* plot )
+        : QwtPlotPicker( plot->canvas() )
+    {
+        setStateMachine( new QwtPickerTrackerMachine() );
+        setRubberBand( QwtPicker::NoRubberBand );
+        setTrackerMode( QwtPicker::AlwaysOn );
+    }
+
+protected:
+    QwtText trackerText( const QPoint& pos ) const override
+    {
+        double  minDistance = std::numeric_limits<double>::max();
+        QString closestCurveLabel;
+
+        for ( QwtPlotItem* item : plot()->itemList() )
+        {
+            if ( item->rtti() == QwtPlotItem::Rtti_PlotCurve )
+            {
+                auto   curve    = static_cast<QwtPlotCurve*>( item );
+                double distance = std::numeric_limits<double>::max();
+                curve->closestPoint( pos, &distance );
+
+                if ( distance < minDistance )
+                {
+                    minDistance       = distance;
+                    closestCurveLabel = curve->title().text();
+                }
+            }
+        }
+
+        if ( minDistance < 20.0 )
+        {
+            QwtText text( closestCurveLabel );
+            text.setBackgroundBrush( QBrush( Qt::white ) );
+            text.setColor( Qt::black );
+            return text;
+        }
+
+        return QwtText();
+    }
+};
+} // namespace internal
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RiuPlotWidget* RimParameterResultCrossPlot::doCreatePlotViewWidget( QWidget* mainWindowParent /*= nullptr */ )
+{
+    RimAbstractCorrelationPlot::doCreatePlotViewWidget( mainWindowParent );
+
+    if ( m_plotWidget )
+    {
+        // Add a curve tracker to display the name of the realization when mouse is close to a sample in the cross plot
+        new internal::CurveTracker( m_plotWidget->qwtPlot() );
+    }
+
+    return m_plotWidget;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.h b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.h
index bcfacbf2dc..1d29ca57fa 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.h
@@ -34,20 +34,17 @@ public:
     void setEnsembleParameter( const QString& ensembleParameter );
 
 private:
-    // Overridden PDM methods
-
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
-
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
 
+    RiuPlotWidget* doCreatePlotViewWidget( QWidget* mainWindowParent = nullptr ) override;
+
     void    onLoadDataAndUpdate() override;
     void    updateAxes() override;
     QString asciiDataForPlotExport() const override;
-
-    // Private methods
-    void updatePlotTitle() override;
-    void createPoints();
+    void    updatePlotTitle() override;
+    void    createPoints();
 
 private:
     caf::PdmField<QString> m_ensembleParameter;
diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
index 56f0de8845..67c0171821 100644
--- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
@@ -24,6 +24,7 @@
 #include "RimWellRftEnsembleCurveSet.h"
 
 #include "RifDataSourceForRftPltQMetaType.h"
+
 #include "RiuPlotCurveSymbol.h"
 
 #include "cafPdmField.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.h b/ApplicationLibCode/ProjectDataModel/Rim3dView.h
index ea601cdc64..7632780388 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim3dView.h
+++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.h
@@ -34,6 +34,7 @@
 #include "cafPdmPtrField.h"
 #include "cafSignal.h"
 
+#include "cafFontTools.h"
 #include "cafPdmFieldCvfColor.h"
 #include "cafPdmFieldCvfMat4d.h"
 #include "cafPdmFieldCvfVec3d.h"
diff --git a/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp
index c4b5647235..e5caec0da3 100644
--- a/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimStatisticsPlot.cpp
@@ -436,7 +436,7 @@ void RimStatisticsPlot::updatePlots()
 
         // Set font of label equal axis value font
         QFont labelFont = QFont();
-        labelFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
+        labelFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
         labelSeries->setPointLabelsFont( labelFont );
 
         // Remove legend for dummy point
@@ -446,23 +446,23 @@ void RimStatisticsPlot::updatePlots()
 
     // Set axis value font
     QFont axisYValueFont = axisY->labelsFont();
-    axisYValueFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
+    axisYValueFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
     axisY->setLabelsFont( axisYValueFont );
     QFont axisXValueFont = axisX->labelsFont();
-    axisXValueFont.setPixelSize( fontScalingToMatchQwt * axisValueFontSize() );
+    axisXValueFont.setPointSize( fontScalingToMatchQwt * axisValueFontSize() );
     axisX->setLabelsFont( axisXValueFont );
 
     // Set axis title font
     QFont axisYTitleFont = axisY->titleFont();
-    axisYTitleFont.setPixelSize( fontScalingToMatchQwt * axisTitleFontSize() );
+    axisYTitleFont.setPointSize( fontScalingToMatchQwt * axisTitleFontSize() );
     axisY->setTitleFont( axisYTitleFont );
     QFont axisXTitleFont = axisX->titleFont();
-    axisXTitleFont.setPixelSize( fontScalingToMatchQwt * axisTitleFontSize() );
+    axisXTitleFont.setPointSize( fontScalingToMatchQwt * axisTitleFontSize() );
     axisX->setTitleFont( axisXTitleFont );
 
     // Set plot title font
     QFont titleFont = chart->titleFont();
-    titleFont.setPixelSize( fontScalingToMatchQwt * titleFontSize() );
+    titleFont.setPointSize( fontScalingToMatchQwt * titleFontSize() );
     chart->setTitleFont( titleFont );
 
     // Set legend font
@@ -470,7 +470,7 @@ void RimStatisticsPlot::updatePlots()
     if ( legend )
     {
         QFont legendFont = legend->font();
-        legendFont.setPixelSize( fontScalingToMatchQwt * legendFontSize() );
+        legendFont.setPointSize( fontScalingToMatchQwt * legendFontSize() );
         legend->setFont( legendFont );
         legend->setVisible( legendsVisible() );
     }
diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
index 4a2ac2032b..4787111a16 100644
--- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp
@@ -231,7 +231,7 @@ RimWellLogTrack::RimWellLogTrack()
 
     CAF_PDM_InitField( &m_showRegionLabels, "ShowFormationLabels", true, "Show Labels" );
 
-    caf::FontTools::RelativeSizeEnum regionLabelFontSizeDefault = caf::FontTools::RelativeSize::XSmall;
+    caf::FontTools::RelativeSizeEnum regionLabelFontSizeDefault = caf::FontTools::RelativeSize::Small;
     CAF_PDM_InitField( &m_regionLabelFontSize, "RegionLabelFontSize", regionLabelFontSizeDefault, "Font Size" );
 
     CAF_PDM_InitFieldNoDefault( &m_formationSource, "FormationSource", "Source" );
diff --git a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
index e52ce2746c..8778225ca8 100644
--- a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
+++ b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
@@ -169,7 +169,7 @@ public:
         QwtText text( string );
 
         QFont font = text.font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_labelFontPointSize + fontSizeChange ) );
+        font.setPointSize( m_labelFontPointSize + fontSizeChange );
         text.setFont( font );
 
         text.setPaintAttribute( QwtText::PaintUsingTextFont, true );
diff --git a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp
index 46fb7eff7c..eef813b43f 100644
--- a/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp
+++ b/ApplicationLibCode/UserInterface/RiuAbstractOverlayContentFrame.cpp
@@ -47,7 +47,7 @@ RiuAbstractOverlayContentFrame::~RiuAbstractOverlayContentFrame()
 void RiuAbstractOverlayContentFrame::updateFontSize()
 {
     QFont font = this->font();
-    font.setPixelSize( caf::FontTools::pointSizeToPixelSize( RiaPreferences::current()->defaultPlotFontSize() ) );
+    font.setPointSize( caf::FontTools::pointSizeFromEnum( RiaPreferences::current()->defaultPlotFontSize() ) );
     setFont( font );
 }
 
@@ -98,6 +98,6 @@ void RiuTextOverlayContentFrame::renderTo( QPainter* painter, const QRect& targe
 void RiuTextOverlayContentFrame::updateLabelFont()
 {
     QFont font = m_textLabel->font();
-    font.setPixelSize( caf::FontTools::pointSizeToPixelSize( RiaPreferences::current()->defaultPlotFontSize() ) );
+    font.setPointSize( caf::FontTools::pointSizeFromEnum( RiaPreferences::current()->defaultPlotFontSize() ) );
     m_textLabel->setFont( font );
 }
diff --git a/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp
index 05b98b3d0d..ff3cc6e724 100644
--- a/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp
+++ b/ApplicationLibCode/UserInterface/RiuDockedQwtPlot.cpp
@@ -50,7 +50,7 @@ void RiuDockedQwtPlot::applyFontSizes( bool replot /*= false*/ )
     QwtText titleText = title();
     QFont   font      = titleText.font();
 
-    font.setPixelSize( caf::FontTools::pointSizeToPixelSize( titleFontSize ) );
+    font.setPointSize( titleFontSize );
     titleText.setFont( font );
     setTitle( titleText );
 
@@ -58,19 +58,19 @@ void RiuDockedQwtPlot::applyFontSizes( bool replot /*= false*/ )
     {
         QwtText text          = axisTitle( axis );
         QFont   axisTitleFont = text.font();
-        axisTitleFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
+        axisTitleFont.setPointSize( axisFontSize );
         text.setFont( axisTitleFont );
         setAxisTitle( axis, text );
 
         QFont valuesFont = axisFont( axis );
-        valuesFont.setPixelSize( axisTitleFont.pixelSize() );
+        valuesFont.setPointSize( axisTitleFont.pointSize() );
         setAxisFont( axis, valuesFont );
     }
 
     if ( legend() )
     {
         auto font = legend()->font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( legendFontSize ) );
+        font.setPointSize( legendFontSize );
         legend()->setFont( font );
     }
 
diff --git a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp
index 79ca10b773..b97df2307b 100644
--- a/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp
+++ b/ApplicationLibCode/UserInterface/RiuGridCrossQwtPlot.cpp
@@ -154,7 +154,7 @@ void RiuGridCrossQwtPlot::setLegendFontSize( int fontSize )
     if ( qwtPlot()->legend() )
     {
         QFont font = qwtPlot()->legend()->font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
+        font.setPointSize( fontSize );
         qwtPlot()->legend()->setFont( font );
         // Set font size for all existing labels
         QList<QwtLegendLabel*> labels = qwtPlot()->legend()->findChildren<QwtLegendLabel*>();
diff --git a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
index f8b7aa49f9..d52787db20 100644
--- a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
@@ -431,7 +431,7 @@ void RiuMatrixPlotWidget::createMatrixCells()
                 cvf::Color3f contrastColor = RiaColorTools::contrastColor( cvf::Color3f( color ) );
                 textLabel.setColor( RiaColorTools::toQColor( contrastColor ) );
                 QFont font = textLabel.font();
-                font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_valueFontSize ) );
+                font.setPointSize( m_valueFontSize );
                 textLabel.setFont( font );
                 QwtPlotMarker* marker = new QwtPlotMarker();
                 marker->setLabel( textLabel );
diff --git a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h
index be1fa5a553..5ce978beb7 100644
--- a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h
+++ b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h
@@ -22,7 +22,6 @@
 #include "RiuPlotItem.h"
 #include "RiuQwtPlotWidget.h"
 
-#include "cafFontTools.h"
 #include "cafPdmPointer.h"
 #include "cafSignal.h"
 
diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
index 9bbf0269a7..3ed6c3c39e 100644
--- a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
+++ b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
@@ -80,9 +80,9 @@ RiuMultiPlotPage::RiuMultiPlotPage( RimPlotWindow* plotDefinition, QWidget* pare
     , m_previewMode( false )
     , m_showSubTitles( false )
     , m_autoAlignAxes( true )
-    , m_titleFontPixelSize( 12 )
-    , m_subTitleFontPixelSize( 11 )
-    , m_legendFontPixelSize( 8 )
+    , m_titleFontSize( 12 )
+    , m_subTitleFontSize( 11 )
+    , m_legendFontSize( 8 )
     , m_axisTitleFontSize( 8 )
     , m_axisValueFontSize( 8 )
 
@@ -290,8 +290,8 @@ void RiuMultiPlotPage::setTitleVisible( bool visible )
 //--------------------------------------------------------------------------------------------------
 void RiuMultiPlotPage::setTitleFontSizes( int titleFontSize, int subTitleFontSize )
 {
-    m_titleFontPixelSize    = caf::FontTools::pointSizeToPixelSize( titleFontSize );
-    m_subTitleFontPixelSize = caf::FontTools::pointSizeToPixelSize( subTitleFontSize );
+    m_titleFontSize    = titleFontSize;
+    m_subTitleFontSize = subTitleFontSize;
 
     scheduleUpdate();
 }
@@ -301,7 +301,7 @@ void RiuMultiPlotPage::setTitleFontSizes( int titleFontSize, int subTitleFontSiz
 //--------------------------------------------------------------------------------------------------
 void RiuMultiPlotPage::setLegendFontSize( int legendFontSize )
 {
-    m_legendFontPixelSize = caf::FontTools::pointSizeToPixelSize( legendFontSize );
+    m_legendFontSize = legendFontSize;
 
     scheduleUpdate();
 }
@@ -779,7 +779,7 @@ void RiuMultiPlotPage::updateSubTitleVisibility( QLabel* subTitle )
     bool isSubTitleVisible = m_showSubTitles && !subTitle->text().isEmpty();
     subTitle->setVisible( isSubTitleVisible );
     QFont subTitleFont = subTitle->font();
-    subTitleFont.setPixelSize( m_subTitleFontPixelSize );
+    subTitleFont.setPointSize( m_subTitleFontSize );
     subTitle->setFont( subTitleFont );
 }
 
@@ -836,7 +836,7 @@ void RiuMultiPlotPage::setRowAndColumnStretches( int row, int column, int rowSpa
 void RiuMultiPlotPage::updateLegendFont( RiuQwtPlotLegend* legend )
 {
     QFont legendFont = legend->font();
-    legendFont.setPixelSize( m_legendFontPixelSize );
+    legendFont.setPointSize( m_legendFontSize );
 
     // Set font size for all existing labels
     QList<QwtLegendLabel*> labels = legend->findChildren<QwtLegendLabel*>();
@@ -1104,7 +1104,7 @@ void RiuMultiPlotPage::applyLook()
 void RiuMultiPlotPage::updateTitleFont()
 {
     auto titleFont = m_plotTitle->font();
-    titleFont.setPixelSize( m_titleFontPixelSize );
+    titleFont.setPointSize( m_titleFontSize );
     m_plotTitle->setFont( titleFont );
 }
 
diff --git a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
index 3b2a1053d4..37763d1ee3 100644
--- a/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
+++ b/ApplicationLibCode/UserInterface/RiuMultiPlotPage.h
@@ -172,9 +172,9 @@ protected:
     std::map<int, std::pair<int, int>>        m_visibleIndexToPositionMapping;
     caf::PdmPointer<RimPlotWindow>            m_plotDefinition;
 
-    int m_titleFontPixelSize;
-    int m_subTitleFontPixelSize;
-    int m_legendFontPixelSize;
+    int m_titleFontSize;
+    int m_subTitleFontSize;
+    int m_legendFontSize;
     int m_axisTitleFontSize;
     int m_axisValueFontSize;
 
diff --git a/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.cpp b/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.cpp
index 7f04aff931..63a4b5c0cb 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.cpp
+++ b/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.cpp
@@ -28,11 +28,11 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RiuPlotCurveSymbol::RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
+RiuPlotCurveSymbol::RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
     : m_style( riuStyle )
     , m_globalLabel( label )
     , m_labelPosition( labelPosition )
-    , m_labelFontSizePx( caf::FontTools::pointSizeToPixelSize( labelFontSizePt ) )
+    , m_labelFontSize( labelFontSize )
 {
 }
 
@@ -63,9 +63,9 @@ void RiuPlotCurveSymbol::setLabelPosition( LabelPosition labelPosition )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RiuPlotCurveSymbol::setLabelFontSize( int labelFontSizePt )
+void RiuPlotCurveSymbol::setLabelFontSize( int labelFontSize )
 {
-    m_labelFontSizePx = caf::FontTools::pointSizeToPixelSize( labelFontSizePt );
+    m_labelFontSize = labelFontSize;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.h b/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.h
index 50aba10c75..228ae402f6 100644
--- a/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.h
+++ b/ApplicationLibCode/UserInterface/RiuPlotCurveSymbol.h
@@ -64,7 +64,7 @@ public:
         SYMBOL_DOWN_ALIGNED_TRIANGLE
     };
 
-    RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition = LabelAboveSymbol, int labelFontSizePt = 8 );
+    RiuPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition = LabelAboveSymbol, int labelFontSize = 8 );
 
     QString globalLabel() const;
 
@@ -72,7 +72,7 @@ public:
 
     void setLabelPosition( LabelPosition labelPosition );
 
-    void setLabelFontSize( int labelFontSizePt );
+    void setLabelFontSize( int labelFontSize );
 
     virtual void setPixmap( const QPixmap& pixmap ) = 0;
 
@@ -94,6 +94,6 @@ public:
 protected:
     PointSymbolEnum m_style;
     QString         m_globalLabel;
-    int             m_labelFontSizePx;
+    int             m_labelFontSize;
     LabelPosition   m_labelPosition;
 };
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.cpp
index 1cac5db574..d3e6b4617a 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.cpp
@@ -37,8 +37,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RiuQtChartsPlotCurveSymbol::RiuQtChartsPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
-    : RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSizePt )
+RiuQtChartsPlotCurveSymbol::RiuQtChartsPlotCurveSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
+    : RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSize )
 {
 }
 
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.h b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.h
index 77e519cc24..23b9956867 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.h
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurveSymbol.h
@@ -38,9 +38,9 @@ class RiuQtChartsPlotCurveSymbol : public RiuPlotCurveSymbol
 {
 public:
     RiuQtChartsPlotCurveSymbol( RiuPlotCurveSymbol::PointSymbolEnum riuStyle,
-                                const QString&                      label           = QString(),
-                                LabelPosition                       labelPosition   = RiuPlotCurveSymbol::LabelAboveSymbol,
-                                int                                 labelFontSizePt = 8 );
+                                const QString&                      label         = QString(),
+                                LabelPosition                       labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
+                                int                                 labelFontSize = 8 );
 
     void renderSymbolLabel( QPainter* painter, const QPointF& position, const QString& label ) const;
 
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
index ff98639628..a12c3cd89b 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
@@ -160,18 +160,15 @@ int RiuQtChartsPlotWidget::axisValueFontSize( RiuPlotAxis axis ) const
 //--------------------------------------------------------------------------------------------------
 void RiuQtChartsPlotWidget::setAxisFontsAndAlignment( RiuPlotAxis axis, int titleFontSize, int valueFontSize, bool titleBold, int alignment )
 {
-    int titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
-    int valueFontPixelSize = caf::FontTools::pointSizeToPixelSize( valueFontSize );
-
     // Axis number font
     QFont axisFont = plotAxis( axis )->labelsFont();
-    axisFont.setPixelSize( valueFontPixelSize );
+    axisFont.setPointSize( valueFontSize );
     axisFont.setBold( false );
     plotAxis( axis )->setLabelsFont( axisFont );
 
     // Axis title font
     QFont axisTitleFont = plotAxis( axis )->labelsFont();
-    axisTitleFont.setPixelSize( titleFontPixelSize );
+    axisTitleFont.setPointSize( titleFontSize );
     axisTitleFont.setBold( titleBold );
     plotAxis( axis )->setTitleFont( axisTitleFont );
 
@@ -268,7 +265,7 @@ bool RiuQtChartsPlotWidget::plotTitleEnabled() const
 void RiuQtChartsPlotWidget::setPlotTitleFontSize( int titleFontSize )
 {
     QFont font = qtChart()->titleFont();
-    font.setPixelSize( caf::FontTools::pointSizeToPixelSize( titleFontSize ) );
+    font.setPointSize( titleFontSize );
     qtChart()->setTitleFont( font );
 }
 
@@ -280,7 +277,7 @@ void RiuQtChartsPlotWidget::setLegendFontSize( int fontSize )
     if ( qtChart()->legend() )
     {
         QFont font = qtChart()->legend()->font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
+        font.setPointSize( fontSize );
         qtChart()->legend()->setFont( font );
     }
 }
diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
index bbda2104b7..546d3a32c2 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
@@ -71,7 +71,7 @@ void RiuQwtPlotTools::setCommonPlotBehaviour( QwtPlot* plot )
     int axisFontSize =
         caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultPlotFontSize(), caf::FontTools::RelativeSize::Medium );
     QFont axisFont = plot->axisFont( QwtAxis::XBottom );
-    axisFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
+    axisFont.setPointSize( axisFontSize );
 
     plot->setAxisFont( QwtAxis::XBottom, axisFont );
     plot->setAxisFont( QwtAxis::XTop, axisFont );
@@ -85,7 +85,7 @@ void RiuQwtPlotTools::setCommonPlotBehaviour( QwtPlot* plot )
     {
         QwtText axisTitle     = plot->axisTitle( axis );
         QFont   axisTitleFont = axisTitle.font();
-        axisTitleFont.setPixelSize( caf::FontTools::pointSizeToPixelSize( axisFontSize ) );
+        axisTitleFont.setPointSize( axisFontSize );
         axisTitleFont.setBold( false );
         axisTitle.setFont( axisTitleFont );
         axisTitle.setRenderFlags( Qt::AlignRight );
diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
index c9b4f0b23e..4b84f5a11b 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
@@ -156,21 +156,17 @@ int RiuQwtPlotWidget::axisValueFontSize( RiuPlotAxis axis ) const
 //--------------------------------------------------------------------------------------------------
 void RiuQwtPlotWidget::setAxisFontsAndAlignment( RiuPlotAxis axis, int titleFontSize, int valueFontSize, bool titleBold, int alignment )
 {
-    int titleFontPixelSize = caf::FontTools::pointSizeToPixelSize( titleFontSize );
-    int valueFontPixelSize = caf::FontTools::pointSizeToPixelSize( valueFontSize );
-
     // Axis number font
-
     auto  qwtAxis  = toQwtPlotAxis( axis );
     QFont axisFont = m_plot->axisFont( qwtAxis );
-    axisFont.setPixelSize( valueFontPixelSize );
+    axisFont.setPointSize( valueFontSize );
     axisFont.setBold( false );
     m_plot->setAxisFont( qwtAxis, axisFont );
 
     // Axis title font
     QwtText axisTitle     = m_plot->axisTitle( qwtAxis );
     QFont   axisTitleFont = axisTitle.font();
-    axisTitleFont.setPixelSize( titleFontPixelSize );
+    axisTitleFont.setPointSize( titleFontSize );
     axisTitleFont.setBold( titleBold );
     axisTitle.setFont( axisTitleFont );
     axisTitle.setRenderFlags( alignment | Qt::TextWordWrap );
@@ -260,7 +256,7 @@ void RiuQwtPlotWidget::setLegendFontSize( int fontSize )
     if ( m_plot->legend() )
     {
         QFont font = m_plot->legend()->font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( fontSize ) );
+        font.setPointSize( fontSize );
         m_plot->legend()->setFont( font );
         // Set font size for all existing labels
         QList<QwtLegendLabel*> labels = m_plot->legend()->findChildren<QwtLegendLabel*>();
@@ -689,7 +685,7 @@ void RiuQwtPlotWidget::applyPlotTitleToQwt()
     if ( m_titleFontSize > 0 )
     {
         QFont font = qwtText.font();
-        font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_titleFontSize ) );
+        font.setPointSize( m_titleFontSize );
         qwtText.setFont( font );
     }
     qwtText.setText( plotTitleToApply );
diff --git a/ApplicationLibCode/UserInterface/RiuQwtSymbol.cpp b/ApplicationLibCode/UserInterface/RiuQwtSymbol.cpp
index c4ecb95160..bff3934c8d 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtSymbol.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtSymbol.cpp
@@ -32,8 +32,8 @@
 //--------------------------------------------------------------------------------------------------
 /// Internal class to support labels on symbols
 //--------------------------------------------------------------------------------------------------
-RiuQwtSymbol::RiuQwtSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSizePt )
-    : RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSizePt )
+RiuQwtSymbol::RiuQwtSymbol( PointSymbolEnum riuStyle, const QString& label, LabelPosition labelPosition, int labelFontSize )
+    : RiuPlotCurveSymbol( riuStyle, label, labelPosition, labelFontSize )
     , QwtSymbol( QwtSymbol::NoSymbol )
 {
     QwtSymbol::Style style = QwtSymbol::NoSymbol;
@@ -192,7 +192,7 @@ void RiuQwtSymbol::renderSymbolLabel( QPainter* painter, const QPointF& position
 {
     painter->save();
     QFont font = painter->font();
-    font.setPixelSize( m_labelFontSizePx );
+    font.setPointSize( m_labelFontSize );
     painter->setFont( font );
     painter->setPen( RiaColorTools::textColor() );
 
diff --git a/ApplicationLibCode/UserInterface/RiuQwtSymbol.h b/ApplicationLibCode/UserInterface/RiuQwtSymbol.h
index 343a50ec7f..57774a10da 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtSymbol.h
+++ b/ApplicationLibCode/UserInterface/RiuQwtSymbol.h
@@ -38,9 +38,9 @@ class RiuQwtSymbol : public RiuPlotCurveSymbol, public QwtSymbol
 {
 public:
     RiuQwtSymbol( RiuPlotCurveSymbol::PointSymbolEnum riuStyle,
-                  const QString&                      label           = QString(),
-                  LabelPosition                       labelPosition   = RiuPlotCurveSymbol::LabelAboveSymbol,
-                  int                                 labelFontSizePt = 8 );
+                  const QString&                      label         = QString(),
+                  LabelPosition                       labelPosition = RiuPlotCurveSymbol::LabelAboveSymbol,
+                  int                                 labelFontSize = 8 );
     void renderSymbols( QPainter* painter, const QPointF* points, int numPoints ) const override;
     void renderSymbolLabel( QPainter* painter, const QPointF& position, const QString& label ) const;
 
diff --git a/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp b/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp
index e8b1642b44..84ed8ab746 100644
--- a/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp
+++ b/ApplicationLibCode/UserInterface/RiuTextContentFrame.cpp
@@ -38,7 +38,7 @@ RiuTextContentFrame::RiuTextContentFrame( QWidget* parent, const QString& title,
     : RiuAbstractOverlayContentFrame( parent )
     , m_title( title )
     , m_text( text )
-    , m_fontPixelSize( fontPixelSize )
+    , m_fontSize( fontPixelSize )
 {
     setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
 
@@ -170,10 +170,10 @@ void RiuTextContentFrame::layoutInfo( LayoutInfo* layout ) const
 //--------------------------------------------------------------------------------------------------
 void RiuTextContentFrame::updateFontSize()
 {
-    if ( m_fontPixelSize != -1 )
+    if ( m_fontSize != -1 )
     {
         QFont font = this->font();
-        font.setPixelSize( m_fontPixelSize );
+        font.setPointSize( m_fontSize );
         setFont( font );
     }
     else
diff --git a/ApplicationLibCode/UserInterface/RiuTextContentFrame.h b/ApplicationLibCode/UserInterface/RiuTextContentFrame.h
index df3f078280..8a06aaf3bc 100644
--- a/ApplicationLibCode/UserInterface/RiuTextContentFrame.h
+++ b/ApplicationLibCode/UserInterface/RiuTextContentFrame.h
@@ -65,5 +65,5 @@ private:
 private:
     QString m_title;
     QString m_text;
-    int     m_fontPixelSize;
+    int     m_fontSize;
 };
diff --git a/ApplicationLibCode/UserInterface/RiuViewer.cpp b/ApplicationLibCode/UserInterface/RiuViewer.cpp
index d9b8733ae4..da8db94390 100644
--- a/ApplicationLibCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationLibCode/UserInterface/RiuViewer.cpp
@@ -174,7 +174,7 @@ RiuViewer::RiuViewer( QWidget* parent )
     if ( RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
     {
         QFont regTestFont = m_infoLabel->font();
-        regTestFont.setPixelSize( 11 );
+        regTestFont.setPointSize( 11 );
 
         m_infoLabel->setFont( regTestFont );
         m_shortInfoLabel->setFont( regTestFont );
@@ -211,7 +211,7 @@ RiuViewer::RiuViewer( QWidget* parent )
     m_comparisonWindowMover = new RiuComparisonViewMover( this );
     setComparisonViewToFollowAnimation( false );
 
-    m_fontPointSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() );
+    m_fontSize = caf::FontTools::absolutePointSize( RiaPreferences::current()->defaultSceneFontSize() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -744,7 +744,7 @@ void RiuViewer::addColorLegendToBottomLeftCorner( caf::TitledOverlayFrame* added
     addedLegend->enableBackground( RiaPreferences::current()->showLegendBackground() );
     addedLegend->setBackgroundColor( backgroundColor );
     addedLegend->setBackgroundFrameColor( frameColor );
-    addedLegend->setFont( app->sceneFont( m_fontPointSize ) );
+    addedLegend->setFont( app->sceneFont( m_fontSize ) );
 
     overlayRendering->addOverlayItem( addedLegend );
 
@@ -1336,16 +1336,16 @@ void RiuViewer::clearHoverCursor()
 //--------------------------------------------------------------------------------------------------
 void RiuViewer::updateFonts( int fontPointSize )
 {
-    m_fontPointSize = fontPointSize;
+    m_fontSize = fontPointSize;
 
     auto       defaultFontSize = RiaApplication::instance()->preferences()->defaultSceneFontSize();
     cvf::Font* axisFont        = RiaGuiApplication::instance()->defaultSceneFont();
     QFont      font            = QApplication::font();
-    font.setPixelSize( caf::FontTools::pointSizeToPixelSize( m_fontPointSize ) );
+    font.setPointSize( m_fontSize );
 
-    if ( caf::FontTools::absolutePointSize( defaultFontSize ) != m_fontPointSize )
+    if ( caf::FontTools::absolutePointSize( defaultFontSize ) != m_fontSize )
     {
-        axisFont = RiaFontCache::getFont( m_fontPointSize ).p();
+        axisFont = RiaFontCache::getFont( m_fontSize ).p();
     }
 
     overlayItemsRendering()->removeOverlayItem( m_axisCross.p() );
@@ -1364,7 +1364,7 @@ void RiuViewer::updateFonts( int fontPointSize )
     m_animationProgressCompView->setFont( font );
     m_versionInfoLabel->setFont( font );
 
-    m_gridBoxGenerator->setGridLabelFontSize( m_fontPointSize );
+    m_gridBoxGenerator->setGridLabelFontSize( m_fontSize );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuViewer.h b/ApplicationLibCode/UserInterface/RiuViewer.h
index a7bac0c1dd..3989bd9ebf 100644
--- a/ApplicationLibCode/UserInterface/RiuViewer.h
+++ b/ApplicationLibCode/UserInterface/RiuViewer.h
@@ -177,7 +177,7 @@ private:
     bool    m_showZScaleLabel;
     bool    m_hideZScaleCheckbox;
     double  m_zScale;
-    int     m_fontPointSize;
+    int     m_fontSize;
 
     caf::QStyledProgressBar*  m_animationProgress;
     caf::QStyledProgressBar*  m_animationProgressCompView;
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
index 93d935f62a..1482504332 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.cpp
@@ -89,25 +89,9 @@ int FontTools::absolutePointSize( FontSize normalPointSize, RelativeSize relativ
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-int FontTools::pointSizeToPixelSize( int pointSize )
+int FontTools::pointSizeFromEnum( FontSize pointSize )
 {
-    return pointSize;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-int FontTools::pointSizeToPixelSize( FontSize pointSize )
-{
-    return pointSizeToPixelSize( (int)pointSize );
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-int FontTools::pixelSizeToPointSize( int pixelSize )
-{
-    return pixelSize;
+    return (int)pointSize;
 }
 
 QList<PdmOptionItemInfo> FontTools::relativeSizeValueOptions( FontSize normalPointSize )
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h
index 51ff53ac86..eaee2c4b43 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafFontTools.h
@@ -83,9 +83,7 @@ public:
     typedef caf::AppEnum<RelativeSize> RelativeSizeEnum;
 
     static int absolutePointSize( FontSize normalPointSize, RelativeSize relativeSize = RelativeSize::Medium );
-    static int pointSizeToPixelSize( FontSize pointSize );
-    static int pointSizeToPixelSize( int pointSize );
-    static int pixelSizeToPointSize( int pixelSize );
+    static int pointSizeFromEnum( FontSize pointSize );
 
     static QList<caf::PdmOptionItemInfo> relativeSizeValueOptions( FontSize normalPointSize );
 };
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
index 0f093e01ae..bb51f4d088 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
@@ -163,14 +163,7 @@ void PdmUiTreeViewItemDelegate::paint( QPainter* painter, const QStyleOptionView
             const int outsideLeftRightMargins = 4;
 
             QFont font = QApplication::font();
-            if ( font.pixelSize() > 0 )
-            {
-                font.setPixelSize( std::max( 1, font.pixelSize() - 1 ) );
-            }
-            else
-            {
-                font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
-            }
+            font.setPointSize( std::max( 1, font.pointSize() - 1 ) );
             painter->setFont( font );
 
             QString text    = tag->text;
diff --git a/ThirdParty/nightcharts/nightcharts.cpp b/ThirdParty/nightcharts/nightcharts.cpp
index 207489719e..f30391a253 100644
--- a/ThirdParty/nightcharts/nightcharts.cpp
+++ b/ThirdParty/nightcharts/nightcharts.cpp
@@ -28,7 +28,7 @@ Nightcharts::Nightcharts()//QPainter *painter)
 
 {
     font.setFamily("verdana");
-    font.setPixelSize(15);
+    font.setPointSize(15);
     //painter = painter;
     //painter->setFont(font);
     ctype = Nightcharts::Dpie;