diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 4ef1f5f2b..0b587e8b7 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -27,6 +27,24 @@
  */
 class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 
+	protected function showMessages($msgs, $icon) {
+		if(!$msgs)
+			return;
+		echo '<i class="fa fa-'.$icon.'"></i> '.implode('<br /><i class="fa fa-'.$icon.'"></i> ', $msgs)."";
+	}
+
+	protected function showErrorMessages($msgs) {
+		echo '<div class="text-danger">';
+		$this->showMessages($msgs, 'exclamation-triangle');
+		echo '</div>';
+	}
+
+	protected function showWarningMessages($msgs) {
+		echo '<div class="text-warning">';
+		$this->showMessages($msgs, 'lightbulb-o');
+		echo '</div>';
+	}
+
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
@@ -137,26 +155,27 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		$list = $extmgr->getExtensionListByName($extname);
 		foreach($list as $re) {
 			$extmgr->checkExtensionByName($re['name'], $re);
-			$checkmsgs = $extmgr->getErrorMsgs();
+			$errormsgs = $extmgr->getErrorMsgs();
+			$warningmsgs = $extmgr->getWarningMsgs();
 			$needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0;
-			echo "<tr";
+			$class = '';
 			if(isset($extconf[$re['name']])) {
 				if($needsupdate)
-					echo " class=\"table-warning warning\"";
+					$class = " class=\"table-warning warning\"";
 				else
-					echo " class=\"table-success success\"";
+					$class = " class=\"table-success success\"";
 			}
-			echo ">";
-			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
+			echo "<tr>";
+			echo "<td width=\"32\" ".$class.">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
 			echo "<td>".$re['title']."<br /><small>".$re['description']."</small>";
 			echo "<br /><small>".getMLText('author').": ".$re['author']['name'].", ".$re['author']['company']."</small>";
-			if($checkmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
+			$this->showErrorMessages($errormsgs);
+			$this->showWarningMessages($warningmsgs);
 			echo "</td>";
 			echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			if(!$checkmsgs && $extmgr->isWritableExtDir())
+			if(!$errormsgs && $extmgr->isWritableExtDir())
 				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";
@@ -231,29 +250,30 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		print "<th>".getMLText('version')."</th>\n";
 		print "<th></th>\n";
 		print "</tr></thead><tbody>\n";
-		$errmsgs = array();
 		foreach($extconf as $extname=>$extconf) {
-			$errmsgs = array();
 			$check = $extmgr->checkExtensionByDir($extname);
+			$class = "";
 			if(!$settings->extensionIsDisabled($extname)) {
 //			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 				if(!$check)
-					echo "<tr class=\"table-danger error\" ref=\"".$extname."\">";
+					$class = "class=\"table-danger error\"";
 				else
-					echo "<tr class=\"table-success success\" ref=\"".$extname."\">";
+					$class = "class=\"table-success success\"";
 			} else {
-				echo "<tr class=\"table-warning warning\" ref=\"".$extname."\">";
+				$class = "class=\"table-warning warning\"";
 			}
-			$errmsgs = $extmgr->getErrorMsgs();
-			echo "<td width=\"32\">";
+			echo "<tr ref=\"".$extname."\">";
+			$errormsgs = $extmgr->getErrorMsgs();
+			$warningmsgs = $extmgr->getWarningMsgs();
+			echo "<td width=\"32\" ".$class.">";
 			if($extconf['icon'])
 				echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
 			echo "</td>";
 			echo "<td>".$extconf['title'];
 			echo "<br /><small>".$extconf['description']."</small>";
 			echo "<br /><small>".getMLText('author').": <a href=\"mailto:".htmlspecialchars($extconf['author']['email'])."\">".$extconf['author']['name']."</a>, ".(!empty($extconf['author']['company']) ? $extconf['author']['company'] : '')."</small>";
-			if($errmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
+			$this->showErrorMessages($errormsgs);
+			$this->showWarningMessages($warningmsgs);
 			echo "</td>";
 			echo "<td nowrap>".$extconf['version'];
 			echo "<br /><small>".$extconf['releasedate']."</small>";
@@ -362,29 +382,30 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 			if(!$re)
 				continue;
 			$extmgr->checkExtensionByName($en, $re);
-			$checkmsgs = $extmgr->getErrorMsgs();
+			$errormsgs = $extmgr->getErrorMsgs();
+			$warningmsgs = $extmgr->getWarningMsgs();
 			$needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0;
-			echo "<tr";
+			$class = '';
 			if(isset($extconf[$re['name']])) {
 				if($needsupdate)
-					echo " class=\"table-warning warning\"";
+					$class = "class=\"table-warning warning\"";
 				else
-					echo " class=\"table-success success\"";
+					$class = "class=\"table-success success\"";
 			}
-			echo ">";
-			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
+			echo "<tr>";
+			echo "<td width=\"32\" ".$class.">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
 			echo "<td>".$re['title'];
 			echo "<br /><small>".$re['description']."</small>";
 			echo "<br /><small>".getMLText('author').": ".$re['author']['name'].", ".$re['author']['company']."</small>";
-			if($checkmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $checkmsgs)."</div>";
+			$this->showErrorMessages($errormsgs);
+			$this->showWarningMessages($warningmsgs);
 			echo "</td>";
 			echo "<td nowrap>".$re['version']."<br /><small>".$re['releasedate']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			echo $this->getModalBoxLink(array('target'=>'extensionInfo', 'remote'=>'out.ExtensionMgr.php?action=info_versions&extensionname='.$re['name'], 'class'=>'', 'title'=>'<i class="fa fa-list-ol"></i>'));
 			echo $this->getModalBoxLink(array('target'=>'extensionChangelog', 'remote'=>'out.ExtensionMgr.php?action=info_changelog&extensionname='.$re['name'], 'class'=>'', 'title'=>'<i class="fa fa-reorder"></i>'));
-			if(!$checkmsgs && $settings->_enableExtensionImportFromRepository && $extmgr->isWritableExtDir())
+			if(!$errormsgs && $settings->_enableExtensionImportFromRepository && $extmgr->isWritableExtDir())
 				echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			echo "</div>";
 			echo "</td>";