diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e71bf89589..e416f671ed 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18638,6 +18638,32 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <string />
     </map>
+    <key>FSSkinCurrentReadableName</key>
+    <map>
+      <key>Comment</key>
+      <string>The readable name of the currently selected skin.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Firestorm</string>
+    </map>
+  <key>FSSkinCurrentThemeReadableName</key>
+    <map>
+      <key>Comment</key>
+      <string>The readable name of the selected theme for the current skin.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Grey</string>
+    </map>
   <key>FSMaxMeshRequestsPerSecond</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_firestorm.xml b/indra/newview/app_settings/settings_firestorm.xml
index b63f78d3dd..0bf31c72e5 100644
--- a/indra/newview/app_settings/settings_firestorm.xml
+++ b/indra/newview/app_settings/settings_firestorm.xml
@@ -95,6 +95,34 @@
     <string>grey</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Firestorm</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Grey</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_hybrid.xml b/indra/newview/app_settings/settings_hybrid.xml
index e3d9a0cc5c..7139105c05 100644
--- a/indra/newview/app_settings/settings_hybrid.xml
+++ b/indra/newview/app_settings/settings_hybrid.xml
@@ -83,6 +83,34 @@
     <string>cool_ocean</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Metaharper Modern</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>CoolOcean</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index 959d48d09f..380eb34dfe 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -83,6 +83,34 @@
     <string>classic</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Vintage</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Classic</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_v3.xml b/indra/newview/app_settings/settings_v3.xml
index cc006b18e5..9983970448 100644
--- a/indra/newview/app_settings/settings_v3.xml
+++ b/indra/newview/app_settings/settings_v3.xml
@@ -95,6 +95,34 @@
     <string>original_orange</string>
   </map>
 
+  <key>FSSkinCurrentReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the currently selected skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Starlight</string>
+  </map>
+
+  <key>FSSkinCurrentThemeReadableName</key>
+  <map>
+    <key>Comment</key>
+    <string>The readable name of the selected theme for the current skin.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>HideFromEditor</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>Original Orange</string>
+  </map>
+
   <key>LetterKeysFocusChatBar</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 4c4acbf959..e70033b3b9 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2828,6 +2828,8 @@ LLPanelPreferenceSkins::LLPanelPreferenceSkins()
 {
 	m_Skin = gSavedSettings.getString("SkinCurrent");
 	m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme");
+	m_SkinName = gSavedSettings.getString("FSSkinCurrentReadableName");
+	m_SkinThemeName = gSavedSettings.getString("FSSkinCurrentThemeReadableName");
 
 	const std::string strSkinsPath = gDirUtilp->getSkinBaseDir() + gDirUtilp->getDirDelimiter() + "skins.xml";
 	llifstream fileSkins(strSkinsPath, std::ios::binary);
@@ -2859,6 +2861,9 @@ void LLPanelPreferenceSkins::apply()
 		gSavedSettings.setString("SkinCurrent", m_Skin);
 		gSavedSettings.setString("SkinCurrentTheme", m_SkinTheme);
 
+		gSavedSettings.setString("FSSkinCurrentReadableName", m_SkinName);
+		gSavedSettings.setString("FSSkinCurrentThemeReadableName", m_SkinThemeName);
+
 		LLNotificationsUtil::add("ChangeSkin");
 	}
 }
@@ -2867,6 +2872,8 @@ void LLPanelPreferenceSkins::cancel()
 {
 	m_Skin = gSavedSettings.getString("SkinCurrent");
 	m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme");
+	m_SkinName = gSavedSettings.getString("FSSkinCurrentReadableName");
+	m_SkinThemeName = gSavedSettings.getString("FSSkinCurrentThemeReadableName");
 	refreshSkinList();
 }
 
@@ -2876,6 +2883,9 @@ void LLPanelPreferenceSkins::onSkinChanged()
 	refreshSkinThemeList();
 	m_SkinTheme = (m_pSkinThemeCombo) ? m_pSkinThemeCombo->getSelectedValue().asString() : "";
 
+	m_SkinName = m_pSkinCombo->getSelectedItemLabel();
+	m_SkinThemeName = m_pSkinThemeCombo->getSelectedItemLabel();
+
     // <FS:AO> Some crude hardcoded preferences per skin. Without this, some defaults from the
     // current skin would be carried over, leading to confusion and a first experience with
     // the skin that the designer didn't intend.
@@ -2901,6 +2911,7 @@ void LLPanelPreferenceSkins::onSkinChanged()
 void LLPanelPreferenceSkins::onSkinThemeChanged()
 {
 	m_SkinTheme = (m_pSkinThemeCombo) ? m_pSkinThemeCombo->getSelectedValue().asString() : "";
+	m_SkinThemeName = m_pSkinThemeCombo->getSelectedItemLabel();
 }
 
 void LLPanelPreferenceSkins::refreshSkinList()
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 42b6ce7b83..64cf69a6db 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -310,6 +310,8 @@ protected:
 	std::string m_SkinTheme;
 	LLComboBox* m_pSkinThemeCombo;
 	LLSD        m_SkinsInfo;
+	std::string	m_SkinName;
+	std::string	m_SkinThemeName;
 };
 // [/SL:KB]
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0cf20e1886..99c06c8c40 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -465,8 +465,8 @@ bool idle_startup()
 
 		// <FS:Ansariel> Store current font and skin for system info (FIRE-6806)
 		gSavedSettings.setString("FSInternalFontSettingsFile", gSavedSettings.getString("FSFontSettingsFile"));
-		gSavedSettings.setString("FSInternalSkinCurrent", gSavedSettings.getString("SkinCurrent"));
-		gSavedSettings.setString("FSInternalSkinCurrentTheme", gSavedSettings.getString("SkinCurrentTheme"));
+		gSavedSettings.setString("FSInternalSkinCurrent", gSavedSettings.getString("FSSkinCurrentReadableName"));
+		gSavedSettings.setString("FSInternalSkinCurrentTheme", gSavedSettings.getString("FSSkinCurrentThemeReadableName"));
 		// </FS:Ansariel>
 		
 		if (LLFeatureManager::getInstance()->isSafe())