diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php
index 14dde8c4c..bfc3c25c0 100644
--- a/e107_admin/emoticon.php
+++ b/e107_admin/emoticon.php
@@ -22,6 +22,8 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 
 $e_sub_cat = 'emoticon';
 
+e107::getConfig('emote')->clearPrefCache('emote');
+
 require_once("auth.php");
 
 $mes = e107::getMessage();
@@ -43,6 +45,7 @@ if (isset($_POST['active']))
 		e107::getLog()->add($pref['smiley_activate'] ? 'EMOTE_02' : 'EMOTE_03', $pref['emotepack'], E_LOG_INFORMATIVE, '');
 		save_prefs();
 		$update = true;
+
 	}
 	else
 	{
@@ -181,12 +184,12 @@ class emotec
 			<form method='post' action='".e_SELF."#etabTabContainer=emoticon-packages'>
 				<fieldset>
 					<legend>".EMOLAN_13."</legend>
-					<table class='table adminlist'>
+					<table class='table adminlist' style='margin-top:10px'>
 						<colgroup>
 							<col style='width:15%' />
 							<col style='width:50%' />
-							<col style='width:15%' />
-							<col style='width:20%' />
+							<col style='width:10%' />
+							<col style='width:25%' />
 						</colgroup>
 						<thead>
 							<tr>
@@ -207,8 +210,8 @@ class emotec
 
 			$text .= "
 			<tr>
-			<td class='forumheader' style='width: 20%;'>{$pack}</td>
-			<td class='forumheader' style='width: 20%;'>
+			<td class='forumheader'>{$pack}</td>
+			<td class='forumheader'>
 			";
 
 			foreach($emoteArray as $emote)
@@ -228,24 +231,21 @@ class emotec
 
 			$text .= "
 								</td>
-								<td class='center middle'>".($pref['emotepack'] == $pack ? LAN_ACTIVE : "<button type='submit' name='defPack_".$pack."' value='".EMOLAN_11."'><span>".EMOLAN_11."</span></button>")."</td>
+								<td class='center middle'>".($pref['emotepack'] == $pack ? "<span class='label label-success'>".LAN_ACTIVE."</span>" : "<button class='btn btn-primary' type='submit' name='defPack_".$pack."' value='".EMOLAN_11."'><span>".EMOLAN_11."</span></button>")."</td>
 								<td>";
 								
 								
 								
 						
-			$text .= $frm->admin_button('subPack_'.$pack,'edit','submit',LAN_CONFIGURE);
+			$text .= $frm->admin_button('subPack_'.$pack,'edit','default',LAN_CONFIGURE);
 			
 			if ($can_scan && ($pack != 'default'))
 			{
-				$text .= "
-									
-									<button class='submit' type='submit' name='scanPack_".$pack."'><span>".EMOLAN_26."</span></button>
-				";
-				$text .= $frm->admin_button('scanPack_'.$pack,'active','submit',EMOLAN_26);
+			//	$text .= "<button class='btn btn-default submit' type='submit' name='scanPack_".$pack."'><span>".EMOLAN_26."</span></button>";
+				$text .= $frm->admin_button('scanPack_'.$pack,'active','default',EMOLAN_26);
 			}
 			
-			$text .= $frm->admin_button('XMLPack_'.$pack,'submit','submit',EMOLAN_28);
+			$text .= $frm->admin_button('XMLPack_'.$pack,'submit','default',EMOLAN_28);
 			$text .= "
 								</td>
 							</tr>
@@ -292,7 +292,7 @@ class emotec
 		<form method='post' action='".e_SELF."#etabTabContainer=emoticon-packages'>
 			<fieldset id='core-emoticon-configure'>
 				<legend class='e-hideme'>".LAN_EDIT."</legend>
-				<div class='info-bar'><strong>".sprintf(str_replace("[x]", "%u", EMOLAN_31), count($eArray))."</strong></div>
+				<div class='info-bar' style='padding-bottom:10px'>".$tp->lanVars(EMOLAN_31, count($eArray))."</div>
 				<table class='table adminlist'>
 					<colgroup>
 						<col style='width:20px' />
@@ -318,11 +318,11 @@ class emotec
 
 			if (!isset($emotecode[$evalue]))
 			{
-			 	$file_back = '<span class="error">&nbsp;&nbsp;'.EMOLAN_37.'</span>';
+			 	$file_back = '&nbsp;&nbsp;<span class="label label-danger error">'.EMOLAN_37.'</span>';
 			}
 			elseif (!$emotecode[$evalue])
 			{
-			   $text_back = '<span class="error">&nbsp;&nbsp;'.EMOLAN_38.'</span>';
+			   $text_back = '&nbsp;&nbsp;<span class="label label-danger error">'.EMOLAN_38.'</span>';
 			}
 			$text .= "
 					<tr>
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 58d05cefc..fee79b381 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3994,14 +3994,15 @@ class e_emotefilter {
 	{		
 		$pref = e107::getPref();
 		
-		if(!$pref['emotepack'])	
+		if(empty($pref['emotepack']))
 		{	
 			$pref['emotepack'] = "default";
-			save_prefs();
+			e107::getConfig('emote')->clearPrefCache('emote');
+			e107::getConfig('core')->set('emotepack','default')->save(false,true,false);
 		}
-			
+
 		$this->emotes = e107::getConfig("emote")->getPref();
-		
+
 		if(!vartrue($this->emotes))
 		{
 			return;
@@ -4056,12 +4057,14 @@ class e_emotefilter {
 		  }
 		}
 	}
-	 
+
+
 	function filterEmotes($text)
 	{	 
 		$text = str_replace($this->search, $this->replace, $text);
 		return $text;
 	}
+
 	 
 	function filterEmotesRev($text)
 	{
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index a70a7c74a..8e491b9c8 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2331,7 +2331,8 @@ class e_form
 			case 'filter e-hide-if-js': // FIXME hide-js shouldn't be here. 
 				$options['class'] .= 'btn-primary';
 			break;
-			
+
+			case 'default':
 			default:
 				$options['class'] .= 'btn-default';
 			break;
diff --git a/e107_handlers/pref_class.php b/e107_handlers/pref_class.php
index 770e0ef72..b3dc6fa13 100644
--- a/e107_handlers/pref_class.php
+++ b/e107_handlers/pref_class.php
@@ -807,9 +807,19 @@ final class e_core_pref extends e_pref
 	 */
 	function __construct($alias, $load = true)
 	{
+
+
 		$pref_alias = $alias;
+
+		if($alias == 'emote')
+		{
+			$pack = e107::pref('core','emotepack');
+			$this->aliases['emote'] = 'emote_'.$pack;
+		}
+
 		$pref_id = $this->getConfigId($alias);
 
+
 		if(!$pref_id)
 		{
 			$pref_id = $pref_alias = '';
@@ -832,6 +842,8 @@ final class e_core_pref extends e_pref
 		{
 			$this->load();
 		}
+
+
 	}
 
 	/**
@@ -928,7 +940,7 @@ class e_plugin_pref extends e_pref
 		$ret = false;
 		if($this->plugin_id)
 		{
-			$ret = e107::getDb($this->plugin_id)->db_Delete('core', "e107_name='{$this->plugin_id}'");
+			$ret = e107::getDb($this->plugin_id)->delete('core', "e107_name='{$this->plugin_id}'");
 			$this->destroy();
 		}
 		return $ret;
@@ -982,11 +994,11 @@ class prefs
 				$Args .= ($Args ? " OR e107_name='{$v}'" : "e107_name='{$v}'");
 			}
 		}
-		if (!$sql->db_Select('core', '*', $Args, 'default'))
+		if (!$sql->select('core', '*', $Args, 'default'))
 		{
 			return FALSE;
 		}
-		while ($row = $sql->db_Fetch())
+		while ($row = $sql->fetch())
 		{
 			$this->prefVals['core'][$row['e107_name']] = $row['e107_value'];
 		}