diff --git a/app/src/main/java/pt/samp/scrumCards/Card.java b/app/src/main/java/pt/samp/scrumCards/Card.java
index ce64893..5496a6b 100644
--- a/app/src/main/java/pt/samp/scrumCards/Card.java
+++ b/app/src/main/java/pt/samp/scrumCards/Card.java
@@ -18,7 +18,9 @@ final class Card {
         R.id.card20,
         R.id.card40,
         R.id.card100,
-        R.id.cardq
+        R.id.cardquestion,
+        R.id.cardinfinite,
+        R.id.cardcoffee
     };
 
     private static final int[] IMAGES = new int[] {
@@ -33,7 +35,9 @@ final class Card {
         R.drawable.card_big_20,
         R.drawable.card_big_40,
         R.drawable.card_big_100,
-        R.drawable.card_big_question
+        R.drawable.card_big_question,
+        R.drawable.card_big_infinite,
+        R.drawable.card_big_coffee
     };
 
     public static ImageView createCardView(Context context, ViewGroup parent, int position) {
diff --git a/app/src/main/res/drawable-nodpi/card_big_coffee.png b/app/src/main/res/drawable-nodpi/card_big_coffee.png
new file mode 100644
index 0000000..c432d57
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/card_big_coffee.png differ
diff --git a/app/src/main/res/drawable-nodpi/card_big_infinite.png b/app/src/main/res/drawable-nodpi/card_big_infinite.png
new file mode 100644
index 0000000..6e163cc
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/card_big_infinite.png differ
diff --git a/app/src/main/res/drawable-nodpi/card_small_coffee.png b/app/src/main/res/drawable-nodpi/card_small_coffee.png
new file mode 100644
index 0000000..0b56b70
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/card_small_coffee.png differ
diff --git a/app/src/main/res/drawable-nodpi/card_small_infinite.png b/app/src/main/res/drawable-nodpi/card_small_infinite.png
new file mode 100644
index 0000000..1c1c64b
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/card_small_infinite.png differ
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 2841b71..dfe13ff 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/main_window">
-     <LinearLayout style="@style/card_option_line">
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
-    </LinearLayout>
     <LinearLayout style="@style/card_option_line">
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_3" android:id="@+id/card3" />
+    </LinearLayout>
+    <LinearLayout style="@style/card_option_line">
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_5" android:id="@+id/card5" />
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_8" android:id="@+id/card8" />
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_13" android:id="@+id/card13" />
-    </LinearLayout>
-    <LinearLayout style="@style/card_option_line">
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_20" android:id="@+id/card20" />
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_40" android:id="@+id/card40" />
+    </LinearLayout>
+    <LinearLayout style="@style/card_option_line">
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_100" android:id="@+id/card100" />
-        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardq" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardquestion" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_infinite" android:id="@+id/cardinfinite" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_coffee" android:id="@+id/cardcoffee" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index c04b808..a14ef42 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" style="@style/main_window">
-     <LinearLayout style="@style/card_option_line">
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
-         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
+    <LinearLayout style="@style/card_option_line">
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_0" android:id="@+id/card0" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1_2" android:id="@+id/card1_2" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_1" android:id="@+id/card1" />
     </LinearLayout>
     <LinearLayout style="@style/card_option_line">
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_2" android:id="@+id/card2" />
@@ -18,6 +18,10 @@
     <LinearLayout style="@style/card_option_line">
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_40" android:id="@+id/card40" />
         <ImageView style="@style/card_option_item" android:src="@drawable/card_small_100" android:id="@+id/card100" />
-        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardq" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_question" android:id="@+id/cardquestion" />
+    </LinearLayout>
+    <LinearLayout style="@style/card_option_line">
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_infinite" android:id="@+id/cardinfinite" />
+        <ImageView style="@style/card_option_item" android:src="@drawable/card_small_coffee" android:id="@+id/cardcoffee" />
     </LinearLayout>
 </LinearLayout>