diff --git a/src/components/common/PinButton.js b/src/components/common/PinButton.js
index d2be8d929..f2b27c844 100644
--- a/src/components/common/PinButton.js
+++ b/src/components/common/PinButton.js
@@ -16,39 +16,26 @@ const PinButton = ({ item }) => {
   const [isPinned, setPinned] = useState(item?.settings?.isPinned);
 
   const handlePin = () => {
-    const { settings } = item;
-    settings.isPinned = true;
+    const newState = !isPinned;
 
-    editItem.mutate({
-      id: item.id,
-      // use item login tag id
-      name: item.name,
-      settings: item.settings,
-    });
-
-    setPinned(true);
-  };
+    setPinned(newState);
 
-  const handleUnpin = () => {
     const { settings } = item;
-    settings.isPinned = false;
+    settings.isPinned = newState;
 
     editItem.mutate({
       id: item.id,
-      // use item login tag id
       name: item.name,
       settings: item.settings,
     });
-
-    setPinned(false);
   };
 
   return (
     <Tooltip title={isPinned ? t('Unpin') : t('Pin')}>
       <IconButton
-        aria-label="favorite"
+        aria-label={isPinned ? t('Unpin') : t('Pin')}
         className={PIN_ITEM_BUTTON_CLASS}
-        onClick={isPinned ? handleUnpin : handlePin}
+        onClick={handlePin}
       >
         {isPinned ? (
           <PushPinIcon fontSize="small" />
diff --git a/src/components/item/settings/ItemSettings.js b/src/components/item/settings/ItemSettings.js
index 61e7b2148..fa1fe7188 100644
--- a/src/components/item/settings/ItemSettings.js
+++ b/src/components/item/settings/ItemSettings.js
@@ -65,7 +65,7 @@ const ItemSettings = ({ item }) => {
 
       <FormGroup>
         <FormControlLabel
-          label="Pin Item"
+          label={t('Pin')}
           control={(
             <Switch
               id={SETTINGS_PINNED_TOGGLE}
@@ -76,7 +76,7 @@ const ItemSettings = ({ item }) => {
           )}
         />
         <FormControlLabel
-          label="Show Chatbox"
+          label={t('Show Chat')}
           control={(
             <Switch
               id={SETTINGS_CHATBOX_TOGGLE}
diff --git a/src/components/main/Home.js b/src/components/main/Home.js
index b1644e0c0..95325ff23 100644
--- a/src/components/main/Home.js
+++ b/src/components/main/Home.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { withRouter } from 'react-router';
-import { List } from 'immutable';
 import { hooks } from '../../config/queryClient';
 import ItemHeader from '../item/header/ItemHeader';
 import Items from './Items';
@@ -33,7 +32,7 @@ const Home = () => {
       <Items
         id={OWNED_ITEMS_ID}
         title={t('My Items')}
-        items={List(ownItems)}
+        items={ownItems}
         headerElements={[<NewItemButton fontSize="small" />]}
       />
     </Main>
diff --git a/src/langs/en.json b/src/langs/en.json
index cd19d2c3b..de87a1f8b 100644
--- a/src/langs/en.json
+++ b/src/langs/en.json
@@ -128,6 +128,9 @@
     "Authenticated Members": "Authenticated Members",
     "Username and Password": "Username and Password",
     "Username": "Username",
-    "No user has authenticated to this item yet.": "No user has authenticated to this item yet."
+    "No user has authenticated to this item yet.": "No user has authenticated to this item yet.",
+    "Pin": "Pin this item",
+    "Unpin": "Unpin this item",
+    "Show Chat": "Show Chat"
   }
 }
diff --git a/src/langs/fr.json b/src/langs/fr.json
index a187b6638..5c76a4730 100644
--- a/src/langs/fr.json
+++ b/src/langs/fr.json
@@ -128,6 +128,9 @@
     "Authenticated Members": "Membres Connectés",
     "Username and Password": "Nom d'utilisateur et Mot de passe",
     "Username": "Nom d'utilisateur",
-    "No user has authenticated to this item yet.": "Aucun utilisateur ne s'est encore connecté à cet élément."
+    "No user has authenticated to this item yet.": "Aucun utilisateur ne s'est encore connecté à cet élément.",
+    "Pin": "Epingler cet élément",
+    "Unpin": "Détacher cet élément",
+    "Show Chat": "Afficher le chat"
   }
 }