diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index fc7c59b..193537a 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -14,7 +14,9 @@ import android.widget.Toast;
 import com.example.aped.communication.IIO;
 import com.example.aped.utils.ExternalStorageHandler;
 import com.example.aped.communication.TestIO;
+import com.example.aped.utils.IFAVORITES;
 import com.example.aped.utils.IXML;
+import com.example.aped.utils.TestFavorites;
 import com.example.aped.utils.TestXML;
 import com.example.aped.utils.XMLHandler;
 import com.google.android.material.navigation.NavigationView;
@@ -51,6 +53,8 @@ public class MainActivity extends AppCompatActivity {
     public static IXML xml = new TestXML();
     /** zur Verwendung von uebergabe anstatt der direkten Einbindung.*/
     public static IIO uebergabe = new TestIO();
+    /** zur Verwendung von favorite anstatt der direkten Einbindung.*/
+    public static IFAVORITES favorite = new TestFavorites();
     /** allgemeines.*/
 
     @Override
diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
index 1dccc4f..74d4105 100644
--- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
+++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
@@ -30,11 +30,11 @@ public class AllIOsFragment extends Fragment {
     ListView lv;
     SearchView searchView;
     ArrayAdapter<String> adapter;
-    List<String> name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"};
+    //List<String> name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"};
     //String[] state = {"FALSE", "TRUE", "FALSE"};
-    int[] images =new int[name.size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal};
-    int[] favoriten = new int[name.size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off};
-    int[] favoriten_state = new int[name.size()];
+    int image;// =new int[MainActivity.xml.getDeviceNames().size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal};
+    int favorite_image ;//= new int[MainActivity.xml.getDeviceNames().size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off};
+    //int[] favoriten_state = new int[MainActivity.xml.getDeviceNames().size()];
 
     @Override
     public View onCreateView(LayoutInflater inflater,
@@ -52,7 +52,7 @@ public class AllIOsFragment extends Fragment {
 
             @Override
             public int getCount() {
-                return name.size();
+                return MainActivity.xml.getDeviceNames().size();
             }
 
             @Override
@@ -69,17 +69,18 @@ public class AllIOsFragment extends Fragment {
 
             @Override
             public View getView(int i, View view, ViewGroup viewGroup) {
-                if(MainActivity.uebergabe.read(name.get(i))=="FALSE")
-                {
-                    images[i]=R.drawable.red_signal;
-                }else {
-                    images[i] = R.drawable.green_signal;
+                if(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="TRUE") {
+                    image=R.drawable.green_signal;
+                }else if (MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="FALSE") {
+                    image = R.drawable.red_signal;
                 }
-                if(favoriten_state[i]==0)
-                {
-                    favoriten[i]=android.R.drawable.btn_star_big_off;
+                else{
+                    image = R.drawable.off_signal;
+                }
+                if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) {
+                    favorite_image = android.R.drawable.btn_star_big_on;
                 }else {
-                    favoriten[i] = android.R.drawable.btn_star_big_on;
+                    favorite_image = android.R.drawable.btn_star_big_off;
                 }
                 view = getLayoutInflater().inflate(R.layout.listview_layout, null);
                 ImageView imageView = (ImageView) view.findViewById(R.id.images);
@@ -90,21 +91,21 @@ public class AllIOsFragment extends Fragment {
                 ButtonView_Favoriten.setOnClickListener(new View.OnClickListener(){
                     @Override
                             public void onClick(View view){
-                        if(favoriten_state[i]==0){
-                            favoriten_state[i]=1;
-                            favoriten[i]=android.R.drawable.btn_star_big_on;
-                            ButtonView_Favoriten.setImageResource(favoriten[i]);
-                        }else{
-                            favoriten_state[i]=0;
-                            favoriten[i]=android.R.drawable.btn_star_big_off;
-                            ButtonView_Favoriten.setImageResource(favoriten[i]);
+                        if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) {
+                            MainActivity.favorite.removeFavorite(MainActivity.xml.getDeviceNames().get(i));
+                            favorite_image = android.R.drawable.btn_star_big_off;
+                            ButtonView_Favoriten.setImageResource(favorite_image);
+                        }else {
+                            MainActivity.favorite.addFavorite(MainActivity.xml.getDeviceNames().get(i));
+                            favorite_image = android.R.drawable.btn_star_big_on;
+                            ButtonView_Favoriten.setImageResource(favorite_image);
                         }
                     }
                 });
-                imageView.setImageResource(images[i]);
-                TextView_Name.setText(name.get(i));
-                TextView_State.setText(MainActivity.uebergabe.read(name.get(i)));
-                ButtonView_Favoriten.setImageResource(favoriten[i]);
+                imageView.setImageResource(image);
+                TextView_Name.setText(MainActivity.xml.getDeviceNames().get(i));
+                TextView_State.setText(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i)));
+                ButtonView_Favoriten.setImageResource(favorite_image);
                 return view;
             }
         }
diff --git a/APED/app/src/main/java/com/example/aped/utils/TestXML.java b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
index 1179eb8..cdd9fa1 100644
--- a/APED/app/src/main/java/com/example/aped/utils/TestXML.java
+++ b/APED/app/src/main/java/com/example/aped/utils/TestXML.java
@@ -13,6 +13,7 @@ public class TestXML implements IXML {
         List<String> returnList = new ArrayList<>();
         returnList.add("stoff");
         returnList.add("schnaps");
+        returnList.add("whatever");
         return returnList;
     }
 
diff --git a/APED/app/src/main/res/drawable/off_signal.jpg b/APED/app/src/main/res/drawable/off_signal.jpg
new file mode 100644
index 0000000..24cdb07
Binary files /dev/null and b/APED/app/src/main/res/drawable/off_signal.jpg differ