diff --git a/base/templates/base/company/company_view.html b/base/templates/base/company/company_view.html
index 55819d269..02d702d41 100644
--- a/base/templates/base/company/company_view.html
+++ b/base/templates/base/company/company_view.html
@@ -19,7 +19,7 @@
 				<div class="oh-sticky-table__sd">
 					<div class="mr-1">
 						<img
-							src="/media/{{company.icon}}"
+							src="{{company.icon.url}}"
 							style="width: 30px; border-radius: 100%"
 							class="oh-profile__image"
 							alt="Username"
diff --git a/employee/templates/employee/dashboard/dashboard_employee.html b/employee/templates/employee/dashboard/dashboard_employee.html
index 5abed1f52..9f411ac02 100644
--- a/employee/templates/employee/dashboard/dashboard_employee.html
+++ b/employee/templates/employee/dashboard/dashboard_employee.html
@@ -94,13 +94,9 @@
           {% for employee in birthdays %}
           <div class="oh-dashboard__event">
             <div class="oh-dasboard__event-photo">
-              {% if employee.employee_profile %}
-              <img src="/media/{{employee.employee_profile}}" class="oh-kanban-card__profile-image" alt="Username" />
-              {% else %}
               <img
-                src="https://ui-avatars.com/api/?name={{employee.employee_first_name}}+{{employee.employee_last_name}}&background=random"
+                src="{{employee.get_avatar}}"
                 class="oh-kanban-card__profile-image" alt="Username" />
-              {% endif %}
             </div>
             <div class="oh-dasboard__event-details">
               <span class="oh-dashboard__event-title">{% trans "Birthday" %}</span>
diff --git a/recruitment/templates/candidate/candidate_list.html b/recruitment/templates/candidate/candidate_list.html
index c098d8379..afce512de 100644
--- a/recruitment/templates/candidate/candidate_list.html
+++ b/recruitment/templates/candidate/candidate_list.html
@@ -123,7 +123,7 @@
               <a
                 style="text-decoration: none"
                 class="oh-btn oh-btn--light"
-                href="/media/{{cand.resume}}"
+                href="{{cand.resume.url}}"
                 target="_blank"
                 title="{% trans 'Resume' %}"
                 rel="noopener noreferrer"
diff --git a/recruitment/templates/candidate/candidate_update_form.html b/recruitment/templates/candidate/candidate_update_form.html
index a37e94b09..69505cd61 100644
--- a/recruitment/templates/candidate/candidate_update_form.html
+++ b/recruitment/templates/candidate/candidate_update_form.html
@@ -10,7 +10,7 @@
           <div class="card rounded-3">
             <div class="pl-5 mt-5">
               <img
-                src="/media/{{form.profile|media_path}}"
+                src="{{form.instance.get_avatar}}"
                 alt="Sample photo"
                 class="rounded-circle img-fluid mr-auto"
                 style="width: 100px; height: 100px"
diff --git a/recruitment/templates/candidate/group_by.html b/recruitment/templates/candidate/group_by.html
index 4d28681d3..552f25ed5 100644
--- a/recruitment/templates/candidate/group_by.html
+++ b/recruitment/templates/candidate/group_by.html
@@ -93,7 +93,7 @@
 									<a href="#" style="color: inherit;text-decoration: none;"
 										class="oh-sticky-table__td">{{cand.job_position_id}}
 									</a>
-									<a style="color: inherit;text-decoration: none;" class="oh-sticky-table__td" href="/media/{{cand.resume}}"
+									<a style="color: inherit;text-decoration: none;" class="oh-sticky-table__td" href="{{cand.resume.url}}"
 										target="_blank" rel="noopener noreferrer"><span class="oh-btn oh-btn--info"> {% trans "Resume" %}</span>
 									</a>
 
diff --git a/recruitment/templates/candidate/individual.html b/recruitment/templates/candidate/individual.html
index 2a51f58c1..970a10140 100644
--- a/recruitment/templates/candidate/individual.html
+++ b/recruitment/templates/candidate/individual.html
@@ -588,7 +588,7 @@
           {% if candidate.resume %}
           <iframe
             id="iframe_pdf"
-            src="/media/{{candidate.resume}}"
+            src="{{candidate.resume.url}}"
             style="width: 100%; height: 500px"
             frameborder="0"
           ></iframe>
@@ -627,7 +627,7 @@
                         {% elif question|slice:"0:11" == "percentage_" %}
                           {{ answer_list.0 }}%
                         {% elif question|slice:"0:5" == "file_" %}
-                          <a href="/media/{{ answer_list.0 }}" target="_blank">{{ answer_list.0 }}</a>
+                          <a href="{{ answer_list.0.url }}" target="_blank">{{ answer_list.0 }}</a>
                         {% elif question|slice:"0:7" == "rating_" %}
                             <div class="oh-rate">
                               <input type="radio" id="star5{{question.id}}" value="5" disabled {% if answer_list.0 == '5' %} checked {% endif %} />
