Add new icons for map menu

app/javascript/components/maps/main-map/components/map-controls/map-controls-component.jsx

@@ -359,14 +359,16 @@ class MapControlsButtons extends PureComponent {
                 {this.renderBasemapsTooltip()}
               </div>
             )}
-            <div className={cx('controls-wrapper', 'map-tour-map-controls')}>
-              {this.renderZoomButtons()}
-              {this.renderShowPanelsButton()}
-              {this.renderShareButton()}
-              {this.renderPrintButton()}
-              {this.renderMapTourBtn()}
+            <div className="map-tour-map-controls">
+              <div className="controls-wrapper">
+                {this.renderZoomButtons()}
+                {this.renderShowPanelsButton()}
+                {this.renderShareButton()}
+                {this.renderPrintButton()}
+                {this.renderMapTourBtn()}
+              </div>
+              {this.renderMapPosition()}
             </div>
-            {this.renderMapPosition()}
           </Fragment>
         ) : (
           <div className="mobile-controls-wrapper">

app/javascript/components/maps/main-map/components/map-tour/component.jsx

@@ -174,7 +174,7 @@ class MapTour extends PureComponent {
       {
         target: '.map-tour-map-controls',
         content:
-          'Access basic map tools and information: zoom in/out share, expand, zoom level, lat/long coordinates.'
+          'Access basic map tools: zoom out and in, expand the map, share or embed, print, and take a tour of the map. Also view zoom level and lat/long coordinates.'
       },
       {
         target: '.map-tour-main-menu',

app/javascript/pages/dashboards/header/header-selectors.js

@@ -11,6 +11,7 @@ export const selectLocation = state =>
   (state.location && state.location.payload) || null;
 export const selectLoading = state =>
   state.header &&
+  state.countryData &&
   (state.header.loading ||
     state.countryData.isCountriesLoading ||
     state.countryData.isRegionsLoading ||

app/javascript/providers/country-data-provider/actions.js

@@ -26,7 +26,8 @@ export const setCountryLinks = createAction('setCountryLinks');
 export const getCountries = createThunkAction(
   'getCountries',
   () => (dispatch, getState) => {
-    if (!getState().countryData.isCountriesLoading) {
+    const { countryData } = getState();
+    if (countryData && !countryData.isCountriesLoading) {
       dispatch(setCountriesLoading(true));
       axios
         .all([getCountriesProvider(), getFAOCountriesProvider()])