diff --git a/include/poller.php b/include/poller.php
index 4eb5e8a2b9..113405dbbe 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -99,14 +99,26 @@ function poller_run(&$argv, &$argc){
 		proc_run('php','include/expire.php');
 	}
 
-	// clear old cache
-	Cache::clear();
+	$last = get_config('system','cache_last_cleared');
 
-	// clear old item cache files
-	clear_cache();
+ 	if($last) {
+		$next = $last + (3600); // Once per hour
+		$clear_cache = ($next <= time());
+        } else
+		$clear_cache = true;
 
-	// clear cache for photos
-	clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+	if ($clear_cache) {
+		// clear old cache
+		Cache::clear();
+
+		// clear old item cache files
+		clear_cache();
+
+		// clear cache for photos
+		clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+		set_config('system','cache_last_cleared', time());
+	}
 
 	$manual_id  = 0;
 	$generation = 0;
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ffd50ed146..5532c06eee 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1689,7 +1689,7 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
     border: 1px solid lightgray;
     color: black;
     background: #F2F2F2;
-    padding: 3px 7px 2px 7px;
+    padding: 2px 7px 2px 7px;
     margin-top: 2px;
     margin-bottom: 2px;