diff --git a/apps/common/icons.py b/apps/common/icons.py
index 39cdbaaf27..5b2f89cd13 100644
--- a/apps/common/icons.py
+++ b/apps/common/icons.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from icons.literals import (CROSS, TICK, COMPUTER_KEY, VCARD, VCARD_EDIT,
-    INFORMATION, SCRIPT, KEYBOARD)
+    INFORMATION, SCRIPT, KEYBOARD, ADD, DELETE)
 from icons import Icon
 
 icon_cross = Icon(CROSS)
@@ -13,3 +13,5 @@ icon_current_user_edit = Icon(VCARD_EDIT)
 icon_about = Icon(INFORMATION)
 icon_license = Icon(SCRIPT)
 icon_admin_site = Icon(KEYBOARD)
+icon_add = Icon(ADD)
+icon_delete = Icon(DELETE)
diff --git a/apps/common/views.py b/apps/common/views.py
index ba664c10ca..97ce1f7596 100644
--- a/apps/common/views.py
+++ b/apps/common/views.py
@@ -18,6 +18,7 @@ from django.conf import settings
 from .forms import (ChoiceForm, UserForm, UserForm_view, LicenseForm,
     EmailAuthenticationForm)
 from .settings import LOGIN_METHOD
+from .icons import icon_add, icon_delete
 
 
 def multi_object_action_view(request):
@@ -134,7 +135,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': unselected_list,
                     'title': left_list_title,
                     'submit_label': _(u'Add'),
-                    'submit_icon_famfam': 'add'
+                    'submit_icon': icon_add
                 }
             },
             {
@@ -145,7 +146,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
                     'form': selected_list,
                     'title': right_list_title,
                     'submit_label': _(u'Remove'),
-                    'submit_icon_famfam': 'delete'
+                    'submit_icon': icon_delete
                 }
             },
 
diff --git a/apps/icons/literals.py b/apps/icons/literals.py
index 309a23e5ff..278e7a2131 100644
--- a/apps/icons/literals.py
+++ b/apps/icons/literals.py
@@ -5,7 +5,8 @@ ICON_SET_FAT_COW = 'fat_cow'
 ICON_SET_CUSTOM = 'custom'
 
 DEFAULT_ICON_SET = 'fat_cow'
-   
+
+ADD = 'add'
 APPLICATION_VIEW_ICONS = 'application_view_icons'
 BLACKBOARD_SUM = 'blackboard_sum'
 BOOK = 'book'
@@ -15,6 +16,7 @@ CD_BURN = 'cd_burn'
 COG = 'cog'
 COMPUTER_KEY = 'computer_key'
 CROSS = 'cross'
+DELETE = 'delete'
 DRAW_AIRBRUSH = 'draw_airbrush'
 DOCUMENT_SIGNATURE = 'document_signature'
 ERROR = 'error'
diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py
index ed664c4d5a..b296e40616 100644
--- a/apps/icons/sets/fat_cow.py
+++ b/apps/icons/sets/fat_cow.py
@@ -7,6 +7,7 @@ ID = 'fat_cow'
 LABEL = _(u'Fat cow')
 
 DICTIONARY = {
+    ADD: 'add.png',
     APPLICATION_VIEW_ICONS: 'application_view_icons.png',
     BLACKBOARD_SUM: 'blackboard_sum.png',
     BOOK: 'book.png',
@@ -16,6 +17,7 @@ DICTIONARY = {
     COG: 'cog.png',
     COMPUTER_KEY: 'computer_key.png',
     CROSS: 'cross.png',
+    DELETE: 'delete.png',
     DRAW_AIRBRUSH: 'draw_airbrush.png',
     DOCUMENT_SIGNATURE: 'document_signature.png',
     ERROR: 'error.png',