diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 59824a479..f7208b980 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -64,7 +64,6 @@ void AddonsScreen::init()
 {
     Screen::init();
 	getWidget<GUIEngine::RibbonWidget>("category")->setDeactivated();
-    m_type = "kart";
 
     std::cout << "[Addons] Using directory <" + file_manager->getAddonsDir() 
               << ">\n";
@@ -80,6 +79,10 @@ void AddonsScreen::init()
 }   // init
 
 // ----------------------------------------------------------------------------
+/** Loads the list of all addons of the given type. The gui element will be
+ *  updated.
+ *  \param type Must be 'kart' or 'track'.
+ */
 void AddonsScreen::loadList(const std::string &type)
 {
     GUIEngine::ListWidget* w_list = 
@@ -88,23 +91,19 @@ void AddonsScreen::loadList(const std::string &type)
     for(unsigned int i=0; i<addons_manager->getNumAddons(); i++)
     {
         const Addon &addon = addons_manager->getAddon(i);
+        // Ignore addons of a different type
         if(addon.getType()!=type) continue;
-        std::cout << addon.getName()<< std::endl;
+        
+        // Get the right icon to display
+        int icon;
         if(addon.isInstalled() && addon.needsUpdate())
-        {
-        	w_list->addItem(addon.getId(), addon.getName().c_str(), 
-                            m_icon_needs_update);
-        }
-	    else if(addon.isInstalled())
-        {
-        	w_list->addItem(addon.getId(), addon.getName().c_str(),
-        	                m_icon_installed);
-        }
+            icon = addon.needsUpdate() ? m_icon_needs_update 
+                                       : m_icon_installed;
 	    else
-        {
-        	w_list->addItem(addon.getId(), addon.getName().c_str(),
-                            m_icon_not_installed);
-        }
+        	icon = m_icon_not_installed;
+
+        w_list->addItem(addon.getId(), addon.getName().c_str(), 
+                        icon);
     }
 
 	m_can_load_list = false;
@@ -147,12 +146,10 @@ void AddonsScreen::eventCallback(GUIEngine::Widget* widget,
             StateManager::get()->replaceTopMostScreen(AddonsUpdateScreen::getInstance());
         else if (selection == "tab_track")
         {
-            m_type = "track";
             loadList("track");
         }
         else if (selection == "tab_kart")
         {
-            m_type = "kart";
             loadList("kart");
         }
     }
diff --git a/src/states_screens/addons_screen.hpp b/src/states_screens/addons_screen.hpp
index 5e013d1a6..14f8e2a91 100644
--- a/src/states_screens/addons_screen.hpp
+++ b/src/states_screens/addons_screen.hpp
@@ -59,7 +59,6 @@ class AddonsScreen : public GUIEngine::Screen,
 public:
 
     bool                    m_can_load_list;
-    std::string             m_type;
 
     /** Load the addons into the main list.*/
     void loadList(const std::string &type);
diff --git a/src/states_screens/addons_update_screen.cpp b/src/states_screens/addons_update_screen.cpp
index 1eec66317..e8a2277db 100644
--- a/src/states_screens/addons_update_screen.cpp
+++ b/src/states_screens/addons_update_screen.cpp
@@ -71,13 +71,11 @@ void AddonsUpdateScreen::eventCallback(GUIEngine::Widget* widget,
         if (selection == "tab_track")
         {
             StateManager::get()->replaceTopMostScreen(AddonsScreen::getInstance());
-            AddonsScreen::getInstance()->m_type = "track";
             AddonsScreen::getInstance()->loadList("track");
         }
         else if (selection == "tab_kart")
         {
             StateManager::get()->replaceTopMostScreen(AddonsScreen::getInstance());
-            AddonsScreen::getInstance()->m_type = "kart";
             AddonsScreen::getInstance()->loadList("kart");
         }
     }