diff --git a/src/components/Bookmarks/BookmarkButton.vue b/src/components/Bookmarks/BookmarkButton.vue
new file mode 100644
index 00000000..2bf216ad
--- /dev/null
+++ b/src/components/Bookmarks/BookmarkButton.vue
@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <v-tooltip top v-if="isBookmark || showEmpty">
+      <template v-slot:activator="{ on }">
+        <v-btn
+          v-on="on"
+          small
+          :class="customClass"
+          :outlined="isTextButton"
+          :icon="!isTextButton"
+          @click.prevent.stop="bookmarkState"
+        >
+          <v-icon v-if="showEmpty" :small="isTextButton">{{ isBookmark ? 'mdi-star' : 'mdi-star-outline' }}</v-icon>
+          <v-icon v-else small>mdi-star</v-icon>
+          <span v-if="isTextButton" class="ml-1 text--secondary">{{ isBookmark ? 'Remove bookmark' : 'Add bookmark' }}</span>
+        </v-btn>
+      </template>
+      <span v-if="!isTextButton">{{ isBookmark ? 'Remove bookmark' : 'Add bookmark' }}</span>
+    </v-tooltip>
+    <BookmarkDialog v-if="showEmpty"
+      v-model="openBookMarkDialog"
+      :alias="alias || ``"
+      :network="network"
+      @added="onBookmarkAdded"
+    />
+  </div>
+</template>
+
+
+<script>
+import BookmarkDialog from "./BookmarkDialog.vue";
+
+export default {
+  name: "BookmarkButton",
+  components: {
+    BookmarkDialog,
+  },
+  props: {
+    address: String,
+    network: String,
+    alias: String,
+    entrypoint: String,
+    customClass: String,
+    size: String,
+    isTextButton: Boolean,
+    showEmpty: Boolean,
+  },
+  data: () => ({
+    items: {},
+    showList: false,
+    isBookmark: false,
+    openBookMarkDialog: false,
+  }),
+  created() {
+    this.bookmarks.registerObserver(this.onBookmarkStateChanged);
+    this.detectBookmark();
+  },
+  computed: {
+    keysCount() {
+        return Object.keys(this.items).length;
+    },
+    bookmarkKey() {
+      return `${this.network}_${this.address}${this.entrypoint ? '_' + this.entrypoint : ''}`
+    }
+  },
+  methods: {
+    bookmarkState() {
+      if (this.isBookmark) {
+        this.bookmarks.remove(this.bookmarkKey);
+      } else {
+        this.openBookMarkDialog = !this.openBookMarkDialog;
+        this.name = this.alias || "";
+        
+      }
+    },
+    detectBookmark() {
+      let bookmarks = this.bookmarks.getAll();
+      this.isBookmark = bookmarks[this.bookmarkKey] !== undefined;
+    },
+    onBookmarkStateChanged(event, key) {
+      if (this.bookmarkKey !== key) {
+        return;
+      }
+      if (event === 'remove') {
+        this.isBookmark = false;
+      } else {
+        this.isBookmark = true;
+      }
+    },
+    onBookmarkAdded(value) {
+      let bookmark = {}
+      if (!this.entrypoint) {
+        bookmark = {
+          network: this.network,
+          address: this.address,
+          alias: value || this.alias,          
+        }
+      } else {
+        bookmark = {
+          network: this.network,
+          address: this.address,
+          entrypoint: this.entrypoint,
+          alias: value || this.alias,          
+        }
+      }
+      this.bookmarks.add(this.bookmarkKey, bookmark);
+      this.openBookMarkDialog = false;
+    },
+  }
+}
+</script>
+
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/components/BookmarkDialog.vue b/src/components/Bookmarks/BookmarkDialog.vue
similarity index 52%
rename from src/components/BookmarkDialog.vue
rename to src/components/Bookmarks/BookmarkDialog.vue
index a666ddc9..b5bcb143 100644
--- a/src/components/BookmarkDialog.vue
+++ b/src/components/Bookmarks/BookmarkDialog.vue
@@ -1,14 +1,14 @@
 <template>
-    <v-dialog v-model="show" max-width="500" @keydown.esc="show = false" @keydown.enter="saveOnEnter" persistent>
+    <v-dialog v-model="show" max-width="550" @keydown.esc="show = false" @keydown.enter="saveOnEnter" persistent>
       <v-card flat outlined>
         <v-card-title class="sidebar d-flex justify-center py-2">
-          <span class="body-1 font-weight-medium text-uppercase text--secondary">Your contract name</span>
+          <span class="body-1 font-weight-medium text-uppercase text--secondary">Your bookmark name</span>
           <v-spacer></v-spacer>
           <v-btn icon small @click.stop="show = false">
             <v-icon>mdi-close</v-icon>
           </v-btn>
         </v-card-title>
