diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
index b90b11026e5..f3f6548dfc5 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
@@ -146,13 +146,13 @@ public final class CollectionViewerPanel extends JPanel {
         JLabel label4 = new JLabel("Show cards or tokens:");
         label3.setAlignmentX(Component.LEFT_ALIGNMENT);
         label3.setForeground(Color.white);
-        jPanel1.add(label4);
+        // spjspj - put back in after reorg of tokens -- jPanel1.add(label4);
 
         JCheckBox cardsOrTokens = new JCheckBox("Display Cards");
         cardsOrTokens.setSelected(true);
         cardsOrTokens.setToolTipText("Select to show Cards or Tokens(and emblems) for the chosen set");
         cardsOrTokens.addActionListener(e -> mageBook.cardsOrTokens(cardsOrTokens.isSelected()));
-        jPanel1.add(cardsOrTokens);
+        // spjspj - put back in after reorg of tokens -- jPanel1.add(cardsOrTokens);
 
         formats.addActionListener(e -> {
             if (mageBook != null) {
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 68c2d0e5d27..5a05b4347e3 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -525,16 +525,12 @@
 |Generate|TOK:M13|Wurm||
 
 |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo|
-|Generate|TOK:AVR|Angel|1|
-|Generate|TOK:AVR|Angel|2|
-|Generate|TOK:AVR|Angel|3|
+|Generate|TOK:AVR|Angel||
+|Generate|TOK:AVR|Demon||
 |Generate|TOK:AVR|Human|1|
 |Generate|TOK:AVR|Human|2|
 |Generate|TOK:AVR|Spirit|1|
 |Generate|TOK:AVR|Spirit|2|
-|Generate|TOK:AVR|Demon|1|
-|Generate|TOK:AVR|Demon|2|
-|Generate|TOK:AVR|Demon|3|
 |Generate|TOK:AVR|Zombie||
 
 |Generate|EMBLEM:DDI|Venser, the Sojourner||Emblem Venser|