diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 477bf5d86932e3db460d1f96d372867b37656d95..ce465aff76a8a57b3b4e7d26f513756e8e83cadc 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -150,25 +150,6 @@ LLStatusBar::~LLStatusBar()
 // Overrides
 //-----------------------------------------------------------------------
 
-static int32_t fastFloor(const float* in, const ptrdiff_t length = 1)
-{
-  int32_t* out;
-  #define ALIGNMENT alignof(max_align_t)
-  static_assert(sizeof(float) == sizeof(int32_t), "");
-  assert((uintptr_t)(void*)in % ALIGNMENT == 0);
-  assert((uintptr_t)(void*)out % ALIGNMENT == 0);
-  assert((size_t)length % (ALIGNMENT/sizeof(int32_t)) == 0);
-
-  alignas(ALIGNMENT) const float* const input = in;
-  alignas(ALIGNMENT) int32_t* const output = out;
-
-  // Do the conversion
-  for (int i = 0; i < length; ++i) {
-    output[i] = static_cast<int32_t>(std::floor(input[i]));
-  }
-  return *out;
-}
-
 // virtual
 void LLStatusBar::draw()
 {
@@ -393,8 +374,8 @@ void LLStatusBar::refresh()
 	if (show_fps && mFPSUpdateTimer->getElapsedTimeF32() > 0.125f)
 	{
 		mFPSUpdateTimer->reset();
-		auto fps = (float)LLTrace::get_frame_recording().getPeriodMean(LLStatViewer::FPS);
-		mTextFPS->setText(fmt::format(FMT_STRING("{:d}"), fastFloor(&fps)));
+		F32 fps = (F32)LLTrace::get_frame_recording().getLastRecording().getMean(LLStatViewer::FPS_SAMPLE);
+		mTextFPS->setText(fmt::format(FMT_STRING("{:d}"), llfloor(fps)));
 	}
 }
 
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index fc93f260246e4401fa4fc2923fe3869920aa370a..e58efde8ccb61e7d5ec6d1cad9318841a81eb5e5 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1000,4 +1000,7 @@
   <color
     name="AddPaymentPanel"
     value="0.27 0.27 0.27 1" />
+  <color
+   name="FPSTextColor"
+   reference="EmphasisColor" />
 </colors>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 590045391716121ec025aec9891496428802e13c..25f1bc24ae262c958b7a018c015b72216904f863 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -220,10 +220,13 @@
     name="fps_bg">
      <text
       type="string"
+      font="SansSerifLarge"
+      text_color="FPSTextColor"
       follows="right|top"
       halign="center"
       height="16"
-      top="3"
+      top="1"
+      v_pad="-1"
       left="0"
       name="FPSText"
       tool_tip="Current FPS"