diff --git a/recruitment/templates/pipeline/components/candidate_stage_component.html b/recruitment/templates/pipeline/components/candidate_stage_component.html
index 127f70558..4275f8790 100644
--- a/recruitment/templates/pipeline/components/candidate_stage_component.html
+++ b/recruitment/templates/pipeline/components/candidate_stage_component.html
@@ -271,7 +271,7 @@
                             style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;">
                             <ion-icon name="newspaper-outline"></ion-icon>
                         </button>
-                        <a class="oh-btn oh-btn--light" href="/media/{{cand.resume}}"
+                        <a class="oh-btn oh-btn--light" href="{{cand.resume.url}}"
                             target="_blank" title="{% trans " Resume" %}" rel="noopener noreferrer"
                             style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;"><ion-icon
                                 name="document-outline"></ion-icon></a>
diff --git a/recruitment/templates/pipeline/kanban_components/candidate_kanban_components.html b/recruitment/templates/pipeline/kanban_components/candidate_kanban_components.html
index 553afc613..453a6131b 100644
--- a/recruitment/templates/pipeline/kanban_components/candidate_kanban_components.html
+++ b/recruitment/templates/pipeline/kanban_components/candidate_kanban_components.html
@@ -170,7 +170,7 @@
                 </li>
                 {% endif %}
                 <li class="oh-dropdown__item">
-                    <a style="color: inherit;text-decoration: none;" class="oh-dropdown__link oh-dropdown__link--secondary" href="/media/{{cand.resume}}" target="_blank"
+                    <a style="color: inherit;text-decoration: none;" class="oh-dropdown__link oh-dropdown__link--secondary" href="{{cand.resume.url}}" target="_blank"
                     >{% trans "Resume" %}</a>
                 </li>
                 {% if perms.recruitment.change_candidate or request.user|is_stagemanager %}
diff --git a/recruitment/templates/pipeline/pipeline_card.html b/recruitment/templates/pipeline/pipeline_card.html
index 33dcb798b..1884e0f1a 100644
--- a/recruitment/templates/pipeline/pipeline_card.html
+++ b/recruitment/templates/pipeline/pipeline_card.html
@@ -251,7 +251,7 @@
                     </li>
                     {% endif %}
                     <li class="oh-dropdown__item">
-                      <a style="color: inherit;text-decoration: none;" class="oh-dropdown__link oh-dropdown__link--secondary" href="/media/{{cand.resume}}" target="_blank"
+                      <a style="color: inherit;text-decoration: none;" class="oh-dropdown__link oh-dropdown__link--secondary" href="{{cand.resume.url}}" target="_blank"
                         >{% trans "Resume" %}</a>
                     </li>
                     {% if perms.recruitment.change_candidate or request.user|is_stagemanager %}
diff --git a/recruitment/templates/skill_zone/skill_zone_list.html b/recruitment/templates/skill_zone/skill_zone_list.html
index a69126227..d1c17c11e 100644
--- a/recruitment/templates/skill_zone/skill_zone_list.html
+++ b/recruitment/templates/skill_zone/skill_zone_list.html
@@ -123,7 +123,7 @@
                                                 <a
                                                     style="text-decoration: none"
                                                     class="oh-btn oh-btn--light"
-                                                    href="/media/{{sz_candidate.candidate_id.resume}}"
+                                                    href="{{sz_candidate.candidate_id.resume.url}}"
                                                     target="_blank"
                                                     title="{% trans 'Resume' %}"
                                                     rel="noopener noreferrer"
diff --git a/recruitment/templates/skill_zone_cand/skill_zone_cand_list.html b/recruitment/templates/skill_zone_cand/skill_zone_cand_list.html
index e16f47913..8b5ee6869 100644
--- a/recruitment/templates/skill_zone_cand/skill_zone_cand_list.html
+++ b/recruitment/templates/skill_zone_cand/skill_zone_cand_list.html
@@ -39,7 +39,7 @@
                                 <a
                                     style="text-decoration: none"
                                     class="oh-btn oh-btn--light"
-                                    href="/media/{{sz_candidate.candidate_id.resume}}"
+                                    href="{{sz_candidate.candidate_id.resume.url}}"
                                     target="_blank"
                                     title="{% trans 'Resume' %}"
                                     rel="noopener noreferrer"
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 66bf5d9ac..f76733dda 100755
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -83,7 +83,7 @@ function initializeSummernote(candId,searchWords,) {
       />
       {% else %}
       <img
-      src="/media/{{request.user.employee_get.employee_work_info.company_id.icon}}"
+      src="{{request.user.employee_get.employee_work_info.company_id.icon.url}}"
       style="width: 34px; border-radius: 3px"
       />
       {% endif %}