-        <v-card-text class="pt-6 pb-0">
+        <v-card-text class="pt-3 pb-0">
           <v-text-field
               v-model="name"
               hide-details
@@ -18,8 +18,21 @@
               >
           </v-text-field>
         </v-card-text>
-        <v-card-actions class="justify-end px-5">
-          <v-btn color="primary" text @click="add">Add bookmark</v-btn>
+        <v-card-actions class="pb-3 px-6 d-flex justify-space-between justify-end align-end">
+          <div>
+            <span class="text--disabled">In bookmarks, will look like:</span>
+            <v-list-item v-if="name" class="item py-0 mt-1 px-3">
+              <v-list-item-content class="pa-0">
+                
+                <v-list-item-title>{{ name }}</v-list-item-title>
+                <v-list-item-subtitle class="overline">{{ network }}</v-list-item-subtitle>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-icon color="primary">mdi-star</v-icon>
+              </v-list-item-action>
+            </v-list-item>
+          </div>
+          <v-btn class="d-flex justify-center" color="primary" text @click="add">Add</v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>
@@ -30,7 +43,8 @@ export default {
     name: "BookmarkDialog",
     props: {
         value: Boolean,
-        alias: String
+        alias: String,
+        network: String,
     },
     data: () => ({
         name: ""
@@ -62,4 +76,17 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+  .item-text {
+    max-width: 315px !important;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .item {
+    max-width: 380px !important;
+    background-color: var(--v-data-base) !important;
+  }
+</style>
diff --git a/src/components/Bookmarks.vue b/src/components/Bookmarks/Bookmarks.vue
similarity index 81%
rename from src/components/Bookmarks.vue
rename to src/components/Bookmarks/Bookmarks.vue
index 93c3ea1a..d7cb67b2 100644
--- a/src/components/Bookmarks.vue
+++ b/src/components/Bookmarks/Bookmarks.vue
@@ -1,13 +1,13 @@
 <template>
     <v-menu offset-y max-height="500" max-width="400">
       <template v-slot:activator="{ on, attrs }">
-        <v-btn class="btn-class text--secondary" icon v-bind="attrs" v-on="on">
+        <v-btn class="btn-class text--secondary" icon v-bind="attrs" v-on="on" @click="updateBookmarks">
             <v-icon v-if="keysCount > 0">mdi-star</v-icon>
             <v-icon v-else>mdi-star-outline</v-icon>
         </v-btn>
       </template>
       <v-list v-if="keysCount > 0" class="pa-0">
-        <v-list-item v-for="(item, index) in items" :key="index" :to="`/${item.network}/${item.address}/operations`">
+        <v-list-item v-for="(item, index) in items" :key="index" :to="getItemLink(item)">
             <v-list-item-content>
                 <v-list-item-title>{{ item.alias || item.address }}</v-list-item-title>
                 <v-list-item-subtitle class="overline">{{ item.network }}</v-list-item-subtitle>
@@ -21,7 +21,7 @@
       </v-list>
       <v-list v-else>
         <v-list-item>
-            <v-list-item-subtitle>You don't have favorite accounts yet. Add them by clicking on ⭐️ on the account page.</v-list-item-subtitle>
+            <span class="text--secondary">You don't have favorite accounts yet. Add them by clicking on ⭐️ on the account page or on the Interact tab.</span>
         </v-list-item>
       </v-list>
     </v-menu>
@@ -55,7 +55,10 @@ export default {
     },
     onStatusChanged() {
         this.updateBookmarks();
-    }
+    },
+    getItemLink(item) {
+        return `/${item.network}/${item.address}${item.entrypoint ? '/interact/' + item.entrypoint : ''}`;
+    },
   }
 }
 </script>
diff --git a/src/components/MainHeaderDescriptive.vue b/src/components/MainHeaderDescriptive.vue
index 950fcf64..683b5e25 100644
--- a/src/components/MainHeaderDescriptive.vue
+++ b/src/components/MainHeaderDescriptive.vue
@@ -39,7 +39,7 @@
 import SocialsList from "./SocialsList";
 import SearchBox from "./SearchBox";
 import ThemeSwitcher from "./ThemeSwitcher";
-import Bookmarks from "./Bookmarks";
+import Bookmarks from "./Bookmarks/Bookmarks";
 import ConnectWallet from "@/components/ConnectWallet";
 
 export default {
diff --git a/src/components/schema/schemaComponents/SchemaHeader.vue b/src/components/schema/schemaComponents/SchemaHeader.vue
index f5aad4b2..f29886a4 100644
--- a/src/components/schema/schemaComponents/SchemaHeader.vue
+++ b/src/components/schema/schemaComponents/SchemaHeader.vue
@@ -4,15 +4,28 @@
       <span class="hash">{{ header }}</span>
       <span class="accent--text">{{ isForkPage ? (alias || shortcutOnly(address)) : storageName }}</span>
     </div>
+    <BookmarkButton v-if="isInteractPage"
+      :customClass="'text--secondary'"
+      showEmpty
+      :key="storageName"
+      :network="network"
+      :address="address"
+      :entrypoint="storageName"
+      :alias="`${storageName} ${alias}`"
+    />
   </h2>
 </template>
 
 <script>
 import { shortcutOnly } from "../../../utils/tz";
 import {mapActions} from "vuex";
+import BookmarkButton from "../../Bookmarks/BookmarkButton.vue";
 
 export default {
   name: "SchemaHeader",
+  components: {
+    BookmarkButton,
+  },
   props: {
     isStorage: Boolean,
     storageHtml: String,
@@ -22,23 +35,47 @@ export default {
     alias: String,
     network: String,
   },
-  methods: {
-    ...mapActions(["showClipboardOK"]),
-    shortcutOnly,
+  data: () => ({
+    page: '',
+  }),
+  created() {
+    this.setPage();
   },
   computed: {
     isForkPage() {
-      return this.$route.name === 'fork';
+      return this.page === 'fork';
+    },
+    isInteractPage() {
+      return this.page === 'interact';
     },
     header() {
-      if (this.$route.name === 'fork') {
+      if (this.page === 'fork') {
         return 'Fork: ';
       }
-      if (this.$route.name === 'deploy') {
+      if (this.page === 'deploy') {
         return 'Deploy';
       }
       return 'Interact: '
     }
   },
+  methods: {
+    ...mapActions(["showClipboardOK"]),
+    shortcutOnly,
+
+    setPage() {
+      if (this.$route.name === 'fork') {
+        this.page = 'fork';
+      } else if (this.$route.name === 'deploy') {
+        this.page = 'deploy';
+      } else {
+        this.page = 'interact';
+      }
+    },
+  },
+  watch: {
+    $route() {
+      this.setPage()
+    },
+  },
 }
 </script>
diff --git a/src/views/contract/Contract.vue b/src/views/contract/Contract.vue
index c92af69d..ef5794bd 100644
--- a/src/views/contract/Contract.vue
+++ b/src/views/contract/Contract.vue
@@ -11,15 +11,14 @@
       </v-col>
       <v-col cols="3" class="d-flex justify-end pr-7">
         <div class="d-flex align-center justify-start pa-2 px-4">
-          <v-btn
-            class="mr-2 pl-2 pr-2 text--secondary"
-            outlined
-            small
-            @click="bookmarkState"
-          >
-            <v-icon class="text--secondary" small>{{ isBookmark ? 'mdi-star' : 'mdi-star-outline' }}</v-icon>
-            <span class="ml-1 text--secondary">{{ isBookmark ? 'Remove bookmark' : 'Add bookmark' }}</span>
-          </v-btn>
+          <BookmarkButton
+            :customClass="'mr-2 pl-2 pr-2 text--secondary'"
+            :isTextButton=true
+            :showEmpty=true
+            :network="network"
+            :address="address"
+            :alias="alias"
+          />
           <v-btn
             class="mr-2 pl-2 pr-2 text--secondary"
             outlined
@@ -80,7 +79,6 @@
         :on-chain-views="onChainViews"
       ></router-view>
 
-      <BookmarkDialog v-model="openBookMarkDialog" :alias="alias || ``" @added="onBookmarkAdded"/>
     </VContainer>
   </div>
 </template>
@@ -92,7 +90,7 @@ import {toTitleCase} from "../../utils/string";
 import {shortcutOnly} from "../../utils/tz";
 import MenuToolbar from "./MenuToolbar";
 import Tags from "../../components/Tags";
-import BookmarkDialog from "@/components/BookmarkDialog.vue";
+import BookmarkButton from "../../components/Bookmarks/BookmarkButton.vue";
 import {openTzktContract} from "../../utils/tzkt";
 import {DATA_LOADING_STATUSES} from "../../utils/network";
 import {applyStyles} from "../../utils/styles";
@@ -104,7 +102,7 @@ export default {
   components: {
     Tags,
     MenuToolbar,
-    BookmarkDialog
+    BookmarkButton,
   },
   props: {
     network: String,
@@ -123,8 +121,6 @@ export default {
     isComboBoxExpanded: false,
     onChainViews: [],
     onChainViewsLoadingStatus: DATA_LOADING_STATUSES.NOTHING,
-    isBookmark: false,
-    openBookMarkDialog: false,
     alias: undefined
   }),
   computed: {
@@ -175,9 +171,6 @@ export default {
       ];
     },
   },
-  created() {
-    this.getInfo();
-  },
   destroyed() {
     this.hideError();
   },
@@ -219,13 +212,12 @@ export default {
       this.isComboBoxExpanded = false;
     },
     async init() {
+      await this.getInfo();
       this.tokensTotal = 0;
       this.metadata = null;
 
       this.alias = await this.getAlias(this.network, this.address);
       if (this.isContract) {
-        this.bookmarks.registerObserver(this.onBookmarkStateChanged);
-        this.detectBookmark();
         this.getContract();
         this.loadOnChainViews();
       } else {
@@ -295,49 +287,8 @@ export default {
           this.showError(err);
         });
     },
-    bookmarkState() {
-      let key = `${this.network}_${this.address}`;
-      if (this.isBookmark) {
-        this.bookmarks.remove(key);
-      } else {
-        this.openBookMarkDialog = !this.openBookMarkDialog;
-        this.name = this.alias || "";
-        
-      }
-    },
-    detectBookmark() {
-      let key = `${this.network}_${this.address}`;
-      let bookmarks = this.bookmarks.getAll();
-      this.isBookmark = bookmarks[key] !== undefined;
-    },
-    onBookmarkStateChanged(event, key) {
-      let currentKey = `${this.network}_${this.address}`;
-      if (currentKey !== key) {
-        return;
-      }
-      if (event === 'remove') {
-        this.isBookmark = false;
-      } else {
-        this.isBookmark = true;
-      }
-    },
-    onBookmarkAdded(value) {
-      let key = `${this.network}_${this.address}`;
-      this.bookmarks.add(key, {
-        network: this.network,
-        address: this.address,
-        alias: value || this.alias,          
-      })
-      this.openBookMarkDialog = false;
-    },
   },
   watch: {
-    accountType: {
-      immediate: true,
-      handler() {
-        this.init();
-      }
-    },
     address: {
       immediate: true,
       handler() {
diff --git a/src/views/contract/InteractTab.vue b/src/views/contract/InteractTab.vue
index f4080124..dcb76a91 100644
--- a/src/views/contract/InteractTab.vue
+++ b/src/views/contract/InteractTab.vue
@@ -20,6 +20,13 @@
                   <span v-else class="text--disabled">NO NAME</span>
                 </v-list-item-title>
               </v-list-item-content>
+              <BookmarkButton
+                :key="item.name"
+                :customClass="'primary--text'"
+                :network="network"
+                :address="address"
+                :entrypoint="item.name"
+              />
             </v-list-item>
           </v-list-item-group>
         </v-skeleton-loader>
@@ -73,6 +80,7 @@ import { applyStyles } from '@/utils/styles.js';
 import { isOperationHash } from '@/utils/tz.js';
 import Schema from "@/components/schema/Schema.vue";
 import TypeDef from "@/views/contract/TypeDef";
+import BookmarkButton from "../../components/Bookmarks/BookmarkButton.vue";
 
 export default {
   name: "InteractTab",
@@ -84,7 +92,8 @@ export default {
   },
   components: {
     Schema,
-    TypeDef
+    TypeDef,
+    BookmarkButton,
   },
   data: () => ({
     loading: true,
diff --git a/src/views/contract/MenuToolbar.vue b/src/views/contract/MenuToolbar.vue
index 44d5b6dd..920b84f5 100644
--- a/src/views/contract/MenuToolbar.vue
+++ b/src/views/contract/MenuToolbar.vue
@@ -71,7 +71,7 @@ export default {
           text: 'Code',
         },{
           to: this.pushTo({ name: 'interact' }),
-          icon: 'play-box-outline',
+          icon: 'mdi-play-box-outline',
           text: 'Interact',
         })
 
diff --git a/src/views/opg/CallStackItem.vue b/src/views/opg/CallStackItem.vue
index 3ebaff02..124f6e55 100644
--- a/src/views/opg/CallStackItem.vue
+++ b/src/views/opg/CallStackItem.vue
@@ -39,7 +39,7 @@ export default {
         },
         setClassAndValue() {
             if (this.operation.tag) {
-                this.itemClass = "'hash accent--text'";
+                this.itemClass = 'hash accent--text';
                 this.itemValue = 'event ' + this.operation.tag;
             } else if (this.operation.kind === 'transfer_ticket') {
                 this.itemClass = 'hash accent--text';