diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index fe7a512ca..7181d1e07 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -30,7 +30,7 @@ span.list-details {
 #admin-tools i {
 	font-size: 300%;
 	line-height: 110%;
-	min-height: 100px;
+/*	min-height: 100px; */
 }
 
 #admin-tools a {
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 47d4da737..45b9e2122 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -12,13 +12,13 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
-	if($(state.element).data('icon-before'))
-		html += '<i class="icon-'+$(state.element).data('icon-before')+'"></i> ';
+	if($(state.element).data('fa fa-before'))
+		html += '<i class="fa fa-'+$(state.element).data('fa fa-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';
 	if(subtitle)
 		html += '<br /><i>'+subtitle.replace(/</g, '&lt;')+'</i>';
 	if(warning)
-		html += '<br /><span class="label label-warning"><i class="icon-warning-sign"></i></span> '+warning+'';
+		html += '<br /><span class="label label-warning"><i class="fa fa-warning"></i></span> '+warning+'';
 	html += '</span>';
 	var $newstate = $(html);
 	return $newstate;
@@ -39,7 +39,7 @@ $(document).ready( function() {
 	 * remove icon
 	 */
 	$('html').on('click', function(e) {
-		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.icon-remove')) {
+		if (typeof $(e.target).data('original-title') == 'undefined' && !$(e.target).parents().is('.popover.in') && !$(e.target).is('.fa fa-remove')) {
 			$('[data-original-title]').popover('hide');
 		}
 	});
@@ -104,11 +104,11 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			if(item.charAt(0) == 'D')
-				return '<i class="icon-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-file"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else if(item.charAt(0) == 'F')
-				return '<i class="icon-folder-close-alt"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-folder-o"></i> ' + item.substring(1).replace(/</g, '&lt;');
 			else
-				return '<i class="icon-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
+				return '<i class="fa fa-search"></i> ' + item.substring(1).replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -136,7 +136,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-file"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-file"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -165,7 +165,7 @@ $(document).ready( function() {
 		},
 		highlighter : function (item) {
 			strarr = item.split("#");
-			return '<i class="icon-folder-close-alt"></i> ' + strarr[1].replace(/</g, '&lt;');
+			return '<i class="fa fa-folder-o"></i> ' + strarr[1].replace(/</g, '&lt;');
 		}
 	}); /* }}} */
 
@@ -784,9 +784,9 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					var bootbox_message = trans.confirm_move_document;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_document,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -828,9 +828,9 @@ $(document).ready(function() { /* {{{ */
 				} else if(source_type == 'folder' && source_id != target_id) {
 					var bootbox_message = trans.confirm_move_folder;
 					if(source_info.name)
-						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="icon-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
+						bootbox_message += "<p> "+escapeHtml(source_info.name)+' <i class="fa fa-arrow-right"></i> '+escapeHtml(target_name)+"</p>";
 					bootbox.dialog(bootbox_message, [{
-						"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+						"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 						"class" : "btn-danger",
 						"callback": function() {
 							$.get('../op/op.Ajax.php',
@@ -885,7 +885,7 @@ $(document).ready(function() { /* {{{ */
 				if(source_type == 'document') {
 					if(source_id != target_id) {
 						bootbox.dialog(trans.confirm_transfer_link_document, [{
-							"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
+							"label" : "<i class='fa fa-remove'></i> "+trans.transfer_content,
 							"class" : "btn-danger",
 							"callback": function() {
 								$.get('../op/op.Ajax.php',
@@ -1050,7 +1050,7 @@ $(document).ready(function() { /* {{{ */
 		formtoken = source_info.formtoken;
 		if(source_type == 'document') {
 			bootbox.dialog(trans.confirm_move_document, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_document,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',
@@ -1091,7 +1091,7 @@ $(document).ready(function() { /* {{{ */
 //			document.location = url;
 		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
-				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+				"label" : "<i class='fa fa-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",
 				"callback": function() {
 					$.get('../op/op.Ajax.php',
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index a90011fd4..9cb7027d8 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -164,9 +164,9 @@ $(document).ready(function() {
 		$orderby = $this->params['orderby'];
 		$folderid = $folder->getId();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
@@ -684,7 +684,7 @@ $(document).ready(function() {
 			)
 		);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_document'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));
 ?>
 		</form>
 <?php
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index 114c2aa7b..3df9f3861 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -128,9 +128,9 @@ $(document).ready( function() {
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php
index 158644a91..e2778d2b9 100644
--- a/views/bootstrap/class.AddSubFolder.php
+++ b/views/bootstrap/class.AddSubFolder.php
@@ -69,7 +69,7 @@ $(document).ready( function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -128,7 +128,7 @@ $(document).ready( function() {
 			echo $arrs;
 		}
 
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_subfolder'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_subfolder'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index d94a5e086..bf4238759 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -44,7 +44,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	static function rowButton($link, $icon, $label) { /* {{{ */
-		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="icon-'.$icon.'"></i><br />'.getMLText($label).'</a>';
+		return '<a href="'.$link.'" class="span2 btn btn-medium"><i class="fa fa-'.$icon.'"></i><br />'.getMLText($label).'</a>';
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -70,7 +70,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	<?= self::endRow(); ?>
 	<?= self::startRow(); ?>
 		<?php echo $this->callHook('startOfRow', 2); ?>
-		<?= self::rowButton("../out/out.BackupTools.php", "hdd", "backup_tools"); ?>
+		<?= self::rowButton("../out/out.BackupTools.php", "life-saver", "backup_tools"); ?>
 <?php		
 		if ($logfileenable)
 			echo self::rowButton("../out/out.LogManagement.php", "list", "log_management");
@@ -102,7 +102,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?php echo $this->callHook('startOfRow', 5); ?>
 		<?= self::rowButton("../out/out.Indexer.php", "refresh", "update_fulltext_index"); ?>
 		<?= self::rowButton("../out/out.CreateIndex.php", "search", "create_fulltext_index"); ?>
-		<?= self::rowButton("../out/out.IndexInfo.php", "info-sign", "fulltext_info"); ?>
+		<?= self::rowButton("../out/out.IndexInfo.php", "info-circle", "fulltext_info"); ?>
 		<?php echo $this->callHook('endOfRow', 5); ?>
 	<?= self::endRow(); ?>
 <?php
@@ -113,14 +113,14 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<?= self::rowButton("../out/out.Statistic.php", "tasks", "folders_and_documents_statistic"); ?>
 		<?= self::rowButton("../out/out.Charts.php", "bar-chart", "charts"); ?>
 		<?= self::rowButton("../out/out.ObjectCheck.php", "check", "objectcheck"); ?>
-		<?= self::rowButton("../out/out.Timeline.php", "time", "timeline"); ?>
+		<?= self::rowButton("../out/out.Timeline.php", "clock-o", "timeline"); ?>
 		<?php echo $this->callHook('endOfRow', 6); ?>
 	<?= self::endRow(); ?>
 	<?= self::startRow(); ?>
 		<?php echo $this->callHook('startOfRow', 7); ?>
 		<?= self::rowButton("../out/out.Settings.php", "wrench", "settings"); ?>
 		<?= self::rowButton("../out/out.ExtensionMgr.php", "cogs", "extension_manager"); ?>
-		<?= self::rowButton("../out/out.Info.php", "info-sign", "version_info"); ?>
+		<?= self::rowButton("../out/out.Info.php", "info-circle", "version_info"); ?>
 		<?php echo $this->callHook('endOfRow', 7); ?>
 	<?= self::endRow(); ?>
 	<?php echo $this->callHook('afterRows'); ?>
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 0327e2a96..1c235a97e 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -110,7 +110,7 @@ $(document).ready( function() {
 							if($user->isAdmin()) {
 								$content .= $this->printDeleteAttributeValueButton($selattrdef, implode(';', $value), 'splash_rm_attr_value', true);
 							} else {
-								$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+								$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 							}
 							$content .= "</div>";
 							$content .= "</td>";
@@ -171,7 +171,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
 				<input type="hidden" name="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
 			</form>
 <?php
 		}
@@ -288,7 +288,7 @@ $(document).ready( function() {
 				'value'=>($attrdef ? $attrdef->getRegex() : ''),
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText('save'));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
 ?>
 			</form>
 <?php
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 6ec1754bc..9fa8c6beb 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -121,7 +121,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
-					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("backup_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}
@@ -171,7 +171,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 					print "<td>";
-					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("dump_remove")."</a>";
 					print "</td>\n";	
 					print "</tr>\n";
 				}
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f424305ed..69014059e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -92,11 +92,10 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			echo '<link rel="search" type="application/opensearchdescription+xml" href="../out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "SeedDMS").'"/>'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/font-awesome/css/font-awesome.css" rel="stylesheet">'."\n";
-//		echo '<link href="../styles/'.$this->theme.'/datepicker/css/datepicker.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/bootstrap-datepicker/css/bootstrap-datepicker.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/chosen/css/chosen.css" rel="stylesheet">'."\n";
-		echo '<link href="../styles/'.$this->theme.'/select2/css/select2.min.css" rel="stylesheet">'."\n";
+		echo '<link href="../views/'.$this->theme.'/vendors/select2/css/select2.min.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/select2/css/select2-bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/jqtree/jqtree.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/application.css" rel="stylesheet">'."\n";
@@ -105,14 +104,14 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		if(method_exists($this, 'css'))
 			echo '<link href="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?action=css'.(!empty($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : '').'" rel="stylesheet">'."\n";
 
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery/jquery.min.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery/jquery.min.js"></script>'."\n";
 		if($this->extraheader['js'])
 			echo $this->extraheader['js'];
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/passwordstrength/jquery.passwordstrength.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/jquery.noty.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topRight.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topCenter.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/jquery.noty.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topRight.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/layouts/topCenter.js"></script>'."\n";
+		echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
 //		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
 		echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
@@ -161,9 +160,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 		}
 		echo '<script src="../styles/'.$this->theme.'/bootstrap/js/bootstrap.min.js"></script>'."\n";
-		echo '<script src="../styles/'.$this->theme.'/datepicker/js/bootstrap-datepicker.js"></script>'."\n";
+		echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>'."\n";
 		foreach(array('de', 'es', 'ar', 'el', 'bg', 'ru', 'hr', 'hu', 'ko', 'pl', 'ro', 'sk', 'tr', 'uk', 'ca', 'nl', 'fi', 'cs', 'it', 'fr', 'sv', 'sl', 'pt-BR', 'zh-CN', 'zh-TW') as $lang)
-			echo '<script src="../styles/'.$this->theme.'/datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
+			echo '<script src="../views/'.$this->theme.'/vendors/bootstrap-datepicker/locales/bootstrap-datepicker.'.$lang.'.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		parse_str($_SERVER['QUERY_STRING'], $tmp);
@@ -287,16 +286,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
 		echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".nav-col1\">\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
-		echo "     <span class=\"icon-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
+		echo "     <span class=\"fa fa-bar\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
 			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";
-			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
+			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"fa fa-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
@@ -396,7 +395,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			foreach($menuitems as $menuitem) {
 				if(!empty($menuitem['children'])) {
 					echo "    <li class=\"dropdown\">\n";
-					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+					echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 					echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 					foreach($menuitem['children'] as $submenuitem) {
 						echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -456,9 +455,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
 			echo "   <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".col2\">\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
-			echo " 		<span class=\"icon-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
+			echo " 		<span class=\"fa fa-bar\"></span>\n";
 			echo "   </a>\n";
 			switch ($pageType) {
 				case "view_folder":
@@ -505,7 +504,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			if(!empty($menuitem['children'])) {
 				echo "    <li class=\"dropdown\">\n";
-				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"icon-caret-down\"></i></a>\n";
+				echo "     <a class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText($menuitem['label'])." <i class=\"fa fa-caret-down\"></i></a>\n";
 				echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 				foreach($menuitem['children'] as $submenuitem) {
 					echo "      <li><a href=\"".$submenuitem['link']."\"".(isset($submenuitem['target']) ? ' target="'.$submenuitem['target'].'"' : '').">".getMLText($submenuitem['label'])."</a></li>\n";
@@ -1111,7 +1110,7 @@ $(document).ready(function() {
 		$content = '
 			<span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
 				<input class="span6" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>';
 		return $content;
 	} /* }}} */
@@ -1246,7 +1245,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
 		$content .= "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\"  name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1335,7 +1334,7 @@ $(document).ready(function() {
 		print "<input type=\"hidden\" name=\"categoryid".$formName."\" value=\"".implode(',', $ids)."\">";
 		print "<div class=\"input-append\">\n";
 		print "<input type=\"text\" disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
-		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"icon-remove\"></i></button>";
+		print "<button type=\"button\" class=\"btn\" onclick=\"javascript:clearCategory".$formName."();\"><i class=\"fa fa-remove\"></i></button>";
 		print "<a data-target=\"#categoryChooser\" href=\"../out/out.CategoryChooser.php?form=form1&cats=".implode(',', $ids)."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("category")."…</a>\n";
 		print "</div>\n";
 ?>
@@ -1349,7 +1348,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="icon-save"></i> <?php printMLText("save") ?></button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
   </div>
 </div>
 <?php
@@ -1377,7 +1376,7 @@ $(document).ready(function() {
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">'. getMLText("close").'</button>
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="icon-save"></i> '.getMLText("save").'</button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" id="acceptkeywords"><i class="fa fa-save"></i> '.getMLText("save").'</button>
   </div>
 </div>';
 		return $content;
@@ -1419,7 +1418,7 @@ $(document).ready(function() {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
         $content .= '<span class="input-append date datepicker" data-date="'.date('Y-m-d').'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 					<input id="'.$fieldname.'_'.$attrdef->getId().'" class="span9" size="16" name="'.$fieldname.'['.$attrdef->getId().']" type="text" value="'.($objvalue ? $objvalue : '').'">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
 				</span>';
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
@@ -1475,7 +1474,7 @@ $(document).ready(function() {
 	function getDropFolderChooserHtml($formName, $dropfolderfile="", $showfolders=0) { /* {{{ */
 		$content =  "<div class=\"input-append\">\n";
 		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
-		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"icon-remove\"></i></button>";
+		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"fa fa-remove\"></i></button>";
 		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
@@ -1734,8 +1733,8 @@ $(function() {
 		selectable: true,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
-		openedIcon: $('<i class="icon-minus-sign"></i>'),
-		closedIcon: $('<i class="icon-plus-sign"></i>'),
+		openedIcon: $('<i class="fa fa-minus-circle"></i>'),
+		closedIcon: $('<i class="fa fa-plus-circle"></i>'),
 		_onCanSelectNode: function(node) {
 			if(node.is_folder) {
 				folderSelected<?php echo $formid ?>(node.id, node.name);
@@ -1747,9 +1746,9 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
+					$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>');
 				else
-					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
+					$li.find('.jqtree-title').before('<i class="fa fa-file"></i> ');
     }
 	});
 	// Unfold node for currently selected folder
@@ -1840,7 +1839,7 @@ $(function() {
 	 */
 	function __printTreeNavigation($folderid, $showtree){ /* {{{ */
 		if ($showtree==1){
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"fa fa-minus-circle\"></i></a>", true);
 			$this->contentContainerStart();
 ?>
 	<script language="JavaScript">
@@ -1852,7 +1851,7 @@ $(function() {
 			$this->printNewTreeNavigation($folderid, M_READ, 0, '');
 			$this->contentContainerEnd();
 		} else {
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
+			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);
 		}
 	} /* }}} */
 
@@ -1863,7 +1862,7 @@ $(function() {
 	 */
 	function printClipboard($clipboard, $previewer){ /* {{{ */
 		echo "<div id=\"clipboard-container\" class=\"_clipboard-container\">\n";
-		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="icon-sort"></i></span>', true);
+		$this->contentHeading(getMLText("clipboard").'<span id="clipboard-float"><i class="fa fa-sort"></i></span>', true);
 		echo "<div id=\"main-clipboard\">\n";
 ?>
 		<div class="ajax" data-view="Clipboard" data-action="mainClipboard"></div>
@@ -1893,7 +1892,7 @@ $(function() {
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -1912,7 +1911,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removedocument')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_document")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_document")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -1967,7 +1966,7 @@ $(function() {
 	function printDeleteFolderButton($folder, $msg, $return=false){ /* {{{ */
 		$folderid = $folder->getID();
 		$content = '';
-		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+		$content .= '<a class="delete-folder-btn" rel="'.$folderid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -1986,7 +1985,7 @@ $(function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removefolder')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_folder")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_folder")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.get('../op/op.Ajax.php',
@@ -2039,7 +2038,7 @@ $(function() {
 			$title = 'lock_document';
 		}
 		$content = '';
-    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="icon-'.$icon.'"></i></a>';
+    $content .= '<a class="lock-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" title="'.getMLText($title).'"><i class="fa fa-'.$icon.'"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2058,7 +2057,7 @@ $(function() {
 	 * @param array $ids list of option values
 	 */
 	function getSelectPresetButtonHtml($name, $ids) { /* {{{ */
-		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="selectpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOver".$name).'" data-ref="'.$name.'" data-ids="'.implode(",", $ids).'"><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2110,7 +2109,7 @@ $(document).ready( function() {
 	 * @param string $text text
 	 */
 	function getInputPresetButtonHtml($name, $text, $sep='') { /* {{{ */
-		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="inputpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 	} /* }}} */
 
 	/**
@@ -2167,7 +2166,7 @@ $(document).ready( function() {
 	 */
 	function getCheckboxPresetButtonHtml($name, $text) { /* {{{ */
 ?>
-		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="icon-arrow-left"></i></span>';
+		return '<span id="'.$name.'_btn" class="checkboxpreset_btn" style="cursor: pointer;" title="'.getMLText("takeOverAttributeValue").'" data-ref="'.$name.'" data-text="'.(is_array($text) ? implode($sep, $text) : htmlspecialchars($text)).'"'.($sep ? " data-sep=\"".$sep."\"" : "").'><i class="fa fa-arrow-left"></i></span>';
 <?php
 	} /* }}} */
 
@@ -2228,7 +2227,7 @@ $(document).ready( function() {
 	 */
 	function printDeleteAttributeValueButton($attrdef, $value, $msg, $return=false){ /* {{{ */
 		$content = '';
-    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-attribute-value-btn" rel="'.$attrdef->getID().'" msg="'.getMLText($msg).'" attrvalue="'.htmlspecialchars($value, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_attr_value", array ("attrdefname" => $attrdef->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2247,7 +2246,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removeattrvalue')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_attr_value")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_attr_value")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.post('../op/op.AttributeMgr.php',
@@ -2457,18 +2456,18 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($document->getAccessMode($user) >= M_ALL) {
 				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
-				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="icon-edit"></i></a>';
+				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
 				$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
 			}
 			if($enableClipboard) {
-				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+				$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 			}
 			if(!empty($extracontent['end_action_list']))
 				$content .= $extracontent['end_action_list'];
@@ -2587,15 +2586,15 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if($subFolderAccessMode >= M_ALL) {
 			$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
-			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="icon-edit"></i></a>';
+			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
+			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 		}
 		if($enableClipboard) {
-			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
+			$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
@@ -2860,13 +2859,13 @@ $(document).ready(function() {
 			case "review":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			case "approval":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			}
@@ -2998,7 +2997,7 @@ $("body").on("click", "span.openpopupbox", function(e) {
 		<span class="openpopupbox" data-href="#'.$id.'">'.$title.'</span>
 		<div id="'.$id.'" class="popupbox" style="display: none;">
 		'.$content.'
-			<span class="closepopupbox"><i class="icon-remove"></i></span>
+			<span class="closepopupbox"><i class="fa fa-remove"></i></span>
 		</div>';
 		if($ret)
 			return $html;
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 9410c3f02..7529ad3ea 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -100,7 +100,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 					'required'=>$strictformcheck
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
@@ -112,7 +112,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 			$this->contentContainerEnd();
@@ -381,12 +381,12 @@ $(document).ready(function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/lib/moment.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fullcalendar/locale-all.js"></script>'."\n", 'js');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
-		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/moment/moment.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fullcalendar/locale-all.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.min.css" rel="stylesheet"></link>'."\n", 'css');
+		$this->htmlAddHeader('<link href="../views/'.$this->theme.'/vendors/fullcalendar/fullcalendar.print.min.css" rel="stylesheet" media="print"></link>'."\n", 'css');
 
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index d9bb247a9..29045f79b 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -97,7 +97,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
 						</form>
 <?php
 		}
@@ -124,7 +124,7 @@ $(document).ready( function() {
 					'value'=>($category ? htmlspecialchars($category->getName()) : '')
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 				</form>
 
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 91c8f4cd7..3699c04ce 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -61,7 +61,7 @@ class SeedDMS_View_ClearCache extends SeedDMS_Bootstrap_Style {
 				echo "<p><input type=\"checkbox\" name=\"".$c[0]."\" value=\"1\" checked> ".$c[1]."</p>";
 		}
 ?>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("clear_cache");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index 053b3df1e..ec711b891 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -53,15 +53,15 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -112,7 +112,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 		}
 		$content .= "</td>\n";
 		$content .= "<td>\n";
-		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+		$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 		$content .= "</td>\n";
 		$content .= "</tr>\n";
 
@@ -158,7 +158,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
 			}
 			$content .= "</td>\n";
 			$content .= "<td>\n";
-			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+			$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 			$content .= "</td>\n";
 			$content .= "</tr>";
 		}
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index 5aa4e4198..f2b61e03f 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -128,7 +128,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcategoryid?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
+						<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
 						</form>
 <?php
 		}
@@ -159,7 +159,7 @@ $(document).ready( function() {
 					'value'=>''
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('new_default_keyword_category'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category'));
 ?>
 			</form>
 <?php
@@ -175,7 +175,7 @@ $(document).ready( function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+							<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save");?></button>
 						</form>
 					</div>
 				</div>
@@ -196,7 +196,7 @@ $(document).ready( function() {
 									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="Hidden" name="action" value="editkeywords">
 									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
+									<button class="btn" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
 									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@@ -204,7 +204,7 @@ $(document).ready( function() {
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
+									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index f45241a4a..3471dc6b4 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -120,7 +120,7 @@ $(document).ready( function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready( function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($document->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -234,7 +234,7 @@ $(document).ready( function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -255,7 +255,7 @@ $(document).ready( function() {
 				$userObj = $userAccess->getUser();
 				$memusers[] = $userObj->getID();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
 				print "<td>\n";
@@ -266,7 +266,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -275,7 +275,7 @@ $(document).ready( function() {
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "<span></td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -286,7 +286,7 @@ $(document).ready( function() {
 				$memgroups[] = $groupObj->getID();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.DocumentAccess.php\">";
 				print "<td>";
@@ -297,7 +297,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">";
 				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
@@ -306,7 +306,7 @@ $(document).ready( function() {
 				print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</form>";
 				print "</span></td>\n";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index 8d7317b0e..de9096b65 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -151,7 +151,7 @@ $(document).ready( function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready( function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.DocumentNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready( function() {
 					print "<input type=\"hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 91b1781be..9313f30af 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -236,26 +236,26 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		//if (($document->getAccessMode($user) >= M_READWRITE)) {
 		print "<ul class=\"actions unstyled\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
+				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i> " . getMLText("view_online") . "</a>";
 			print "</ul>";
 			print "<ul class=\"actions unstyled\">";
 		}
 
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i> ".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_version")."</a></li>";
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
 			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 			}
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
 			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i> ".getMLText("edit_comment")."</a></li>";
+				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
 			print "</ul>";
 		}
@@ -435,15 +435,15 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"fa fa-download\"></i>".getMLText('download')."</a></li>";
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 					}
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
-					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit")."</a></li>";
 				}
 				print "</ul></td>";		
 				
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index e23e1d7ce..d668fae80 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -100,7 +100,7 @@ $('.folderselect').click(function(ev) {
 		if($c) {
 			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $filecontent;
 			$content .= "     </ul>\n";
diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 83616a1b3..2c98436f4 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -75,7 +75,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php
index bc131ee27..8f049b377 100644
--- a/views/bootstrap/class.EditComment.php
+++ b/views/bootstrap/class.EditComment.php
@@ -99,7 +99,7 @@ $(document).ready(function() {
 				'value'=>htmlspecialchars($version->getComment())
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 31f281d15..d05626805 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -74,7 +74,7 @@ $(document).ready( function() {
 		$nodocumentformfields = $this->params['nodocumentformfields'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
@@ -231,7 +231,7 @@ $(document).ready( function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditDocumentFile.php b/views/bootstrap/class.EditDocumentFile.php
index f0d015505..7fa5691ac 100644
--- a/views/bootstrap/class.EditDocumentFile.php
+++ b/views/bootstrap/class.EditDocumentFile.php
@@ -96,7 +96,7 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
 		);
 ?>
 <?php
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index 229526cbc..061a1b803 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -95,7 +95,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["start"], "from");?>
 	    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i>
+	      		<span class="add-on"><i class="fa fa-calendar"></i>
 	    		</span>
 	    	</div>
 		</div>
@@ -105,7 +105,7 @@ $(document).ready(function() {
 				<?php //$this->printDateChooser($event["stop"], "to");?>
 	    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
 	      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
-	      		<span class="add-on"><i class="icon-calendar"></i></span>
+	      		<span class="add-on"><i class="fa fa-calendar"></i></span>
 	    		</span>
 			</div>
 		</div>
@@ -122,7 +122,7 @@ $(document).ready(function() {
 			</div>
 		</div>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 59c2ac858..9cf48d6e5 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -71,7 +71,7 @@ $(document).ready(function() {
 		$strictformcheck = $this->params['strictformcheck'];
 		$orderby = $this->params['orderby'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
 		$this->globalNavigation($folder);
@@ -132,7 +132,7 @@ $(document).ready(function() {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php
index 04f3b3f06..f9b7de66a 100644
--- a/views/bootstrap/class.EditOnline.php
+++ b/views/bootstrap/class.EditOnline.php
@@ -126,7 +126,7 @@ $this->contentHeading(getMLText("content"));
 <?php
 	echo $this->warningMsg(getMLText('edit_online_warning'));
 ?>
-<button id="update" type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
+<button id="update" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save"); ?></button>
 </form>
 <?php
 		echo "</div>\n";
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 241386089..f33ab90e6 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -92,7 +92,7 @@ $(document).ready( function() {
 		$passwordstrength = $this->params['passwordstrength'];
 		$httproot = $this->params['httproot'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("edit_user_details"));
 		$this->globalNavigation();
@@ -205,7 +205,7 @@ $(document).ready( function() {
 				)
 			);
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index e9ace2b88..6c7f5f0e9 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -132,7 +132,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!$checkmsgs && $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=\"icon-download\"></i></a></form>";
+				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>";
 			echo "</tr>";
@@ -216,15 +216,15 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
 			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {
-				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+				echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=changelog&extensionname=".$extname."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			}
 			if($extconf['config'])
-				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"icon-cogs\"></i></a>";
-			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"icon-download\"></i></a></form>";
+				echo "<a href=\"../out/out.Settings.php?currenttab=extensions#".$extname."\" title=\"".getMLText('configure_extension')."\"><i class=\"fa fa-cogs\"></i></a>";
+			echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-download\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"download\" /><input type=\"hidden\" name=\"extname\" value=\"".$extname."\" /><a class=\"download\" data-extname=\"".$extname."\" title=\"".getMLText('download_extension')."\"><i class=\"fa fa-download\"></i></a></form>";
 			if(!$settings->extensionIsDisabled($extname)) {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check"</i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check"</i></a>';
 			} else {
-				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="icon-check-minus"></i></a>';
+				echo ' <a href="#" class="toggle" data-extname="'.$extname.'"><i class="fa fa-check-minus"></i></a>';
 			}
 			echo "</div>";
 			echo "</td>";
@@ -264,7 +264,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				getMLText("extension_archive"),
 				$this->getFileChooserHtml('userfile', false)
 			);
-			$this->formSubmit("<i class=\"icon-upload\"></i> ".getMLText('import_extension'));
+			$this->formSubmit("<i class=\"fa fa-upload\"></i> ".getMLText('import_extension'));
 ?>
 		</form>
 <?php
@@ -288,7 +288,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
 	<input type="hidden" name="action" value="refresh" />
-	<p><button type="submit" class="btn"><i class="icon-refresh"></i> <?php printMLText("refresh");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
 </form>
 			</div>
 
@@ -327,10 +327,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "<td nowrap>".$re['author']['name']."<br /><small>".$re['author']['company']."</small></td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"icon-list-ol\"></i></a>\n";
-			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"icon-reorder\"></i></a>\n";
+			echo "<a data-target=\"#extensionInfo\" href=\"../out/out.ExtensionMgr.php?action=info_versions&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_version_list')."\"><i class=\"fa fa-list-ol\"></i></a>\n";
+			echo "<a data-target=\"#extensionChangelog\" href=\"../out/out.ExtensionMgr.php?action=info_changelog&extensionname=".$re['name']."\" data-toggle=\"modal\" title=\"".getMLText('show_extension_changelog')."\"><i class=\"fa fa-reorder\"></i></a>\n";
 			if(!$checkmsgs && $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=\"icon-download\"></i></a></form>";
+				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>";
 			echo "</tr>";
@@ -343,7 +343,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
+          <button type="submit" class="btn btn-delete"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
 </div>
 			</div>
diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php
index bf3905d05..8bca2fd16 100644
--- a/views/bootstrap/class.FolderAccess.php
+++ b/views/bootstrap/class.FolderAccess.php
@@ -117,7 +117,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -180,7 +180,7 @@ $(document).ready(function() {
 			getMLText("default_access"),
 			$this->getAccessModeSelection($folder->getDefaultAccess())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 
@@ -225,7 +225,7 @@ $(document).ready(function() {
 			getMLText("access_mode"),
 			$this->getAccessModeSelection(M_READ)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 ?>
 </form>
 <?php
@@ -242,7 +242,7 @@ $(document).ready(function() {
 			foreach ($accessList["users"] as $userAccess) {
 				$userObj = $userAccess->getUser();
 				print "<tr>\n";
-				print "<td><i class=\"icon-user\"></i></td>\n";
+				print "<td><i class=\"fa fa-user\"></i></td>\n";
 				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -253,7 +253,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($userAccess->getMode());
 				print "</td>\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -262,7 +262,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<td>\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>\n";
 				print "</tr>\n";
@@ -272,7 +272,7 @@ $(document).ready(function() {
 				$groupObj = $groupAccess->getGroup();
 				$mode = $groupAccess->getMode();
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
 				print "<form action=\"../op/op.FolderAccess.php\">";
 				echo createHiddenFieldWithKey('folderaccess')."\n";
@@ -283,7 +283,7 @@ $(document).ready(function() {
 				$this->printAccessModeSelection($groupAccess->getMode());
 				print "</td>\n";
 				print "<td><span class=\"actions\">\n";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-save\"></i> ".getMLText("save")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
 				print "</span></td>\n";
 				print "</form>";
 				print "<form action=\"../op/op.FolderAccess.php\">\n";
@@ -292,7 +292,7 @@ $(document).ready(function() {
 				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
 				print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
 				print "<td>";
-				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+				print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 				print "</td>\n";
 				print "</form>";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php
index de62b5b7a..cae14942f 100644
--- a/views/bootstrap/class.FolderNotify.php
+++ b/views/bootstrap/class.FolderNotify.php
@@ -151,7 +151,7 @@ $(document).ready(function() {
 		else {
 			foreach ($notifyList["users"] as $userNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-user\"></i></td>";
+				print "<td><i class=\"fa fa-user\"></i></td>";
 				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
 				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -160,7 +160,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
@@ -168,7 +168,7 @@ $(document).ready(function() {
 			}
 			foreach ($notifyList["groups"] as $groupNotify) {
 				print "<tr>";
-				print "<td><i class=\"icon-group\"></i></td>";
+				print "<td><i class=\"fa fa-group\"></i></td>";
 				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
 				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
 					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
@@ -177,7 +177,7 @@ $(document).ready(function() {
 					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
 					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
 					print "<td>";
-					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
+					print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
 					print "</td>";
 					print "</form>\n";
 				}else print "<td></td>";
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index a189c31b0..b0dfc8759 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -163,7 +163,7 @@ $(document).ready( function() {
   </a>
   <ul class="dropdown-menu">
 <?php
-			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="icon-remove"></i> '.getMLText("rm_group").'</a><li>';
+			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
 ?>
 	</ul>
 </div>
@@ -211,7 +211,7 @@ $(document).ready( function() {
 				'value'=>($group ? htmlspecialchars($group->getComment()) : '')
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 	</form>
 <?php
@@ -228,13 +228,13 @@ $(document).ready( function() {
 				foreach ($members as $member) {
 				
 					print "<tr>";
-					print "<td><i class=\"icon-user\"></i></td>";
+					print "<td><i class=\"fa fa-user\"></i></td>";
 					print "<td>" . htmlspecialchars($member->getFullName()) . "</td>";
 					print "<td>" . ($group->isMember($member,true)?getMLText("manager"):"&nbsp;") . "</td>";
 					print "<td>";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 					print "&nbsp;";
-					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-random\"></i> ".getMLText("toggle_manager")."</button></form>";
+					print "<form action=\"../op/op.GroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-random\"></i> ".getMLText("toggle_manager")."</button></form>";
 					print "</td></tr>";
 				}
 			}
diff --git a/views/bootstrap/class.GroupView.php b/views/bootstrap/class.GroupView.php
index 44b89fddf..cf955a5d7 100644
--- a/views/bootstrap/class.GroupView.php
+++ b/views/bootstrap/class.GroupView.php
@@ -86,7 +86,7 @@ $(document).ready( function() {
 					if($manager->getId() == $member->getId())
 						echo ", ".getMLText("manager");
 				if($ismanager) {
-					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="icon-remove"></i> '.getMLText("rm_user").'</a>';
+					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'" class="btn btn-mini"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a>';
 				}
 				echo "</li>";
 			}
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 00c5d0208..36387e615 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -90,7 +90,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 					'value'=>'1'
 				)
 			);
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 			print "</form>\n";
 			$this->contentContainerEnd();
 		} else {
diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index fd0b036fe..5886caccf 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -77,7 +77,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				'value'=>'1'
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('import'));
 		print "</form>\n";
 		$this->contentContainerEnd();
 
@@ -102,12 +102,12 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				if(isset($newuser['__logs__'])) {
 					foreach($newuser['__logs__'] as $item) {
 						$class = $item['type'] == 'success' ? 'success' : 'error';
-						echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+						echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 					}
 				}
 				foreach($log[$uhash] as $item) {
 					$class = $item['type'] == 'success' ? 'success' : 'error';
-					echo "<i class=\"icon-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+					echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 				}
 				echo "</td>";
 				echo "</tr>\n";
diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index b10156f6d..ed6e14103 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -56,24 +56,24 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 			print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->logdir.$entry))."</td>\n";
 			print "<td>";
 			
-			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
+			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_file")."</a>";
 			print "&nbsp;";
-			print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
 			print "&nbsp;";
-			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"icon-eye-open\"></i> ".getMLText('view')." …</a>";
+			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"fa fa-eye-open\"></i> ".getMLText('view')." …</a>";
 			print "</td>\n";	
 			print "</tr>\n";
 		}
 
 		if ($print_header) printMLText("empty_list");
-		else print "<tr><td><i class=\"icon-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
+		else print "<tr><td><i class=\"fa fa-arrow-up\"></i></td><td colspan=\"2\"><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
 	} /* }}} */
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
-	$('i.icon-arrow-up').on('click', function(e) {
+	$('i.fa fa-arrow-up').on('click', function(e) {
 //var checkBoxes = $("input[type=checkbox]");
 //checkBoxes.prop("checked", !checkBoxes.prop("checked"));
 		$('input[type=checkbox]').prop('checked', true);
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 68f5c37f4..26305aba9 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -110,7 +110,7 @@ $(document).ready( function() {
 		$enableLanguageSelector = $this->params['enablelanguageselector'];
 		$enableThemeSelector = $this->params['enablethemeselector'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 2416a1706..08f142754 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -82,7 +82,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->folderListRow($fld, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>";
 					echo $this->folderListRowEnd($fld);
@@ -120,7 +120,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 						echo $this->documentListRow($doc, $previewer, true);
 					}
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a>";
 					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td>\n";
 					echo $this->documentListRowEnd($doc);
@@ -178,7 +178,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 				'value'=>1
 			)
 		);
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 		$this->contentContainerEnd();
 		echo "</div>";
@@ -190,7 +190,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
 		$this->formField(getMLText("choose_target_document"), $this->getDocumentChooserHtml("form2"));
-		$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
+		$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
 		print "</form>";
 
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index d05d1ba4e..133148e82 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -110,7 +110,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('update'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.RemoveArchive.php b/views/bootstrap/class.RemoveArchive.php
index 69b8cbfe3..2b264be20 100644
--- a/views/bootstrap/class.RemoveArchive.php
+++ b/views/bootstrap/class.RemoveArchive.php
@@ -48,7 +48,7 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
   <?php echo createHiddenFieldWithKey('removearchive'); ?>
 	<p><?php printMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("backup_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 2340827fd..ae692667d 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_document");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDocumentFile.php b/views/bootstrap/class.RemoveDocumentFile.php
index d30d95516..5528c751b 100644
--- a/views/bootstrap/class.RemoveDocumentFile.php
+++ b/views/bootstrap/class.RemoveDocumentFile.php
@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
 	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button>
+	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveDump.php b/views/bootstrap/class.RemoveDump.php
index 359ff84b7..73361c904 100644
--- a/views/bootstrap/class.RemoveDump.php
+++ b/views/bootstrap/class.RemoveDump.php
@@ -47,7 +47,7 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Bootstrap_Style {
 	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
   <?php echo createHiddenFieldWithKey('removedump'); ?>
 	<p><?php printMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("dump_remove");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveEvent.php b/views/bootstrap/class.RemoveEvent.php
index e3281ca4f..27748211d 100644
--- a/views/bootstrap/class.RemoveEvent.php
+++ b/views/bootstrap/class.RemoveEvent.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveEvent extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index d34ea9551..ce0ed12b7 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Bootstrap_Style {
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><button class="btn" type="submit"><i class="icon-remove"></i> <?php printMLText("rm_folder");?></button></p>
+	<p><button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveGroup.php b/views/bootstrap/class.RemoveGroup.php
index b90b58907..09efdacb5 100644
--- a/views/bootstrap/class.RemoveGroup.php
+++ b/views/bootstrap/class.RemoveGroup.php
@@ -51,7 +51,7 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Bootstrap_Style {
 <p>
 <?php printMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName())));?>
 </p>
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveLog.php b/views/bootstrap/class.RemoveLog.php
index fc8d88205..96b400a2f 100644
--- a/views/bootstrap/class.RemoveLog.php
+++ b/views/bootstrap/class.RemoveLog.php
@@ -54,7 +54,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
-	<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_file");?></button></p>
+	<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveUser.php b/views/bootstrap/class.RemoveUser.php
index 355788dd7..c8534df93 100644
--- a/views/bootstrap/class.RemoveUser.php
+++ b/views/bootstrap/class.RemoveUser.php
@@ -76,7 +76,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Bootstrap_Style {
 
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user");?></button>
+		<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
 	</div>
 </div>
 
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index c28dcdcfd..5f0cb1393 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -201,7 +201,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 			)
 		);
 		 */
-		$this->formSubmit("<i class=\"icon-remove\"></i> ".getMLText('rm_user_from_processes'));
+		$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes'));
 ?>
 
 </form>
diff --git a/views/bootstrap/class.RemoveVersion.php b/views/bootstrap/class.RemoveVersion.php
index 50beed15c..c655bcbf1 100644
--- a/views/bootstrap/class.RemoveVersion.php
+++ b/views/bootstrap/class.RemoveVersion.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
 	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
-  <p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_version");?></button></p>
+  <p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveWorkflow.php b/views/bootstrap/class.RemoveWorkflow.php
index 474ea3939..465d771eb 100644
--- a/views/bootstrap/class.RemoveWorkflow.php
+++ b/views/bootstrap/class.RemoveWorkflow.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {
 	<form method="post" action="../op/op.RemoveWorkflow.php" name="form1">
 	<?php echo createHiddenFieldWithKey('removeworkflow'); ?>
 	<input type='hidden' name='workflowid' value='<?php echo $workflow->getId(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index 1793f27f0..9de6c747a 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -73,7 +73,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 	<?php echo createHiddenFieldWithKey('removeworkflowfromdocument'); ?>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<button type='submit' class="btn"><i class="icon-remove"></i> <?php printMLText("rm_workflow"); ?></button>
+	<button type='submit' class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_workflow"); ?></button>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 51a8fabc3..920cea858 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -189,12 +189,12 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
         </label><br />
         <span class="input-append date" style="display: inline;" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createstart" type="text" value="<?php if($startdate) printf("%04d-%02d-%02d", $startdate['year'], $startdate['month'], $startdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="createend" type="text" value="<?php if($stopdate) printf("%04d-%02d-%02d", $stopdate['year'], $stopdate['month'], $stopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -217,7 +217,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -297,12 +297,12 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
         </label><br />
         <span class="input-append date" style="display: inline;" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationstart" type="text" value="<?php if($expstartdate) printf("%04d-%02d-%02d", $expstartdate['year'], $expstartdate['month'], $expstartdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" style="display: inline;" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span4" size="16" name="expirationend" type="text" value="<?php if($expstopdate) printf("%04d-%02d-%02d", $expstopdate['year'], $expstopdate['month'], $expstopdate['day']); else echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -431,7 +431,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php
index a53dc3893..24ce015ee 100644
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@@ -182,12 +182,12 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="createend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
@@ -199,17 +199,17 @@ $(document).ready(function() {
         </label>
         <span class="input-append date" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationstart" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>&nbsp;
 				<?php printMLText("and"); ?>
         <span class="input-append date" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expirationend" type="text" value="<?php echo date('Y-m-d'); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
@@ -271,7 +271,7 @@ $(document).ready(function() {
 </td>
 </tr>
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="fa fa-search"> <?php printMLText("search"); ?></button></td>
 </tr>
 </table>
 
diff --git a/views/bootstrap/class.SendLoginData.php b/views/bootstrap/class.SendLoginData.php
index 7d1d7d22b..86363bfbb 100644
--- a/views/bootstrap/class.SendLoginData.php
+++ b/views/bootstrap/class.SendLoginData.php
@@ -54,7 +54,7 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
 				'name'=>'comment',
 			)
 		);
-		$this->formSubmit("<i class=\"icon-envelope-alt\"></i> ".getMLText('send_email'));
+		$this->formSubmit("<i class=\"fa fa-envelope-o\"></i> ".getMLText('send_email'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index ed477034c..7c29b5431 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -63,14 +63,14 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 				if(!$sesuser->isHidden()) {
 					$c++;
 					$hasuser = true;
-					$ucontent .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
+					$ucontent .= "    <li><a _href=\"\"><i class=\"fa fa-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
 				}
 		}
 		if($c) {
 			$content = '';
 			$content .= "   <ul id=\"main-menu-session\" class=\"nav pull-right\">\n";
 			$content .= "    <li class=\"dropdown add-session-area\">\n";
-			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-session-area\">".getMLText('sessions')." (".$c.") <i class=\"fa fa-caret-down\"></i></a>\n";
 			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			$content .= $ucontent;
 			$content .= "     </ul>\n";
diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index cd4df87ba..3aa15ddd6 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -87,7 +87,7 @@ $(document).ready( function() {
 			getMLText("expires"),
 			$this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage())
 		);
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 1d837ebf5..94b95f7ab 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -626,7 +626,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php
 if(is_writeable($settings->_configFilePath)) {
 ?>
-  <button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+  <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 <?php
 }
 ?>
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index e4560c635..fd193b367 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -97,7 +97,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
-				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
+				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index ce7b83011..6de76c080 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -155,7 +155,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['workflow'])) {
-		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -217,15 +217,15 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content = '';
 		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
 		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
 		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
@@ -271,7 +271,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 					$content .= "</td>\n";
 					$content .= "<td>\n";
-					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 					$content .= "</td>\n";
 					//$content .= "</tr>\n";
 					$content .= $this->folderListRowEnd($folder);
@@ -309,7 +309,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 						}
 						$content .= "</td>\n";
 						$content .= "<td>\n";
-						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
 						$content .= "</td>\n";
 						$content .= "</tr>";
 						$doccount++;
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index ce6a7cef5..908d979e8 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -243,11 +243,11 @@ div.timeline-event-selected {
 		$html = '
        <span class="input-append date" style="display: inline;" id="fromdate" data-date="'.date('Y-m-d', $from).'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 			 <input type="text" class="input-small" name="fromdate" value="'.date('Y-m-d', $from).'"/>
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span> -
       <span class="input-append date" style="display: inline;" id="todate" data-date="'.date('Y-m-d', $to).'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
 			<input type="text" class="input-small" name="todate" value="'.date('Y-m-d', $to).'"/>
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>';
 		$this->formField(
 			getMLText("date"),
@@ -274,7 +274,7 @@ div.timeline-event-selected {
 			getMLText("exclude_items"),
 			$html
 		);
-		$this->formSubmit('<i class="icon-search"></i> '.getMLText('update'), 'update');
+		$this->formSubmit('<i class="fa fa-search"></i> '.getMLText('update'), 'update');
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.TransferDocument.php b/views/bootstrap/class.TransferDocument.php
index 941526dcc..fb4f51f16 100644
--- a/views/bootstrap/class.TransferDocument.php
+++ b/views/bootstrap/class.TransferDocument.php
@@ -63,7 +63,7 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
 			getMLText("transfer_to_user"),
 			$html
 		);
-		$this->formSubmit("<i class=\"icon-exchange\"></i> ".getMLText('transfer_document'));
+		$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.TransferObjects.php b/views/bootstrap/class.TransferObjects.php
index 2baba8902..09a19d18c 100644
--- a/views/bootstrap/class.TransferObjects.php
+++ b/views/bootstrap/class.TransferObjects.php
@@ -68,7 +68,7 @@ class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit("<i class=\"icon-share-alt\"></i> ".getMLText('transfer_objects'));
+		$this->formSubmit("<i class=\"fa fa-share-alt\"></i> ".getMLText('transfer_objects'));
 ?>
 </form>
 <?php
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 43e396a3c..c4ad359dc 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -153,9 +153,9 @@ console.log(element);
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
-			$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
+			$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/fine-uploader/jquery.fine-uploader.min.js"></script>'."\n", 'js');
 			$this->htmlAddHeader($this->getFineUploaderTemplate(), 'js');
 		}
 
diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php
index 4b86166fe..f731fec6b 100644
--- a/views/bootstrap/class.UserDefaultKeywords.php
+++ b/views/bootstrap/class.UserDefaultKeywords.php
@@ -138,7 +138,7 @@ $(document).ready(function() {
 					<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="action" value="removecategory">
 						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
 					</form>
 				</div>
 
@@ -150,7 +150,7 @@ $(document).ready(function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName())?>">
-  						<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+  						<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 					</div>
 				</div>
 				</form>
@@ -169,14 +169,14 @@ $(document).ready(function() {
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="editkeywords">
 									<input type="text" name="keywords" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+									<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.UserDefaultKeywords.php" >
   								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("delete")?></button>
+									<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
 									</form>
 									<br>
 						<?php }  ?>
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 5c5063d2f..49350275b 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -115,8 +115,8 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			echo "<div class=\"list-action\">";
-     	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
-     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
+     	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"fa fa-edit\"></i></a> ";
+     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"fa fa-remove\"></i></a>";
 			echo "</div>";
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 2fd60daaa..ba94536ae 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -182,14 +182,14 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			if(!in_array($seluser->getID(), $undeluserids)) {
-				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a><li>';
+				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user").'</a><li>';
 			}
-			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
-			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="icon-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
+			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
+			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="fa fa-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
+				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"fa fa-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
 			if($enableemail)
-				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="icon-envelope-alt"></i> '.getMLText("send_login_data").'</a></li>';
+				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="fa fa-envelope-o"></i> '.getMLText("send_login_data").'</a></li>';
 ?>
 	</ul>
 </div>
@@ -508,7 +508,7 @@ $(document).ready( function() {
 				);
 			}
 		}
-		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText($currUser ? "save" : "add_user"));
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($currUser ? "save" : "add_user"));
 ?>
 	</form>
 <?php
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8555a8cc1..4790211cc 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -664,48 +664,48 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
+			print "<li><a href=\"../op/op.Download.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a></li>";
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=". $latestContent->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
 			if($accessop->mayEditVersion()) {
-				print "<li><a href=\"../out/out.EditOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
+				print "<li><a href=\"../out/out.EditOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_version")."</a></li>";
 			}
 		}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
 		if($accessop->mayRemoveVersion()) {
-			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-remove\"></i>".getMLText("rm_version")."</a></li>";
 		}
 		if($accessop->mayOverwriteStatus()) {
-			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
 			if($accessop->maySetReviewersApprovers()) {
-				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
+				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-edit\"></i>".getMLText("change_assignments")."</a></li>";
 			}
 		} elseif($workflowmode == 'advanced') {
 			if($accessop->maySetWorkflow()) {
 				if(!$workflow) {
-					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"icon-random\"></i>".getMLText("set_workflow")."</a></li>";
+					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."'><i class=\"fa fa-random\"></i>".getMLText("set_workflow")."</a></li>";
 				}
 			}
 		}
 		/*
 		if($accessop->maySetExpires()) {
-			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"icon-time\"></i>".getMLText("set_expiry")."</a></li>";
+			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"fa fa-clock-o\"></i>".getMLText("set_expiry")."</a></li>";
 		}
 		*/
 		if($accessop->mayEditComment()) {
-			print "<li><a href=\"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+			print "<li><a href=\"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-comment\"></i>".getMLText("edit_comment")."</a></li>";
 		}
 		if($accessop->mayEditAttributes()) {
-			print "<li><a href=\"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+			print "<li><a href=\"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 		}
 
 		$items = $this->callHook('extraVersionActions', $latestContent);
@@ -714,7 +714,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if(is_string($item))
 					echo "<li>".$item."</li>";
 				elseif(is_array($item))
-					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 			}
 		}
 
@@ -800,7 +800,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -817,7 +817,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -837,7 +837,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print htmlspecialchars($r["comment"]);
 				if($r['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
@@ -888,7 +888,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -905,7 +905,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -925,7 +925,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print htmlspecialchars($a["comment"]);
 				if($a['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
@@ -1000,9 +1000,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
-					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
+					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
-					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
+					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$latestContent->getDocument()->getId()."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"fa fa-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
 			}
 
@@ -1017,7 +1017,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach($transitions as $transition) {
 				$nextstate = $transition->getNextState();
 				$docstatus = $nextstate->getDocumentStatus();
-				echo "<td><i class=\"icon-circle".($docstatus == S_RELEASED ? " released" : ($docstatus == S_REJECTED ? " rejected" : " in-workflow"))."\"></i> ".htmlspecialchars($nextstate->getName())."</td>";
+				echo "<td><i class=\"fa fa-circle".($docstatus == S_RELEASED ? " released" : ($docstatus == S_REJECTED ? " rejected" : " in-workflow"))."\"></i> ".htmlspecialchars($nextstate->getName())."</td>";
 			}
 			echo "</tr>";
 			echo "<tr>";
@@ -1270,9 +1270,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
-					print "<li><a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-download\"></i>".getMLText("download")."</a>";
 					if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a>";
 					print "</ul>";
 					print "<ul class=\"actions unstyled\">";
 				}
@@ -1280,22 +1280,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				 * user if enableVersionDeletion is on
 				 */
 				if($accessop->mayRemoveVersion()) {
-					print "<li><a href=\"out.RemoveVersion.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+					print "<li><a href=\"out.RemoveVersion.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-remove\"></i>".getMLText("rm_version")."</a></li>";
 				}
 				if($accessop->mayEditComment()) {
-					print "<li><a href=\"out.EditComment.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+					print "<li><a href=\"out.EditComment.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-comment\"></i>".getMLText("edit_comment")."</a></li>";
 				}
 				if($accessop->mayEditAttributes()) {
-					print "<li><a href=\"out.EditAttributes.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+					print "<li><a href=\"out.EditAttributes.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 				}
-				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";
+				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."'><i class=\"fa fa-info-circle\"></i>".getMLText("details")."</a></li>";
 				$items = $this->callHook('extraVersionActions', $version);
 				if($items) {
 					foreach($items as $item) {
 						if(is_string($item))
 							echo "<li>".$item."</li>";
 						elseif(is_array($item))
-							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
+							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"fa fa-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 					}
 				}
 				print "</ul>";
@@ -1365,14 +1365,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a>";
+					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"fa fa-download\"></i>".getMLText('download')."</a>";
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes)))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"fa fa-star\"></i>" . getMLText("view_online") . "</a></li>";
 				}
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-remove\"></i>".getMLText("delete")."</a></li>";
-					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"icon-edit\"></i>".getMLText("edit")."</a></li>";
+					print "<li><a href=\"out.RemoveDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-remove\"></i>".getMLText("delete")."</a></li>";
+					print "<li><a href=\"out.EditDocumentFile.php?documentid=".$documentid."&fileid=".$file->getID()."\"><i class=\"fa fa-edit\"></i>".getMLText("edit")."</a></li>";
 				}
 				print "</ul></td>";		
 				
@@ -1421,7 +1421,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($targetDoc);
 			}
@@ -1449,7 +1449,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					)
 				);
 			}
-			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 			</form>
 <?php
@@ -1486,7 +1486,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
 					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$sourceDoc->getId()."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				echo $this->documentListRowEnd($sourceDoc);
 			}
diff --git a/views/bootstrap/class.ViewEvent.php b/views/bootstrap/class.ViewEvent.php
index 35a270e93..85eb4ac29 100644
--- a/views/bootstrap/class.ViewEvent.php
+++ b/views/bootstrap/class.ViewEvent.php
@@ -82,8 +82,8 @@ class SeedDMS_View_ViewEvent extends SeedDMS_Bootstrap_Style {
 			echo "<tr>";
 			echo "<td></td>";
 			echo "<td>";
-			print "<a href=\"../out/out.RemoveEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a> ";
-			print "<a href=\"../out/out.EditEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"icon-edit\"></i> ".getMLText("edit")."</a>";
+			print "<a href=\"../out/out.RemoveEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</a> ";
+			print "<a href=\"../out/out.EditEvent.php?id=".$event["id"]."\" class=\"btn\"><i class=\"fa fa-edit\"></i> ".getMLText("edit")."</a>";
 			echo "</tr>";
 		}
 
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index fa0ebd8d7..7aec058e9 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -356,11 +356,11 @@ $('body').on('click', '.order-btn', function(ev) {
 			else {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
-				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="icon-arrow-up"></i></button>' : '')."</th>\n";	
+				print "<th>".($parent ? '<button class="btn btn-mini btn-default" id="goto-parent" data-parentid="'.$parent->getID().'"><i class="fa fa-arrow-up"></i></button>' : '')."</th>\n";	
 				print "<th>".getMLText("name");
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="icon-sort-by-alphabet selected"></i>':($orderby=="nd"?' <i class="icon-sort-by-alphabet-alt selected"></i>':' <i class="icon-sort-by-alphabet"></i>'))."</a>";
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="icon-sort-by-order selected"></i>':($orderby=="sd"?' <i class="icon-sort-by-order-alt selected"></i>':' <i class="icon-sort-by-order"></i>'))."</a>";
-				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="d"||$orderby=="da"?"&orderby=dd":"&orderby=d")."\" data-orderby=\"".($orderby=="d"||$orderby=="da"?"dd":"d")."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="icon-sort-by-attributes selected"></i>':($orderby=="dd"?' <i class="icon-sort-by-attributes-alt selected"></i>':' <i class="icon-sort-by-attributes"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"||$orderby=="na"?"&orderby=nd":"&orderby=n")."\" data-orderby=\"".($orderby=="n"||$orderby=="na"?"nd":"n")."\"title=\"".getMLText("sort_by_name")."\">".($orderby=="n"||$orderby=="na"?' <i class="fa fa-sort-alpha-asc selected"></i>':($orderby=="nd"?' <i class="fa fa-sort-alpha-desc selected"></i>':' <i class="fa fa-sort-alpha-asc"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="s"||$orderby=="sa"?"&orderby=sd":"&orderby=s")."\" data-orderby=\"".($orderby=="s"||$orderby=="sa"?"sd":"s")."\" title=\"".getMLText("sort_by_sequence")."\">".($orderby=="s"||$orderby=="sa"?' <i class="fa fa-sort-numeric-asc selected"></i>':($orderby=="sd"?' <i class="fa fa-sort-numeric-desc selected"></i>':' <i class="fa fa-sort-numeric-asc"></i>'))."</a>";
+				print " <a class=\"order-btn\" href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="d"||$orderby=="da"?"&orderby=dd":"&orderby=d")."\" data-orderby=\"".($orderby=="d"||$orderby=="da"?"dd":"d")."\" title=\"".getMLText("sort_by_date")."\">".($orderby=="d"||$orderby=="da"?' <i class="fa fa-sort-amount-asc selected"></i>':($orderby=="dd"?' <i class="fa fa-sort-amount-desc selected"></i>':' <i class="fa fa-sort-amount-asc"></i>'))."</a>";
 				print "</th>\n";
 	//			print "<th>".getMLText("owner")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
@@ -575,7 +575,7 @@ $('body').on('click', '.order-btn', function(ev) {
 
 			if ($enableFolderTree) {
 				if ($showtree==1){
-					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
+					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"fa fa-minus-circle\"></i></a>", true);
 					$this->contentContainerStart();
 					/*
 					 * access expandFolderTree with $this->params because it can
@@ -584,7 +584,7 @@ $('body').on('click', '.order-btn', function(ev) {
 					$this->printNewTreeNavigationHtml($folderid, M_READ, 0, '', ($this->params['expandFolderTree'] == 1) ? -1 : 3, $orderby);
 					$this->contentContainerEnd();
 				} else {
-					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
+					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"fa fa-plus-circle\"></i></a>", true);
 				}
 			}
 
diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php
index 55bf3aeab..758673dbe 100644
--- a/views/bootstrap/class.WorkflowActionsMgr.php
+++ b/views/bootstrap/class.WorkflowActionsMgr.php
@@ -88,9 +88,9 @@ $(document).ready( function() {
 						echo "<td>";
 						echo htmlspecialchars($workflow->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
+						echo '<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+						echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 						echo "</td></tr>";
 					}
 					echo "</tbody>";
@@ -115,7 +115,7 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflowaction->isUsed()) {
-				echo '<li><a href="../op/op.RemoveWorkflowAction.php?workflowactionid='.$selworkflowaction->getID().'&formtoken='.createFormKey('removeworkflowaction').'"><i class="icon-remove"></i> '.getMLText("rm_workflow_action").'</a><li>';
+				echo '<li><a href="../op/op.RemoveWorkflowAction.php?workflowactionid='.$selworkflowaction->getID().'&formtoken='.createFormKey('removeworkflowaction').'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow_action").'</a><li>';
 			}
 ?>
 	</ul>
@@ -156,7 +156,7 @@ $(document).ready( function() {
 				'value'=>($action ? htmlspecialchars($action->getName()) : '')
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index f9b5cbd0c..387b6a1f5 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -154,7 +154,7 @@ cy.on('tap', 'node', function(evt) {
 	var scratch = node.scratch('app');
 	if(typeof scratch !== 'undefined') {
 	noty({
-		text: (scratch.users ? '<p><?= '<i class="icon-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="icon-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
+		text: (scratch.users ? '<p><?= '<i class="fa fa-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="fa fa-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
 		type: 'information',
 		dismissQueue: true,
 		layout: 'topCenter',
@@ -335,11 +335,11 @@ div.buttons #zoom {margin: 3px; _float: right;}
 <div id="preview">
 	<img id="png" />
 	<div id="legend">
-		<i class="icon-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
-		<i class="icon-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
-		<i class="icon-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
-		<i class="icon-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
-		<i class="icon-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
+		<i class="fa fa-circle initstate"></i> <?php printMLText("workflow_initstate"); ?><br />
+		<i class="fa fa-circle released"></i> <?php echo getOverallStatusText(S_RELEASED); ?><br />
+		<i class="fa fa-circle rejected"></i> <?php echo getOverallStatusText(S_REJECTED); ?><br />
+		<i class="fa fa-circle in-workflow"></i> <?php echo getOverallStatusText(S_IN_WORKFLOW); ?><br />
+		<i class="fa fa-sign-blank workflow-action"></i> <?php echo printMLText('global_workflow_actions'); ?>
 	</div>
 	<div class="buttons">
 		<div id="zoom"><button class="btn btn-mini btn-default">Zoom</button></div>
diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php
index d918b728d..d8b1c0535 100644
--- a/views/bootstrap/class.WorkflowMgr.php
+++ b/views/bootstrap/class.WorkflowMgr.php
@@ -97,7 +97,7 @@ $(document).ready(function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflow->isUsed()) {
-				echo '<li><a href="../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID().'"><i class="icon-remove"></i> '.getMLText("rm_workflow").'</a><li>';
+				echo '<li><a href="../out/out.RemoveWorkflow.php?workflowid='.$selworkflow->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow").'</a><li>';
 			}
 ?>
 	</ul>
@@ -119,7 +119,7 @@ $(document).ready(function() {
 				foreach($path as $state) {
 					$names[] = htmlspecialchars($state->getName());
 				}
-				$this->errorMsg(getMLText('workflow_has_cycle').": ".implode(' <i class="icon-arrow-right"></i> ', $names));
+				$this->errorMsg(getMLText('workflow_has_cycle').": ".implode(' <i class="fa fa-arrow-right"></i> ', $names));
 			}
 
 			$transitions = $workflow->getTransitions();
@@ -197,7 +197,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>
@@ -219,23 +219,23 @@ $(document).ready(function() {
 				if(!$transusers && !$transgroups) {
 					echo " class=\"error\"";
 				}
-				echo "><td>".'<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName())."<br />";
+				echo "><td>".'<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName())."<br />";
 				$docstatus = $nextstate->getDocumentStatus();
-				echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+				echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 				if($docstatus == S_RELEASED || $docstatus == S_REJECTED) {
-					echo "<br /><i class=\"icon-arrow-right\"></i> ".getOverallStatusText($docstatus);
+					echo "<br /><i class=\"fa fa-arrow-right\"></i> ".getOverallStatusText($docstatus);
 				}
 				echo "</td>";
-				echo "<td><i class=\"icon-sign-blank workflow-action\"></i> ".htmlspecialchars($action->getName())."</td>";
+				echo "<td><i class=\"fa fa-sign-blank workflow-action\"></i> ".htmlspecialchars($action->getName())."</td>";
 				echo "<td>";
 				foreach($transusers as $transuser) {
 					$u = $transuser->getUser();
-					echo '<i class="icon-user"></i> '.htmlspecialchars($u->getLogin()." - ".$u->getFullName());
+					echo '<i class="fa fa-user"></i> '.htmlspecialchars($u->getLogin()." - ".$u->getFullName());
 					echo "<br />";
 				}
 				foreach($transgroups as $transgroup) {
 					$g = $transgroup->getGroup();
-					echo '<i class="icon-group"></i> '.getMLText('at_least_n_users_of_group',
+					echo '<i class="fa fa-group"></i> '.getMLText('at_least_n_users_of_group',
 						array("number_of_users" => $transgroup->getNumOfUsers(),
 							"group" => htmlspecialchars($g->getName())));
 					echo "<br />";
@@ -247,7 +247,7 @@ $(document).ready(function() {
   <?php echo createHiddenFieldWithKey('removetransitionfromworkflow'); ?>
 	<input type="hidden" name="workflow" value="<?php print $workflow->getID();?>">
 	<input type="hidden" name="transition" value="<?php print $transition->getID(); ?>">
-	<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("delete");?></button>
+	<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
 </form>
 <?php
 				echo "</td>";
diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index a4da2478d..04e685890 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -89,9 +89,9 @@ $(document).ready(function() {
 						echo "<td>";
 						echo htmlspecialchars($workflow->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
+						echo '<i class="fa fa-circle'.($workflow->getInitState()->getId() == $state->getId() ? ' initstate' : ' in-workflow').'"></i> '.htmlspecialchars($state->getName());
 						echo "</td><td>";
-						echo '<i class="icon-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
+						echo '<i class="fa fa-circle'.($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ' in-workflow')).'"></i> '.htmlspecialchars($nextstate->getName());
 						echo "</td></tr>";
 					}
 					echo "</tbody>";
@@ -116,7 +116,7 @@ $(document).ready(function() {
   <ul class="dropdown-menu">
 <?php
 			if(!$selworkflowstate->isUsed()) {
-				echo '<li><a href="../op/op.RemoveWorkflowState.php?workflowstateid='.$selworkflowstate->getID().'&formtoken='.createFormKey('removeworkflowstate').'"><i class="icon-remove"></i> '.getMLText("rm_workflow_state").'</a><li>';
+				echo '<li><a href="../op/op.RemoveWorkflowState.php?workflowstateid='.$selworkflowstate->getID().'&formtoken='.createFormKey('removeworkflowstate').'"><i class="fa fa-remove"></i> '.getMLText("rm_workflow_state").'</a><li>';
 			}
 ?>
 	</ul>
@@ -169,7 +169,7 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText("save"));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText("save"));
 ?>
 	</form>
 	<?php	$this->contentContainerEnd(); ?>