diff --git a/src/components/styled/Board.styled.jsx b/src/components/styled/Board.styled.jsx
index f8461f5c..50d5ebee 100644
--- a/src/components/styled/Board.styled.jsx
+++ b/src/components/styled/Board.styled.jsx
@@ -2980,6 +2980,15 @@ export const BoardForm = styled.div`
   @media (max-width: 480px) {
     margin-bottom: 335px;
 
+    .offline-mobile-sub {
+      width: 18px;
+      margin-right: 5px;
+    }
+
+    .offline-mobile-sub-reply {
+      width: 15px;
+    }
+
     .thread {
       display: none;
     }
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 30add702..33bfb70a 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -53,7 +53,7 @@ const Catalog = () => {
   const { subscribed, subscribe, unsubscribe } = useSubscribe({subplebbitAddress: selectedAddress});
 
   const [errorMessage, setErrorMessage] = useState(null);
-  const [successMessage, setSuccessMessage] = useState(null);
+  const [successMessage] = useState(null);
   useError(errorMessage, [errorMessage]);
   useSuccess(successMessage, [successMessage]);
 
diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx
index bcbab54f..fea6f02a 100644
--- a/src/components/views/Subscriptions.jsx
+++ b/src/components/views/Subscriptions.jsx
@@ -163,12 +163,11 @@ const Subscriptions = () => {
         isOpen={isSettingsOpen}
         closeModal={() => setIsSettingsOpen(false)} />
         <NavBar selectedStyle={selectedStyle}>
-          <>
+        <>
             <span className="boardList">
               [
-                <Link to="" onClick={() => {}}>Subscriptions</Link>
+                <Link to={`/profile/p/subscriptions`}>Subscriptions</Link>
               ]&nbsp;[
-            </span>
             {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>
                 {index === 0 ? null : "\u00a0"}
@@ -179,9 +178,10 @@ const Subscriptions = () => {
                 className="offline-nav"
                 tooltipPlace="bottom" />
                 {index !== defaultSubplebbits.length - 1 ? " /" : null}
-              </span>
-            ))}
+                </span>
+              ))}
               ]
+            </span>
             <span className="nav">
               [
               <button style={{all: 'unset', cursor: 'pointer'}} onClick={
@@ -675,12 +675,27 @@ const Subscriptions = () => {
                             <span key={`p-t-mob-span-${index}`} className="date-time-mobile highlight-address-mobile">
                             p/
                             <Link key={`p-t-${index}`} to={`/p/${thread.subplebbitAddress}`} id="reply-button" title="Visit this board">
-                              {thread.subplebbitAddress.includes(".eth") ? thread.subplebbitAddress : (
-                                <span key={`short-add${index}`}
-                                data-tooltip-id="tooltip"
-                                data-tooltip-content={thread.subplebbitAddress}
-                                data-tooltip-place="top"
-                                >{thread.subplebbitAddress.slice(0, 10) + "(...)"}</span>
+                              {thread.subplebbitAddress.includes(".eth") ? 
+                              (
+                                <>
+                                  {thread.subplebbitAddress}
+                                  <OfflineIndicator key={`offline-indicator-${index}`}
+                                    address={thread.subplebbitAddress}
+                                    tooltipPlace="top"
+                                    className="offline-mobile-sub" />
+                                </>
+                                ) : (
+                                <>
+                                  <span key={`short-add${index}`}
+                                  data-tooltip-id="tooltip"
+                                  data-tooltip-content={thread.subplebbitAddress}
+                                  data-tooltip-place="top"
+                                  >{thread.subplebbitAddress.slice(0, 10) + "(...)"}</span>
+                                  <OfflineIndicator key={`offline-indicator-${index}`}
+                                   address={thread.subplebbitAddress}
+                                   tooltipPlace="top"
+                                   className="offline-mobile-sub"  />
+                                </>
                                 )}
                             </Link>
                           </span>
@@ -826,12 +841,27 @@ const Subscriptions = () => {
                             <span key={`p-t-mob-span-${index}`} className="date-time-mobile highlight-address-mobile">
                             &nbsp;p/
                             <Link key={`p-t-${index}`} to={`/p/${thread.subplebbitAddress}`} id="reply-button" title="Visit this board">
-                                {thread.subplebbitAddress.includes(".eth") ? thread.subplebbitAddress : (
-                                  <span key={`short-add${index}`}
-                                  data-tooltip-id="tooltip"
-                                  data-tooltip-content={thread.subplebbitAddress}
-                                  data-tooltip-place="top"
-                                  >{thread.subplebbitAddress.slice(0, 10) + "(...)"}</span>
+                                {thread.subplebbitAddress.includes(".eth") ? 
+                                (
+                                  <>
+                                  {thread.subplebbitAddress}
+                                  <OfflineIndicator key={`offline-indicator-${index}`}
+                                  address={thread.subplebbitAddress}
+                                  tooltipPlace="top"
+                                  className="offline-mobile-sub-reply" />
+                                  </>
+                                  ) : (
+                                  <>
+                                    <span key={`short-add${index}`}
+                                    data-tooltip-id="tooltip"
+                                    data-tooltip-content={thread.subplebbitAddress}
+                                    data-tooltip-place="top"
+                                    >{thread.subplebbitAddress.slice(0, 10) + "(...)"}</span>
+                                    <OfflineIndicator key={`offline-indicator-${index}`}
+                                    address={thread.subplebbitAddress}
+                                    tooltipPlace="top"
+                                    className="offline-mobile-sub-reply"  />
+                                  </>
                                   )}
                               </Link>
                             </span>