diff --git a/src/assets/images/weapons/expandable-baton-closed.jpg b/src/assets/images/weapons/expandable-baton-closed.jpg
new file mode 100644
index 0000000..f7510e7
Binary files /dev/null and b/src/assets/images/weapons/expandable-baton-closed.jpg differ
diff --git a/src/assets/images/weapons/expandable-baton.jpg b/src/assets/images/weapons/expandable-baton.jpg
new file mode 100644
index 0000000..8f0771f
Binary files /dev/null and b/src/assets/images/weapons/expandable-baton.jpg differ
diff --git a/src/assets/images/zombies/ZombieCop.png b/src/assets/images/zombies/ZombieCop.png
new file mode 100644
index 0000000..97c68ff
Binary files /dev/null and b/src/assets/images/zombies/ZombieCop.png differ
diff --git a/src/components/SoundBlock/index.js b/src/components/SoundBlock/index.js
index 77bf8de..2a8e944 100644
--- a/src/components/SoundBlock/index.js
+++ b/src/components/SoundBlock/index.js
@@ -73,9 +73,9 @@ const SoundBlock = ({
     slotType !== IN_BACKPACK &&
     type !== ITEMS &&
     type !== WOUND &&
-    name === 'SniperRifle'
+    name === 'Sniper Rifle'
       ? 'Rifle'
-      : name;
+      : name.replace(' ', '');
 
   const getImage = () => {
     if (((trade && isMobile) || isMobile) && type !== ACTIVATIONS) {
@@ -112,8 +112,6 @@ const SoundBlock = ({
     return <PlayText>{label || name}</PlayText>;
   };
 
-  console.log('$$$ isMobile', isMobile);
-
   const play = () => {
     if (
       type === WEAPONS &&
@@ -170,6 +168,7 @@ const SoundBlock = ({
       <PlayImageButton
         canAttack={canAttack}
         isActive={isActive}
+        isText={!img}
         damageMode={damageMode}
         onClick={damageMode || trade || setupMode ? onClickCard : play}
         setupMode={setupMode}
diff --git a/src/constants/definitions.js b/src/constants/definitions.js
index 2ac5455..3f083c7 100644
--- a/src/constants/definitions.js
+++ b/src/constants/definitions.js
@@ -19,3 +19,4 @@ export const WEAPONS = 'weapons';
 export const WOUND = 'wound';
 export const WOUNDED = 'Wounded';
 export const XP = 'XP';
+export const ZOMBIE = 'zombie';
diff --git a/src/setup/items.js b/src/setup/items.js
index 5b69d36..ce88322 100644
--- a/src/setup/items.js
+++ b/src/setup/items.js
@@ -86,7 +86,7 @@ export const ITEMS_MALL = {
   }
 };
 
-export const ITEMS_TD = {
+export const ITEMS_NIGHT_SHIFT = {
   GasMask: {
     img: GasMask,
     name: 'GasMask',
@@ -124,7 +124,7 @@ export const ITEMS_TD = {
   }
 };
 
-const selectedSets = [ITEMS_S1, ITEMS_MALL, ITEMS_TD];
+const selectedSets = [ITEMS_S1, ITEMS_MALL, ITEMS_NIGHT_SHIFT];
 
 export const setupItems = sets => {
   let allItems = {};
diff --git a/src/setup/weapons.js b/src/setup/weapons.js
index 57c54b5..9fda072 100644
--- a/src/setup/weapons.js
+++ b/src/setup/weapons.js
@@ -8,6 +8,8 @@ import Crowbar from '../assets/images/weapons/crowbar.jpg';
 import DesertEagle from '../assets/images/weapons/desert-eagle.jpg';
 import DoubleBarrel from '../assets/images/weapons/double-barreled-shotgun.jpg';
 import EvilTwins from '../assets/images/weapons/evil-twins.jpg';
+import ExpandableBaton from '../assets/images/weapons/expandable-baton.jpg';
+import ExpandableBatonClosed from '../assets/images/weapons/expandable-baton-closed.jpg';
 import FireAxe from '../assets/images/weapons/fire-axe.jpg';
 import Flashbang from '../assets/images/weapons/flashbang.jpg';
 import Katana from '../assets/images/weapons/katana.jpg';
@@ -41,7 +43,7 @@ export const WEAPONS_S1 = {
     attack: MELEE,
     dice: 1,
     img: BaseballBat,
-    name: 'BaseballBat',
+    name: 'Baseball Bat',
     noise: false,
     type: WEAPONS
   },
@@ -67,7 +69,7 @@ export const WEAPONS_S1 = {
     attack: RANGED,
     dice: 2,
     img: EvilTwins,
-    name: 'EvilTwins',
+    name: 'Evil Twins',
     noise: true,
     type: WEAPONS
   },
@@ -76,7 +78,7 @@ export const WEAPONS_S1 = {
     attack: MELEE,
     dice: 1,
     img: FireAxe,
-    name: 'FireAxe',
+    name: 'Fire Axe',
     noise: false,
     type: WEAPONS
   },
@@ -92,7 +94,7 @@ export const WEAPONS_S1 = {
     attack: MELEE_RANGED,
     dice: 2,
     img: MasShotgun,
-    name: 'MasShotgun',
+    name: 'Mas Shotgun',
     noise: SPECIAL,
     type: WEAPONS
   },
@@ -142,7 +144,7 @@ export const WEAPONS_S1 = {
     attack: RANGED,
     dice: 2,
     img: SawedOff,
-    name: 'SawedOff',
+    name: 'Sawed Off',
     noise: true,
     type: WEAPONS
   },
@@ -158,7 +160,7 @@ export const WEAPONS_S1 = {
     attack: RANGED,
     dice: 1,
     img: SniperRifle,
-    name: 'SniperRifle',
+    name: 'Sniper Rifle',
     noise: true,
     type: WEAPONS
   },
@@ -177,7 +179,7 @@ export const WEAPONS_MALL = {
     attack: RANGED,
     dice: 3,
     img: AssaultRifle,
-    name: 'AssaultRifle',
+    name: 'Assault Rifle',
     noise: true,
     type: WEAPONS
   }
@@ -188,7 +190,7 @@ export const WEAPONS_S2 = {
     attack: RANGED,
     dice: 3,
     img: AutomaticShotgun,
-    name: 'AutomaticShotgun',
+    name: 'Automatic Shotgun',
     noise: true,
     type: WEAPONS
   },
@@ -207,7 +209,7 @@ export const WEAPONS_S3 = {
     attack: RANGED,
     dice: 2,
     img: DoubleBarrel,
-    name: 'DoubleBarrel',
+    name: 'Double Barrel',
     noise: true,
     type: WEAPONS
   },
@@ -226,18 +228,18 @@ export const WEAPONS_OTHERS = {
     attack: RANGED,
     dice: 1,
     img: DesertEagle,
-    name: 'DesertEagle',
+    name: 'Desert Eagle',
     noise: false,
     type: WEAPONS
   }
 };
 
-export const WEAPONS_TD = {
+export const WEAPONS_NIGHT_SHIFT = {
   AutomaticShotgun: {
     attack: RANGED,
     dice: 3,
     img: AutomaticShotgun,
-    name: 'AutomaticShotgun',
+    name: 'Automatic Shotgun',
     noise: true,
     type: WEAPONS
   },
@@ -246,7 +248,7 @@ export const WEAPONS_TD = {
     attack: MELEE,
     dice: 2,
     img: BatteringRam,
-    name: 'BatteringRam',
+    name: 'Battering Ram',
     noise: false,
     type: WEAPONS
   },
@@ -255,10 +257,20 @@ export const WEAPONS_TD = {
     attack: RANGED,
     dice: 1,
     img: ColtPython,
-    name: 'ColtPython',
+    name: 'Colt Python',
     noise: true,
     type: WEAPONS
   },
+
+  ExpandableBaton: {
+    altImage: ExpandableBatonClosed,
+    attack: MELEE,
+    dice: 1,
+    img: ExpandableBaton,
+    name: 'Expandable Baton',
+    noise: false,
+    type: WEAPONS
+  },
   Flashbang: {
     attack: RANGED,
     dice: 0,
@@ -276,19 +288,11 @@ export const WEAPONS_TD = {
     noise: true,
     type: WEAPONS
   },
-  NightStick: {
-    attack: MELEE,
-    dice: 1,
-    img: NightStick,
-    name: 'NightStick',
-    noise: false,
-    type: WEAPONS
-  },
   SamuraiEdge: {
     attack: RANGED,
     dice: 1,
     img: SamuraiEdge,
-    name: 'SamuraiEdge',
+    name: 'Samurai Edge',
     noise: true,
     type: WEAPONS
   },
@@ -296,7 +300,7 @@ export const WEAPONS_TD = {
     attack: RANGED,
     dice: 0,
     img: SmokeGrenade,
-    name: 'SmokeGrenade',
+    name: 'Smoke Grenade',
     noise: false,
     type: WEAPONS
   },
@@ -304,7 +308,7 @@ export const WEAPONS_TD = {
     attack: RANGED,
     dice: 0,
     img: TaserGun,
-    name: 'TaserGun',
+    name: 'Taser Gun',
     noise: false,
     type: WEAPONS
   }
@@ -316,7 +320,7 @@ const selectedSets = [
   WEAPONS_S2,
   WEAPONS_S3,
   WEAPONS_OTHERS,
-  WEAPONS_TD
+  WEAPONS_NIGHT_SHIFT
 ];
 
 export const setupWeapons = sets => {
diff --git a/src/setup/zombies.js b/src/setup/zombies.js
index 5c9a0fd..4380578 100644
--- a/src/setup/zombies.js
+++ b/src/setup/zombies.js
@@ -16,38 +16,45 @@ import WalkerIntro from '../assets/images/zombies/Walker.png';
 import RunnerIntro from '../assets/images/zombies/Runner.png';
 import FattyIntro from '../assets/images/zombies/Fatty.png';
 import AbominationIntro from '../assets/images/zombies/Abomination.png';
+import NightShiftIntro from '../assets/images/zombies/ZombieCop.png';
+import { ZOMBIE } from '../constants';
 
 export const ZOMBIES_S1 = {
   Walker: {
     img: Walker,
     imgSmall: WalkerSmall,
     name: 'Walker',
-    sounds: 9
+    sounds: 9,
+    type: ZOMBIE
   },
   Runner: {
     img: Runner,
     imgSmall: RunnerSmall,
     name: 'Runner',
     sounds: 5,
-    special: 'Instant kill'
+    special: 'Instant kill',
+    type: ZOMBIE
   },
   Fatty: {
     img: Fatty,
     imgSmall: FattySmall,
     name: 'Fatty',
-    sounds: 5
+    sounds: 5,
+    type: ZOMBIE
   },
   Abomination: {
     img: Abomination,
     imgSmall: AbominationSmall,
     name: 'Abomination',
-    sounds: 4
+    sounds: 4,
+    type: ZOMBIE
   },
   Horde: {
     img: Horde,
     imgSmall: HordeSmall,
     name: 'Horde',
     sounds: 2,
+    type: ZOMBIE,
     special: 'Feast on survivor'
   }
 };
@@ -58,7 +65,8 @@ export const DOGZ = {
     imgSmall: DogzSmall,
     name: 'Dogz',
     sounds: 5,
-    special: 'Instant kill'
+    special: 'Instant kill',
+    type: ZOMBIE
   }
 };
 
@@ -67,7 +75,8 @@ export const ZOMBIES_INTRO = [
   RunnerIntro,
   FattyIntro,
   AbominationIntro,
-  DogzIntro
+  DogzIntro,
+  NightShiftIntro
 ];
 
 const selectedSets = [ZOMBIES_S1, DOGZ];
diff --git a/src/utils/items.js b/src/utils/items.js
index 94d0e80..1f7fb9c 100644
--- a/src/utils/items.js
+++ b/src/utils/items.js
@@ -20,14 +20,15 @@ export const checkIfCharacterCanOpenDoors = currentItems => {
 };
 
 export const getItemPhoto = item => {
-  if (Object.keys(SPECIALS_CARDS).find(name => item === name)) {
-    return SPECIALS_CARDS[item].img;
+  const photoName = item.replace(' ', '');
+  if (Object.keys(SPECIALS_CARDS).find(name => photoName === name)) {
+    return SPECIALS_CARDS[photoName].img;
   }
-  if (Object.keys(ALL_WEAPONS).find(name => item === name)) {
-    return ALL_WEAPONS[item].img;
+  if (Object.keys(ALL_WEAPONS).find(name => photoName === name)) {
+    return ALL_WEAPONS[photoName].img;
   }
-  if (Object.keys(ALL_ITEMS).find(name => item === name)) {
-    return ALL_ITEMS[item].img;
+  if (Object.keys(ALL_ITEMS).find(name => photoName === name)) {
+    return ALL_ITEMS[photoName].img;
   }
   return null;
 };