diff --git a/images/offline.png b/images/offline.png
new file mode 100755
index 000000000..7a8291776
Binary files /dev/null and b/images/offline.png differ
diff --git a/images/online.png b/images/online.png
new file mode 100755
index 000000000..749a416d2
Binary files /dev/null and b/images/online.png differ
diff --git a/offline.js b/offline.js
index 73d70f39b..8290a2fc4 100644
--- a/offline.js
+++ b/offline.js
@@ -453,12 +453,12 @@ function init_offline() {
 		Element.hide("dispSwitchPrompt");
 		Element.hide("feedBrowserPrompt");
 
+		Element.hide("topLinksOnline");
+		Element.show("topLinksOffline");
+
 		var tb_form = document.getElementById("main_toolbar_form");
 		Element.hide(tb_form.update);
 
-		var top_links = document.getElementById("topLinks");
-		top_links.innerHTML = __("Offline mode");
-
 		var chooser = document.getElementById("quickMenuChooser");
 		chooser.disabled = true;
 
@@ -728,8 +728,10 @@ function init_gears() {
 			db.execute("CREATE TABLE IF NOT EXISTS feeds (id integer, title text, has_icon integer)");
 			db.execute("CREATE TABLE IF NOT EXISTS articles (id integer, feed_id integer, title text, link text, guid text, updated text, content text, tags text, unread text, marked text, added text, comments text)");
 
-
 			db.execute("DELETE FROM cache WHERE id LIKE 'F:%' OR id LIKE 'C:%'");
+
+			Element.show("restartOfflinePic");
+
 		}	
 	
 		cache_expire();
@@ -739,4 +741,11 @@ function init_gears() {
 	}
 }
 
+function gotoOffline() {
+	window.location.href = "tt-rss.php?offline=1";
+}
+
+function gotoOnline() {
+	window.location.href = "tt-rss.php";
+}
 
diff --git a/tt-rss.css b/tt-rss.css
index 95938bc91..bf087b8dd 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1698,10 +1698,13 @@ a.feedUpdErrLink {
 	display : none;
 }
 
-#newVersionIcon {
+div.topLinks img {
 	vertical-align : middle;
 	cursor : pointer;
-	margin-left : 10px;
+}
+
+#restartOfflinePic {
+	margin-left : 5px;
 }
 
 a.helpLinkPic {
diff --git a/tt-rss.php b/tt-rss.php
index 38a2c32f9..f4cb83549 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -115,6 +115,8 @@ window.onload = init;
 <div id="header">
 	<div class="topLinks" id="topLinks">
 
+	<span id="topLinksOnline">
+
 	<?php if (!SINGLE_USER_MODE) { ?>
 			<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
 	<?php } ?>
@@ -129,11 +131,24 @@ window.onload = init;
 			| <a href="logout.php"><?php echo __('Logout') ?></a>
 	<?php } ?>
 
+	<img id="restartOfflinePic" src="images/offline.png" style="display:none"
+		onclick="gotoOffline()"
+		title="<?php echo __('Restart in offline mode') ?>"/>
+
 	<img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
 		src="images/new_version.png" title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" 
 		alt="new_version_icon"/>
 
+	</span>
+
+	<span id="topLinksOffline" style="display : none">
+		<img id="restartOnlinePic" src="images/online.png" 
+			onclick="gotoOnline()"
+			title="<?php echo __('Restart in online mode') ?>"/>
+	</span>
+
 	</div>
+
 	<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>	
 </div>