diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 90a7767917..0254d0e82e 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -105,7 +105,7 @@ module.exports = React.createClass({
         if (!utils.areStatesEqual(newState, this.state)) {
             this.setState(newState);
         }
-        $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}});
+        $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover click', html: true, delay: {show: 500, hide: 500}});
     },
     onSocketChange: function(msg) {
         if (msg.action === 'new_user') {
diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 18addb52fe..6d999870aa 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -32,7 +32,7 @@ module.exports = React.createClass({
                   <div className="modal-content">
                     <div className="modal-header">
                       <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                      <h4 className="modal-title" id="myModalLabel">{channel.display_name}</h4>
+                      <h4 className="modal-title" id="myModalLabel"><span className="name">{channel.display_name}</span></h4>
                     </div>
                     <div className="modal-body">
                       <div className="row form-group">
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx
index d90522e8ce..e446167ec3 100644
--- a/web/react/components/channel_invite_modal.jsx
+++ b/web/react/components/channel_invite_modal.jsx
@@ -138,7 +138,7 @@ export default class ChannelInviteModal extends React.Component {
                 <div className='modal-content'>
                   <div className='modal-header'>
                     <button type='button' className='close' data-dismiss='modal' aria-label='Close'><span aria-hidden='true'>&times;</span></button>
-                    <h4 className='modal-title'>Add New Members to {this.state.channelName}</h4>
+                    <h4 className='modal-title'>Add New Members to <span className='name'>{this.state.channel_name}</span></h4>
                   </div>
                   <div className='modal-body'>
                     {inviteError}
diff --git a/web/react/components/channel_members.jsx b/web/react/components/channel_members.jsx
index cfb8ed41c1..db4bec4003 100644
--- a/web/react/components/channel_members.jsx
+++ b/web/react/components/channel_members.jsx
@@ -126,7 +126,7 @@ module.exports = React.createClass({
                   <div className="modal-content">
                     <div className="modal-header">
                         <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                        <h4 className="modal-title">{this.state.channel_name + " Members"}</h4>
+                        <h4 className="modal-title"><span className="name">{this.state.channel_name}</span> Members</h4>
                         <a className="btn btn-md btn-primary" data-toggle="modal" data-target="#channel_invite"><i className="glyphicon glyphicon-envelope"/>  Add New Members</a>
                     </div>
                     <div ref="modalBody" className="modal-body">
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index 38bc916825..4d17894342 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -209,7 +209,7 @@ module.exports = React.createClass({
                                 <span aria-hidden="true">&times;</span>
                                 <span className="sr-only">Close</span>
                             </button>
-                            <h4 className="modal-title">{"Notification Preferences for " + this.state.title}</h4>
+                            <h4 className='modal-title'>Notification Preferences for <span className='name'>{this.state.title}</span></h4>
                         </div>
                         <div className="modal-body">
                             <div className="settings-table">
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 8b60f0251a..67a69985f4 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -75,6 +75,7 @@ module.exports = React.createClass({
             utils.changeCss('.mention-link', 'color: ' + user.props.theme + ';');
             utils.changeCss('@media(max-width: 768px){.search-bar__container', 'background: ' + user.props.theme + ';}');
             utils.changeCss('.search-item-container:hover', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';');
+            utils.changeCss('.nav-pills__unread-indicator', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';');
         }
 
         if (user.props.theme !== '#000000' && user.props.theme !== '#585858') {
@@ -377,8 +378,8 @@ module.exports = React.createClass({
                                 <strong><UserProfile userId={teammate.id} /></strong>
                             </div>
                             <p className='channel-intro-text'>
-                                {'This is the start of your private message history with ' + teammateName + '.'}<br/>
-                                {'Private messages and files shared here are not shown to people outside this area.'}
+                                This is the start of your private message history with <strong>{teammateName}</strong>.<br/>
+                                Private messages and files shared here are not shown to people outside this area.
                             </p>
                             <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a>
                         </div>
@@ -416,9 +417,9 @@ module.exports = React.createClass({
                         <div className='channel-intro'>
                             <h4 className='channel-intro__title'>Beginning of {uiName}</h4>
                             <p className='channel-intro__content'>
-                                Welcome to {uiName}!
+                                Welcome to <strong>{uiName}</strong>!
                                 <br/><br/>
-                                {'This is the first channel ' + strings.Team + 'mates see when they'}
+                                This is the first channel {strings.Team} mates see when they
                                 <br/>
                                 sign up - use it for posting updates everyone needs to know.
                                 <br/><br/>
@@ -434,7 +435,7 @@ module.exports = React.createClass({
                         <div className='channel-intro'>
                             <h4 className='channel-intro__title'>Beginning of {uiName}</h4>
                             <p className='channel-intro__content'>
-                                {'This is the start of ' + uiName + ', a channel for non-work-related conversations.'}
+                                This is the start of <strong>{uiName}</strong>, a channel for non-work-related conversations.
                                 <br/>
                             </p>
                             <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={uiName} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a>
@@ -453,7 +454,7 @@ module.exports = React.createClass({
 
                     var createMessage;
                     if (creatorName !== '') {
-                        createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created by ' + creatorName + ' on ' + utils.displayDate(channel.create_at) + '.';
+                        createMessage = (<span>This is the start of the <strong>{uiName}</strong> {uiType} created by <strong>{creatorName}</strong> on <strong>{utils.displayDate(channel.create_at)}</strong></span>);
                     } else {
                         createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created on ' + utils.displayDate(channel.create_at) + '.';
                     }
diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx
index a8889a92a4..4a49e1c988 100644
--- a/web/react/components/removed_from_channel_modal.jsx
+++ b/web/react/components/removed_from_channel_modal.jsx
@@ -20,7 +20,7 @@ module.exports = React.createClass({
       var townSquare = ChannelStore.getByName("town-square");
       utils.switchChannel(townSquare);
 
-      this.setState({channelName: "", remover: ""})
+      this.setState({channelName: "", remover: ""});
     },
     componentDidMount: function() {
       $(this.getDOMNode()).on('show.bs.modal',this.handleShow);
@@ -40,18 +40,18 @@ module.exports = React.createClass({
 
         if (currentUser != null) {
             return (
-                <div className="modal fade" ref="modal" id="removed_from_channel" tabIndex="-1" role="dialog" aria-hidden="true">
-                   <div className="modal-dialog">
-                      <div className="modal-content">
-                        <div className="modal-header">
-                          <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                          <h4 className="modal-title">Removed from {channelName}</h4>
+                <div className='modal fade' ref='modal' id='removed_from_channel' tabIndex='-1' role='dialog' aria-hidden='true'>
+                   <div className='modal-dialog'>
+                      <div className='modal-content'>
+                        <div className='modal-header'>
+                          <button type='button' className='close' data-dismiss='modal' aria-label='Close'><span aria-hidden='true'>&times;</span></button>
+                          <h4 className='modal-title'>Removed from <span className='name'>{channelName}</span></h4>
                         </div>
-                        <div className="modal-body">
+                        <div className='modal-body'>
                             <p>{remover} removed you from {channelName}</p>
                         </div>
-                        <div className="modal-footer">
-                          <button type="button" className="btn btn-primary" data-dismiss="modal">Okay</button>
+                        <div className='modal-footer'>
+                          <button type='button' className='btn btn-primary' data-dismiss='modal'>Okay</button>
                         </div>
                       </div>
                    </div>
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 2b7f64030a..1ac6a3b5b9 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -109,6 +109,26 @@ module.exports = React.createClass({
             }
         );
 
+        if (this.refs.previewArrowLeft.getDOMNode) {
+            $(this.refs.previewArrowLeft.getDOMNode()).hover(
+                function onModalHover() {
+                    $(self.refs.imageFooter.getDOMNode()).addClass('footer--show');
+                }, function offModalHover() {
+                    $(self.refs.imageFooter.getDOMNode()).removeClass('footer--show');
+                }
+            );
+        }
+
+        if (this.refs.previewArrowRight.getDOMNode) {
+            $(this.refs.previewArrowRight.getDOMNode()).hover(
+                function onModalHover() {
+                    $(self.refs.imageFooter.getDOMNode()).addClass('footer--show');
+                }, function offModalHover() {
+                    $(self.refs.imageFooter.getDOMNode()).removeClass('footer--show');
+                }
+            );
+        }
+
         $(window).on('keyup', this.handleKeyPress);
 
         // keep track of whether or not this component is mounted so we can safely set the state asynchronously
@@ -252,13 +272,21 @@ module.exports = React.createClass({
         var rightArrow = '';
         if (this.props.filenames.length > 1) {
             leftArrow = (
-                <a className='modal-prev-bar' href='#' onClick={this.handlePrev}>
+                <a
+                    ref='previewArrowLeft'
+                    className='modal-prev-bar'
+                    href='#'
+                    onClick={this.handlePrev}>
                     <i className='image-control image-prev'/>
                 </a>
             );
 
             rightArrow = (
-                <a className='modal-next-bar' href='#' onClick={this.handleNext}>
+                <a
+                    ref='previewArrowRight'
+                    className='modal-next-bar'
+                    href='#'
+                    onClick={this.handleNext}>
                     <i className='image-control image-next'/>
                 </a>
             );
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 014f834ed0..8462701c9e 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -50,6 +50,13 @@
 		@include clearfix;
 		.modal-title {
 			float: left;
+			font-size: 16px;
+			line-height: 27px;
+			color: #f4f4f4;
+			.name {
+				font-weight: 600;
+				color: #fff;
+			}
 		}
 		.modal-action {
 			padding: 0;
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 5008331b4a..126d239ecd 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -1,3 +1,8 @@
+.channel-header__info .popover-content {
+	max-height: 250px;
+	overflow: auto;
+}
+
 .user-popover {
 	cursor: pointer;
 	display: inline-block;
@@ -13,4 +18,5 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: block;
-}
\ No newline at end of file
+}
+
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 6d9f2ad8b5..22b7426b11 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -38,24 +38,25 @@
         height: 100%;
         position: relative;
         overflow: auto;
-
     }
 
     .nav-pills__unread-indicator {
         position: absolute;
         left: 0;
         right: 0;
-        width: 70%;
-        background-color: darken($primary-color, 5%);
-        color: white;
+        width: 72%;
+        color: #777;
+        background: #DCF0FF;
+        @include border-radius(50px);
         margin: 0 auto;
-        padding: 2px;
+        padding: 3px 0 4px;
+        font-size: 13.5px;
         text-align: center;
         z-index: 1;
     }
 
     .nav-pills__unread-indicator-top {
-        top: 56px;
+        top: 66px;
     }
     .nav-pills__unread-indicator-bottom {
         bottom: 0px;