diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index e52a1b4..dfd70be 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -74,8 +74,6 @@
                                                 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
                                             </ul>
                                         {% endif %}
-                                        <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                                        <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
                                     </div>
                                 </div>
                             </div>
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 617595b..f99990c 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -80,11 +80,6 @@
                                                 </ul>
                                             {% endif %}
                                             
-                                            <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                                            <a href="{% url 'notifications:manage_cat' category.slug %}" class="pull-right action_icon">
-                                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                                                {% notifies_cat_number category request.user %}
-                                            </a>
                                         </div>
                                     </div>
                                 </div>
@@ -145,12 +140,7 @@
                                                     <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
                                                 </ul>
                                             {% endif %}
-                                            
-                                            <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                                            <a href="" class="pull-right action_icon">
-                                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                                                {% notifies_cat_number category request.user %}
-                                            </a>
+                                                                                        
                                         </div>
                                     </div>
                                 </div>
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index 4dab0d0..1093f50 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -39,6 +39,8 @@
                             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                             {% notifies_number subject request.user %}
                         </a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
                     </div>
                 </div>
             </div>
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index 23acf15..6c28257 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -55,11 +55,14 @@
                                 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                             </ul>
                         {% endif %}
+                        
                         <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
                         <a href="{% url 'notifications:view' subject.slug %}" class="pull-right action_icon">
                             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                             {% notifies_number subject request.user %}
                         </a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
                     </div>
                 </div>
             </div>
--
libgit2 0.21.2