diff --git a/.vscode/settings.json b/.vscode/settings.json
index 87c2e203..46747f31 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -531,7 +531,8 @@
     "SecureButton_GetUnit",
     "SecureButton_GetModifiedUnit",
     "SecureHandlerSetFrameRef",
-    "IsLoggedIn"
+    "IsLoggedIn",
+    "FramerateFrame"
   ],
   "Lua.workspace.ignoreDir": [".vscode", "libs/*"],
   "Lua.diagnostics.enable": true,
diff --git a/Core/Framework.lua b/Core/Framework.lua
index 80e9ef26..1fa48394 100644
--- a/Core/Framework.lua
+++ b/Core/Framework.lua
@@ -200,6 +200,7 @@ local DBdefault = {
 				['BossButton'] = 'BOTTOM,SpartanUI,BOTTOM,0,210',
 				['AlertFrame'] = 'BOTTOM,SpartanUI,BOTTOM,0,215',
 				['VehicleLeaveButton'] = 'BOTTOM,SpartanUI,BOTTOM,0,180',
+				['FramerateFrame'] = 'BOTTOM,SpartanUI,BOTTOM,0,210',
 			},
 			Color = {
 				Art = false,
diff --git a/Modules/Artwork/BlizzMovers.lua b/Modules/Artwork/BlizzMovers.lua
index e131712d..65d0131c 100644
--- a/Modules/Artwork/BlizzMovers.lua
+++ b/Modules/Artwork/BlizzMovers.lua
@@ -130,6 +130,13 @@ local function AbilityBars()
 	MoveIt:CreateMover(BossButtonHolder, 'BossButton', 'Extra action button', nil, 'Blizzard UI')
 end
 
+local function FramerateFrame()
+	local holder = GenerateHolder('FramerateFrame')
+	holder:SetSize(64, 20)
+	AttachToHolder(_G['FramerateFrame'], holder)
+	MoveIt:CreateMover(holder, 'FramerateFrame', 'Framerate frame', nil, 'Blizzard UI')
+end
+
 local function AlertFrame()
 	local holder = GenerateHolder('AlertFrame')
 
@@ -217,6 +224,7 @@ end
 
 -- This is the main inpoint
 function module.BlizzMovers()
+	FramerateFrame()
 	AbilityBars()
 	AlertFrame()
 	DurabilityFrame()
diff --git a/Themes/Arcane/Style.lua b/Themes/Arcane/Style.lua
index 1b296c49..d20f6fbb 100644
--- a/Themes/Arcane/Style.lua
+++ b/Themes/Arcane/Style.lua
@@ -207,9 +207,6 @@ function module:CreateArtwork()
 	plate.BG3:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 70)
 	plate.BG4:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 25)
 
-	FramerateText:ClearAllPoints()
-	FramerateText:SetPoint('TOPLEFT', SpartanUI, 'TOPLEFT', 10, -10)
-
 	--Setup the Bottom Artwork
 	artFrame:SetFrameStrata('BACKGROUND')
 	artFrame:SetFrameLevel(1)
diff --git a/Themes/Digital/Style.lua b/Themes/Digital/Style.lua
index 93959e49..1f837a80 100644
--- a/Themes/Digital/Style.lua
+++ b/Themes/Digital/Style.lua
@@ -93,9 +93,6 @@ function module:CreateArtwork()
 	artFrame.Right:SetPoint('BOTTOMLEFT', artFrame, 'BOTTOM')
 	artFrame.Right:SetTexture('Interface\\AddOns\\SpartanUI\\Themes\\Digital\\Images\\Base_Bar_Right')
 	-- artFrame.Right:SetScale(.75)
-
-	FramerateText:ClearAllPoints()
-	FramerateText:SetPoint('TOPLEFT', SpartanUI, 'TOPLEFT', 10, -10)
 end
 
 function module:EnableArtwork()
diff --git a/Themes/Fel/Style.lua b/Themes/Fel/Style.lua
index 9997c0b0..5e096968 100644
--- a/Themes/Fel/Style.lua
+++ b/Themes/Fel/Style.lua
@@ -142,9 +142,6 @@ function module:CreateArtwork()
 	artFrame.Right = artFrame:CreateTexture('SUI_Art_Fel_Right', 'BORDER')
 	artFrame.Right:SetPoint('BOTTOMLEFT', artFrame, 'BOTTOM')
 	artFrame.Right:SetTexture('Interface\\AddOns\\SpartanUI\\Themes\\Fel\\Images\\Base_Bar_Right')
-
-	FramerateText:ClearAllPoints()
-	FramerateText:SetPoint('TOPLEFT', SpartanUI, 'TOPLEFT', 10, -10)
 end
 
 function module:EnableArtwork()
diff --git a/Themes/Tribal/Style.lua b/Themes/Tribal/Style.lua
index 3f908e91..7d6dba7c 100644
--- a/Themes/Tribal/Style.lua
+++ b/Themes/Tribal/Style.lua
@@ -138,9 +138,6 @@ function module:CreateArtwork()
 	plate.BG3:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 70)
 	plate.BG4:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 25)
 
-	FramerateText:ClearAllPoints()
-	FramerateText:SetPoint('TOPLEFT', SpartanUI, 'TOPLEFT', 10, -10)
-
 	--Setup the Bottom Artwork
 	artFrame:SetFrameStrata('BACKGROUND')
 	artFrame:SetFrameLevel(1)
diff --git a/Themes/War/Style.lua b/Themes/War/Style.lua
index 781da3ca..9ab93b2b 100644
--- a/Themes/War/Style.lua
+++ b/Themes/War/Style.lua
@@ -193,9 +193,6 @@ function module:CreateArtwork()
 	plate.BG3:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 70)
 	plate.BG4:SetPoint('BOTTOMLEFT', plate, 'BOTTOM', 110, 25)
 
-	FramerateText:ClearAllPoints()
-	FramerateText:SetPoint('TOPLEFT', SpartanUI, 'TOPLEFT', 10, -10)
-
 	--Setup the Bottom Artwork
 	artFrame:SetFrameStrata('BACKGROUND')
 	artFrame:SetFrameLevel(1)
diff --git a/images/UI-Button.tga b/images/UI-Button.tga
new file mode 100644
index 00000000..bcd0ef06
Binary files /dev/null and b/images/UI-Button.tga differ