diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69da9696f..5664e5551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf iclass creditepurse` command to allow crediting the epurse debit value (@nvx)
  - Modified `hf iclass configcard` to only support online mode (@Antiklesys)
  - Modified `hf iclass configcard` command to generate config cards without a cardhelper module by porting the contents of blocks 6 & 7 from nfc-iclass (@Antiklesys)
+ - Fixed multiple online iclass commands showing incorrectly in offline mode (@Antiklesys)
 
 ## [Raccoon.4.17140][2023-09-09]
  - Changed text and adjust pm3_test case for mf_aes_brute (@doegox)
diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index f93d73b20..d79cad63e 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -4472,18 +4472,18 @@ static int CmdHFiClassSAM(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",        CmdHelp,                    AlwaysAvailable, "This help"},
-    {"list",        CmdHFiClassList,            AlwaysAvailable, "List iclass history"},
+    {"list",        CmdHFiClassList,            IfPm3Iclass,     "List iclass history"},
     {"-----------", CmdHelp,                    AlwaysAvailable, "--------------------- " _CYAN_("general") " ---------------------"},
 //    {"clone",       CmdHFiClassClone,           IfPm3Iclass,     "Create a HID credential to Picopass / iCLASS tag"},
     {"dump",        CmdHFiClassDump,            IfPm3Iclass,     "Dump Picopass / iCLASS tag to file"},
-    {"info",        CmdHFiClassInfo,            AlwaysAvailable, "Tag information"},
+    {"info",        CmdHFiClassInfo,            IfPm3Iclass,     "Tag information"},
     {"rdbl",        CmdHFiClass_ReadBlock,      IfPm3Iclass,     "Read Picopass / iCLASS block"},
     {"reader",      CmdHFiClassReader,          IfPm3Iclass,     "Act like a Picopass / iCLASS reader"},
     {"restore",     CmdHFiClassRestore,         IfPm3Iclass,      "Restore a dump file onto a Picopass / iCLASS tag"},
     {"sniff",       CmdHFiClassSniff,           IfPm3Iclass,     "Eavesdrop Picopass / iCLASS communication"},
     {"view",        CmdHFiClassView,            AlwaysAvailable, "Display content from tag dump file"},
     {"wrbl",        CmdHFiClass_WriteBlock,     IfPm3Iclass,     "Write Picopass / iCLASS block"},
-    {"creditepurse", CmdHFiClassCreditEpurse,    IfPm3Iclass,     "Credit epurse value"},
+    {"creditepurse", CmdHFiClassCreditEpurse,   IfPm3Iclass,     "Credit epurse value"},
     {"-----------", CmdHelp,                    AlwaysAvailable, "--------------------- " _CYAN_("recovery") " --------------------"},
 //    {"autopwn",     CmdHFiClassAutopwn,         IfPm3Iclass,     "Automatic key recovery tool for iCLASS"},
     {"chk",         CmdHFiClassCheckKeys,       IfPm3Iclass,     "Check keys"},
@@ -4498,7 +4498,7 @@ static command_t CommandTable[] = {
     {"-----------", CmdHelp,                    AlwaysAvailable, "---------------------- " _CYAN_("utils") " ----------------------"},
     {"configcard",  CmdHFiClassConfigCard,      IfPm3Iclass,     "Reader configuration card"},
     {"calcnewkey",  CmdHFiClassCalcNewKey,      AlwaysAvailable, "Calc diversified keys (blocks 3 & 4) to write new keys"},
-    {"encode",      CmdHFiClassEncode,          AlwaysAvailable, "Encode binary wiegand to block 7"},
+    {"encode",      CmdHFiClassEncode,          IfPm3Iclass,     "Encode binary wiegand to block 7"},
     {"encrypt",     CmdHFiClassEncryptBlk,      AlwaysAvailable, "Encrypt given block data"},
     {"decrypt",     CmdHFiClassDecrypt,         AlwaysAvailable, "Decrypt given block data or tag dump file" },
     {"managekeys",  CmdHFiClassManageKeys,      AlwaysAvailable, "Manage keys to use with iclass commands"},
diff --git a/client/src/pm3line_vocabulary.h b/client/src/pm3line_vocabulary.h
index e4a05dd2c..af192e24c 100644
--- a/client/src/pm3line_vocabulary.h
+++ b/client/src/pm3line_vocabulary.h
@@ -267,9 +267,9 @@ const static vocabulary_t vocabulary[] = {
     { 1, "hf jooki encode" },
     { 0, "hf jooki sim" },
     { 1, "hf iclass help" },
-    { 1, "hf iclass list" },
+    { 0, "hf iclass list" },
     { 0, "hf iclass dump" },
-    { 1, "hf iclass info" },
+    { 0, "hf iclass info" },
     { 0, "hf iclass rdbl" },
     { 0, "hf iclass reader" },
     { 0, "hf iclass restore" },
@@ -287,7 +287,7 @@ const static vocabulary_t vocabulary[] = {
     { 0, "hf iclass eview" },
     { 0, "hf iclass configcard" },
     { 1, "hf iclass calcnewkey" },
-    { 1, "hf iclass encode" },
+    { 0, "hf iclass encode" },
     { 1, "hf iclass encrypt" },
     { 1, "hf iclass decrypt" },
     { 1, "hf iclass managekeys" },
diff --git a/doc/commands.json b/doc/commands.json
index 02fec71df..7d6f4f01b 100644
--- a/doc/commands.json
+++ b/doc/commands.json
@@ -3120,7 +3120,7 @@
                 "hf iclass encode -w H10301 --fc 31 --cn 337 --ki 0 -> FC 31 CN 337 (H10301)",
                 "hf iclass encode --bin 10001111100000001010100011 --ki 0 --elite -> FC 31 CN 337 (H10301), writing w elite key"
             ],
-            "offline": true,
+            "offline": false,
             "options": [
                 "-h, --help This help",
                 "--bin <bin> Binary string i.e 0001001001",
@@ -3206,7 +3206,7 @@
             "notes": [
                 "hf iclass info"
             ],
-            "offline": true,
+            "offline": false,
             "options": [
                 "-h, --help This help",
                 "--shallow use shallow (ASK) reader modulation instead of OOK"
@@ -3220,7 +3220,7 @@
                 "hf iclass list --frame -> show frame delay times",
                 "hf iclass list -1 -> use trace buffer"
             ],
-            "offline": true,
+            "offline": false,
             "options": [
                 "-h, --help This help",
                 "-1, --buffer use data from trace buffer",
diff --git a/doc/commands.md b/doc/commands.md
index f6d1aacd6..4e1be75a2 100644
--- a/doc/commands.md
+++ b/doc/commands.md
@@ -406,9 +406,9 @@ Check column "offline" for their availability.
 |command                  |offline |description
 |-------                  |------- |-----------
 |`hf iclass help         `|Y       |`This help`
-|`hf iclass list         `|Y       |`List iclass history`
+|`hf iclass list         `|N       |`List iclass history`
 |`hf iclass dump         `|N       |`Dump Picopass / iCLASS tag to file`
-|`hf iclass info         `|Y       |`Tag information`
+|`hf iclass info         `|N       |`Tag information`
 |`hf iclass rdbl         `|N       |`Read Picopass / iCLASS block`
 |`hf iclass reader       `|N       |`Act like a Picopass / iCLASS reader`
 |`hf iclass restore      `|N       |`Restore a dump file onto a Picopass / iCLASS tag`
@@ -426,7 +426,7 @@ Check column "offline" for their availability.
 |`hf iclass eview        `|N       |`View emulator memory`
 |`hf iclass configcard   `|N       |`Reader configuration card`
 |`hf iclass calcnewkey   `|Y       |`Calc diversified keys (blocks 3 & 4) to write new keys`
-|`hf iclass encode       `|Y       |`Encode binary wiegand to block 7`
+|`hf iclass encode       `|N       |`Encode binary wiegand to block 7`
 |`hf iclass encrypt      `|Y       |`Encrypt given block data`
 |`hf iclass decrypt      `|Y       |`Decrypt given block data or tag dump file`
 |`hf iclass managekeys   `|Y       |`Manage keys to use with iclass commands`