diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 1c93973f83..390803d6b7 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -476,4 +476,14 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="fs_radar"
            />
+  <command name="conversation_log"
+           available_in_toybox="true"
+           icon="Chat_History"
+           label_ref="Command_Conversation_Log_Label"
+           tooltip_ref="Command_Conversation_Log_Tooltip"
+           execute_function="Floater.Toggle"
+           execute_parameters="conversation"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="conversation"
+           />
 </commands>
diff --git a/indra/newview/skins/default/textures/icons/Chat_History.png b/indra/newview/skins/default/textures/icons/Chat_History.png
new file mode 100644
index 0000000000..0fc1cc830e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Chat_History.png differ
diff --git a/indra/newview/skins/default/textures/icons/Muted_Chat.png b/indra/newview/skins/default/textures/icons/Muted_Chat.png
index 4b47a74426..f946cba593 100644
Binary files a/indra/newview/skins/default/textures/icons/Muted_Chat.png and b/indra/newview/skins/default/textures/icons/Muted_Chat.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index abb67f3d09..373a9cbc79 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -905,8 +905,9 @@ with the same filename but different name
 <texture name="icon_avatar_online"			file_name="legacy/icon_avatar_online.tga"		preload="false" />
 <texture name="slim_icon_16_viewer"				file_name="slim_icon_16_viewer.tga"					preload="false" />
 
-  <texture name="Console_Background" file_name="Console_Background.png"/>
-  <texture name="Muted_Chat" file_name="icons/Muted_Chat.png" preload="false" />
+<texture name="Console_Background" file_name="Console_Background.png"/>
+<texture name="Muted_Chat" file_name="icons/Muted_Chat.png" preload="false" />
+<texture name="Chat_History" file_name="icons/Chat_History.png" preload="false" />
 
 <texture name="Icon_Place" file_name="icon_place.tga" preload="false" />
 <texture name="Icon_Auction" file_name="icon_auction.tga" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
index 0ac34df4d6..f676ef7049 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
@@ -310,7 +310,7 @@
       image_pressed_selected="PushButton_Selected_Press"
       image_selected="PushButton_Selected_Press"
       tool_tip="Open this Instant Message's past history."
-      image_overlay="List_View_On"
+      image_overlay="Chat_History"
       name="im_history_btn"
       top="0"
       width="25" />
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index d230a16bd8..216714e0c6 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -73,7 +73,7 @@
        top="2"
        width="24"
        height="24"
-       image_overlay="List_View_On"
+       image_overlay="Chat_History"
        image_pressed="PushButton_Press"
        image_pressed_selected="PushButton_Selected_Press"
        image_selected="PushButton_Selected_Press"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
index fdfd025cc2..2334e11aa5 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
@@ -78,7 +78,7 @@
           height="20"
           follows="left|top"
           left_pad="2"
-          image_overlay="List_View_On"
+          image_overlay="Chat_History"
           width="25"
           image_pressed="PushButton_Press"
           image_pressed_selected="PushButton_Selected_Press"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 037c1a7051..adf9717cf2 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2328,6 +2328,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Pose_Stand_Label">Pose Stand</string>
   <string name="Command_Snapshot_To_Disk_Label">Snapshot to Disk</string>
   <string name="Command_Radar_Label">Radar</string>
+  <string name="Command_Conversation_Log_Label">Conversation Log</string>
   
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
@@ -2377,6 +2378,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Pose_Stand_Tooltip">Avatar pose stand for adjusting attachments</string>
   <string name="Command_Snapshot_To_Disk_Tooltip">Takes a quick snapshot and saves it to harddisk</string>
   <string name="Command_Radar_Tooltip">Opens the radar for nearby avatars</string>
+  <string name="Command_Conversation_Log_Tooltip">Opens the conversation log to view past chat transcripts</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>
diff --git a/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml b/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
index 9863069273..9bcdc9e4ee 100644
--- a/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
@@ -81,7 +81,7 @@
           height="20"
           follows="left|top"
           left_pad="2"
-          image_overlay="List_View_On"
+          image_overlay="Chat_History"
           layout="topleft"
           width="25"
           image_pressed="PushButton_Press"