diff --git a/app/javascript/packs/shared/actions/types.js b/app/javascript/packs/app/action_types.js
similarity index 100%
rename from app/javascript/packs/shared/actions/types.js
rename to app/javascript/packs/app/action_types.js
diff --git a/app/javascript/packs/shared/constants/colors.js b/app/javascript/packs/app/constants/colors.js
similarity index 100%
rename from app/javascript/packs/shared/constants/colors.js
rename to app/javascript/packs/app/constants/colors.js
diff --git a/app/javascript/packs/shared/actions/ActivitiesActions.js b/app/javascript/packs/shared/actions/ActivitiesActions.js
index c5a6a1703..94ce39f28 100644
--- a/app/javascript/packs/shared/actions/ActivitiesActions.js
+++ b/app/javascript/packs/shared/actions/ActivitiesActions.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { ACTIVITIES_PATH } from "../../app/routes";
-import { GLOBAL_ACTIVITIES_DATA } from "./types";
+import { GLOBAL_ACTIVITIES_DATA } from "../../app/action_types";
 
 function addActivitiesData(data) {
   return {
diff --git a/app/javascript/packs/shared/actions/TeamsActions.js b/app/javascript/packs/shared/actions/TeamsActions.js
index c99b1f30c..a1410c1fa 100644
--- a/app/javascript/packs/shared/actions/TeamsActions.js
+++ b/app/javascript/packs/shared/actions/TeamsActions.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import _ from "lodash";
 import { TEAMS_PATH, CHANGE_TEAM_PATH } from "../../app/routes";
-import { GET_LIST_OF_TEAMS, SET_CURRENT_TEAM } from "./types";
+import { GET_LIST_OF_TEAMS, SET_CURRENT_TEAM } from "../../app/action_types";
 
 function addTeamsData(data) {
   return {
diff --git a/app/javascript/packs/shared/actions/UsersActions.js b/app/javascript/packs/shared/actions/UsersActions.js
index 9e834d28f..2903f760c 100644
--- a/app/javascript/packs/shared/actions/UsersActions.js
+++ b/app/javascript/packs/shared/actions/UsersActions.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { CURRENT_USER_PATH } from "../../app/routes";
-import { SET_CURRENT_USER } from "./types";
+import { SET_CURRENT_USER } from "../../app/action_types";
 
 function addCurrentUser(data) {
   return {
diff --git a/app/javascript/packs/shared/navigation/components/NotificationImage.jsx b/app/javascript/packs/shared/navigation/components/NotificationImage.jsx
new file mode 100644
index 000000000..250e66618
--- /dev/null
+++ b/app/javascript/packs/shared/navigation/components/NotificationImage.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+
+const NotificationImage = ({type_of}) => {
+  return(
+    <div className="text-center">
+      <span className="assignment">
+        <i className="fa fa-newspaper-o" />
+      </span>
+    </div>
+  )
+}
+
+export default NotificationImage;
diff --git a/app/javascript/packs/shared/navigation/components/NotificationItem.jsx b/app/javascript/packs/shared/navigation/components/NotificationItem.jsx
index 1f512f495..c77c65a17 100644
--- a/app/javascript/packs/shared/navigation/components/NotificationItem.jsx
+++ b/app/javascript/packs/shared/navigation/components/NotificationItem.jsx
@@ -5,6 +5,7 @@ import { FormattedTime } from "react-intl";
 import styled from "styled-components";
 
 import CustomNavItem from "./CustomNavItem";
+import NotificationImage from "./NotificationImage";
 
 const StyledListItem = styled(CustomNavItem)`
   border-bottom: 1px solid #d2d2d2;
@@ -19,11 +20,7 @@ const NotificationItem = ({ notification }) => {
     <StyledListItem>
       <Row>
         <Col xs={2}>
-          <div className="text-center">
-            <span className="assignment">
-              <i className="fa fa-newspaper-o" />
-            </span>
-          </div>
+          <NotificationImage type={type_of} />
         </Col>
 
         <Col xs={10}>
diff --git a/app/javascript/packs/shared/navigation/components/NotificationsDropdown.jsx b/app/javascript/packs/shared/navigation/components/NotificationsDropdown.jsx
index 68836a37b..9d28669fc 100644
--- a/app/javascript/packs/shared/navigation/components/NotificationsDropdown.jsx
+++ b/app/javascript/packs/shared/navigation/components/NotificationsDropdown.jsx
@@ -9,7 +9,7 @@ import {
   MAIN_COLOR_BLUE,
   WILD_SAND_COLOR,
   MYSTIC_COLOR
-} from "../../constants/colors";
+} from "../../../app/constants/colors";
 
 import NotificationItem from "./NotificationItem";
 import Spinner from "../../Spinner";
diff --git a/app/javascript/packs/shared/navigation/components/TeamSwitch.jsx b/app/javascript/packs/shared/navigation/components/TeamSwitch.jsx
index 740f9f71c..bbb1a5ec2 100644
--- a/app/javascript/packs/shared/navigation/components/TeamSwitch.jsx
+++ b/app/javascript/packs/shared/navigation/components/TeamSwitch.jsx
@@ -6,7 +6,7 @@ import { NavDropdown, MenuItem, Glyphicon } from "react-bootstrap";
 import styled from "styled-components";
 import _ from "lodash";
 
-import { BORDER_GRAY_COLOR } from "../../constants/colors";
+import { BORDER_GRAY_COLOR } from "../../../app/constants/colors";
 import { setCurrentUser, changeTeam } from "../../actions/TeamsActions";
 import { getTeamsList } from "../../actions/TeamsActions";
 
diff --git a/app/javascript/packs/shared/navigation/index.js b/app/javascript/packs/shared/navigation/index.js
index a80d4a372..302926eb1 100644
--- a/app/javascript/packs/shared/navigation/index.js
+++ b/app/javascript/packs/shared/navigation/index.js
@@ -7,7 +7,7 @@ import {
   MAIN_COLOR_BLUE,
   WHITE_COLOR,
   BORDER_GRAY_COLOR
-} from "../constants/colors";
+} from "../../app/constants/colors";
 import { getActivities } from "../actions/ActivitiesActions";
 import TeamSwitch from "./components/TeamSwitch";
 import GlobalActivitiesModal from "./components/GlobalActivitiesModal";
diff --git a/app/javascript/packs/shared/reducers/ActivitiesReducers.js b/app/javascript/packs/shared/reducers/ActivitiesReducers.js
index 1c294aa24..9a9235383 100644
--- a/app/javascript/packs/shared/reducers/ActivitiesReducers.js
+++ b/app/javascript/packs/shared/reducers/ActivitiesReducers.js
@@ -1,7 +1,7 @@
 import {
   GLOBAL_ACTIVITIES_DATA,
   MORE_GLOBAL_ACTIVITIES
-} from "../actions/types";
+} from "../../app/action_types";
 
 export function globalActivities(
   state = { more: true, activities: [] },
diff --git a/app/javascript/packs/shared/reducers/TeamReducers.js b/app/javascript/packs/shared/reducers/TeamReducers.js
index 4ab669035..707752c93 100644
--- a/app/javascript/packs/shared/reducers/TeamReducers.js
+++ b/app/javascript/packs/shared/reducers/TeamReducers.js
@@ -1,4 +1,4 @@
-import { SET_CURRENT_TEAM, GET_LIST_OF_TEAMS } from "../actions/types";
+import { SET_CURRENT_TEAM, GET_LIST_OF_TEAMS } from "../../app/action_types";
 
 const initialState = { name: "", id: 0, current_team: true };
 export const setCurrentTeam = (state = initialState, action) => {
diff --git a/app/javascript/packs/shared/reducers/UsersReducer.js b/app/javascript/packs/shared/reducers/UsersReducer.js
index b4f4df1fd..eaae76b41 100644
--- a/app/javascript/packs/shared/reducers/UsersReducer.js
+++ b/app/javascript/packs/shared/reducers/UsersReducer.js
@@ -1,4 +1,4 @@
-import { SET_CURRENT_USER } from "../actions/types";
+import { SET_CURRENT_USER } from "../../app/action_types";
 
 export function currentUser(
   state = { id: 0, fullName: "", avatarPath: "" },