diff --git a/View/Elements/common_header.ctp b/View/Elements/common_header.ctp
index e182e47c..90108576 100644
--- a/View/Elements/common_header.ctp
+++ b/View/Elements/common_header.ctp
@@ -48,21 +48,13 @@ if (! isset($isSettingMode)) {
 			</div>
 			<div class="navbar-collapse collapse">
 				<ul class="nav navbar-nav navbar-right">
-					<?php if (AuthComponent::user()) : ?>
-						<li class="visible-sm">
-							<?php echo $this->NetCommonsHtml->avatarLink(Current::read(), [], [], 'User.id'); ?>
-						</li>
-						<li class="hidden-sm">
-							<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
-						</li>
-					<?php endif; ?>
-
-					<?php if (Current::hasSettingMode()) : ?>
+					<?php if (Current::hasControlPanel()) : ?>
 						<li>
-							<?php if (! $isSettingMode) : ?>
-								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode on'), NetCommonsUrl::backToPageUrl(true)); ?>
-							<?php else: ?>
-								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode off'), NetCommonsUrl::backToPageUrl()); ?>
+							<?php if (! Current::isControlPanel()): ?>
+								<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Control Panel'),
+										array('plugin' => 'control_panel', 'controller' => 'control_panel', 'action' => 'index')); ?>
+							<?php else : ?>
+								<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Back to the Rooms'), NetCommonsUrl::backToPageUrl()); ?>
 							<?php endif; ?>
 						</li>
 					<?php endif; ?>
@@ -78,17 +70,25 @@ if (! isset($isSettingMode)) {
 						</li>
 					<?php endif; ?>
 
-					<?php if (Current::hasControlPanel()) : ?>
+					<?php if (Current::hasSettingMode()) : ?>
 						<li>
-							<?php if (! Current::isControlPanel()): ?>
-								<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Control Panel'),
-										array('plugin' => 'control_panel', 'controller' => 'control_panel', 'action' => 'index')); ?>
-							<?php else : ?>
-								<?php echo $this->NetCommonsHtml->link(__d('control_panel', 'Back to the Rooms'), NetCommonsUrl::backToPageUrl()); ?>
+							<?php if (! $isSettingMode) : ?>
+								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode on'), NetCommonsUrl::backToPageUrl(true)); ?>
+							<?php else: ?>
+								<?php echo $this->NetCommonsHtml->link(__d('pages', 'Setting mode off'), NetCommonsUrl::backToPageUrl()); ?>
 							<?php endif; ?>
 						</li>
 					<?php endif; ?>
 
+					<?php if (AuthComponent::user()) : ?>
+						<li class="visible-sm">
+							<?php echo $this->NetCommonsHtml->avatarLink(Current::read(), [], [], 'User.id'); ?>
+						</li>
+						<li class="hidden-sm">
+							<?php echo $this->NetCommonsHtml->handleLink(Current::read(), ['avatar' => true], [], 'User'); ?>
+						</li>
+					<?php endif; ?>
+
 					<?php if (AuthComponent::user()) : ?>
 						<li>
 							<?php echo $this->NetCommonsHtml->link(__d('net_commons', 'Logout'), '/auth/logout'); ?>
@@ -112,4 +112,4 @@ if (! isset($isSettingMode)) {
 
 <?php
 echo $this->Session->read('appendHtml');
-CakeSession::delete('appendHtml');
\ No newline at end of file
+CakeSession::delete('appendHtml');
diff --git a/View/Helper/LinkButtonHelper.php b/View/Helper/LinkButtonHelper.php
index 7878fa39..04fcd139 100644
--- a/View/Helper/LinkButtonHelper.php
+++ b/View/Helper/LinkButtonHelper.php
@@ -213,8 +213,22 @@ private function __getLinkHtml($title, $url, $options) {
 		} else {
 			$title = '<span class="hidden-xs">' . $title . '</span>';
 		}
-		$glyphicon = 'glyphicon glyphicon-' . h($options['icon']);
-		$title = '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ' . $title;
+		if (substr($options['icon'], 0, strlen('glyphicon-')) === 'glyphicon-') {
+			$glyphicon = 'glyphicon ' . h($options['icon']);
+		} else {
+			$glyphicon = 'glyphicon glyphicon-' . h($options['icon']);
+		}
+
+		$iconTag = '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ';
+		if (Hash::get($options, 'addIcon')) {
+			if (substr($options['addIcon'], 0, strlen('glyphicon-')) === 'glyphicon-') {
+				$glyphicon = 'glyphicon ' . h($options['addIcon']);
+			} else {
+				$glyphicon = 'glyphicon glyphicon-' . h($options['addIcon']);
+			}
+			$iconTag .= '<span ' . 'class="' . $glyphicon . '"' . $ariaHidden . '></span> ';
+		}
+		$title = $iconTag . $title;
 		unset($options['icon']);
 
 		//ボタンサイズ
diff --git a/webroot/css/style.css b/webroot/css/style.css
index fd3ed1b9..3c9807fc 100644
--- a/webroot/css/style.css
+++ b/webroot/css/style.css
@@ -297,9 +297,17 @@ ul.nav-pills {
 	margin-bottom: 8px;
 }
 
+.nc-not-found {
+	margin-top: 20px;
+	margin-bottom: 4px;
+}
+
 /**
  * コンテンツリストの各コンテンツのスタイル
  */
+.frame .nc-content-list > article:first-child {
+	margin-top: 24px;
+}
 .frame .nc-content-list > article {
 	border-bottom: 1px solid #ccc;
 	padding-bottom: 8px;