Fix #383 - uses classes for styling menu items

9 files changed, 722 insertions, 745 deletions

diff --git a/app/Controller/MediaController.php b/app/Controller/MediaController.php
index b320bb32aa..3d912e4f88 100644
--- a/app/Controller/MediaController.php
+++ b/app/Controller/MediaController.php
@@ -138,20 +138,17 @@ class MediaController extends GedcomRecordController {
 	static function getMediaListMenu(Media $mediaobject) {
 		$html = '';
 
-		$menu = new Menu(I18N::translate('Edit details'), '#', '', "return window.open('addmedia.php?action=editmedia&pid=" . $mediaobject->getXref() . "', '_blank', edit_window_specs);");
-		$menu->addClass('', '', 'lb-image_edit');
+		$menu = new Menu(I18N::translate('Edit details'), '#', 'lb-image_edit', "return window.open('addmedia.php?action=editmedia&pid=" . $mediaobject->getXref() . "', '_blank', edit_window_specs);");
 		$html .= '<ul class="makeMenu lb-menu">' . $menu->getMenuAsList() . '</ul>';
 
-		$menu = new Menu(I18N::translate('Manage links'), '#', '', "return ilinkitem('" . $mediaobject->getXref() . "','person')", array(
+		$menu = new Menu(I18N::translate('Manage links'), '#', 'lb-image_link', "return ilinkitem('" . $mediaobject->getXref() . "','person')", array(
 			new Menu(I18N::translate('Link this media object to an individual'), '#', '', "return ilinkitem('" . $mediaobject->getXref() . "','person')"),
 			new Menu(I18N::translate('Link this media object to a family'), '#', '', "return ilinkitem('" . $mediaobject->getXref() . "','family')"),
 			new Menu(I18N::translate('Link this media object to a source'), '#', '', "return ilinkitem('" . $mediaobject->getXref() . "','source')"),
 		));
-		$menu->addClass('', '', 'lb-image_link');
 		$html .= '<ul class="makeMenu lb-menu">' . $menu->getMenuAsList() . '</ul>';
 
-		$menu = new Menu(I18N::translate('View details'), $mediaobject->getHtmlUrl());
-		$menu->addClass('', '', 'lb-image_view');
+		$menu = new Menu(I18N::translate('View details'), $mediaobject->getHtmlUrl(), 'lb-image_view');
 		$html .= '<ul class="makeMenu lb-menu">' . $menu->getMenuAsList() . '</ul>';
 
 		return '<div class="lightbox-menu">' . $html . '</div>';
diff --git a/app/Menu.php b/app/Menu.php
index 9b2bcc0a80..5d1aa30c9c 100644
--- a/app/Menu.php
+++ b/app/Menu.php
@@ -26,8 +26,8 @@ class Menu {
 	/** @var string The target URL or href*/
 	private $link;
 
-	/** @var string The CSS ID to be used for this menu item */
-	private $id;
+	/** @var string The CSS class used to style this menu item */
+	private $class;
 
 	/** @var string An onclick action, typically used with a link of "#" */
 	private $onclick;
@@ -45,22 +45,22 @@ class Menu {
 	private $iconclass;
 
 	/** @var string Used to format javascript menus */
-	private $class;
+	private $menuclass;
 
 	/**
 	 * Constructor for the menu class
 	 *
 	 * @param string    $label    The label for the menu item
 	 * @param string    $link     The target URL
-	 * @param string    $id       An CSS identifier
+	 * @param string    $class    An CSS class
 	 * @param string    $onclick  A javascript onclick handler
 	 * @param Menu[] $submenus Any submenus
 	 */
-	public function __construct($label, $link = '#', $id = '', $onclick = '', $submenus = array()) {
+	public function __construct($label, $link = '#', $class = '', $onclick = '', $submenus = array()) {
 		$this
 			->setLabel($label)
 			->setLink($link)
-			->setId($id)
+			->setClass($class)
 			->setOnclick($onclick)
 			->setSubmenus($submenus);
 	}
@@ -81,17 +81,6 @@ class Menu {
 	 * @return string
 	 */
 	public function bootstrap() {
-		if ($this->iconclass) {
-			$class = ' class="' . $this->iconclass . '"';
-		} else {
-			$class = '';
-		}
-		if ($this->id) {
-			$id = ' id="' . $this->id . '"';
-		} else {
-			$id = '';
-		}
-
 		if ($this->submenus) {
 			$submenus = '';
 			foreach ($this->submenus as $submenu) {
@@ -99,7 +88,7 @@ class Menu {
 			}
 
 			return
-				'<li' . $id . ' class="dropdown">' .
+				'<li class="' . $this->class . ' dropdown">' .
 				'<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">' .
 				$this->label .
 				' <span class="caret"></span></a>' .
@@ -114,19 +103,19 @@ class Menu {
 				$onclick = '';
 			}
 
-			return '<li' . $id . $class . '><a href="' . $this->link . '"' . $onclick . '>' . $this->label . '</a></li>';
+			return '<li class="' . $this->class . '"><a href="' . $this->link . '"' . $onclick . '>' . $this->label . '</a></li>';
 		}
 	}
 
 	/**
-	 * Set the CSS classes for this menu
+	 * Set the CSS classes for the (legacy) javascript menus
 	 *
 	 * @param string $class
 	 * @param string $submenuclass
 	 * @param string $iconclass
 	 */
-	public function addClass($class, $submenuclass = '', $iconclass = '') {
-		$this->class = $class;
+	public function addClass($menuclass, $submenuclass = '', $iconclass = '') {
+		$this->menuclass = $menuclass;
 		$this->submenuclass = $submenuclass;
 		$this->iconclass = $iconclass;
 	}
@@ -134,17 +123,17 @@ class Menu {
 	/**
 	 * @return string
 	 */
-	public function getId() {
-		return $this->id;
+	public function getClass() {
+		return $this->class;
 	}
 
 	/**
-	 * @param string $id
+	 * @param string $class
 	 *
 	 * @return $this
 	 */
-	public function setId($id) {
-		$this->id = $id;
+	public function setClass($class) {
+		$this->class = $class;
 
 		return $this;
 	}
@@ -231,7 +220,7 @@ class Menu {
 		}
 		$id = $menucount . rand();
 		$c = count($this->submenus);
-		$output = "<div id=\"menu{$id}\" class=\"{$this->class}\">";
+		$output = "<div id=\"menu{$id}\" class=\"{$this->menuclass}\">";
 		$link = "<a href=\"{$this->link}\" onmouseover=\"";
 		if ($c >= 0) {
 			$link .= "show_submenu('menu{$id}_subs', 'menu{$id}');";
@@ -274,11 +263,6 @@ class Menu {
 	 * @return string
 	 */
 	public function getMenuAsList() {
-		if ($this->iconclass) {
-			$class = ' class="' . $this->iconclass . '"';
-		} else {
-			$class = '';
-		}
 		if ($this->onclick) {
 			$onclick = ' onclick="' . $this->onclick . '"';
 		} else {
@@ -289,12 +273,7 @@ class Menu {
 		} else {
 			$link = '';
 		}
-		if ($this->id) {
-			$id = ' id="' . $this->id . '"';
-		} else {
-			$id = '';
-		}
-		$html = '<a' . $link . $class . $onclick . '>' . $this->label . '</a>';
+		$html = '<a' . $link . $onclick . '>' . $this->label . '</a>';
 		if ($this->submenus) {
 			$html .= '<ul>';
 			foreach ($this->submenus as $submenu) {
@@ -303,7 +282,7 @@ class Menu {
 			$html .= '</ul>';
 		}
 
-		return '<li' . $id . '>' . $html . '</li>';
+		return '<li class="' . $this->class . '">' . $html . '</li>';
 	}
 
 	/**
diff --git a/app/Theme/BaseTheme.php b/app/Theme/BaseTheme.php
index 350c150742..8fc0b5080b 100644
--- a/app/Theme/BaseTheme.php
+++ b/app/Theme/BaseTheme.php
@@ -1040,7 +1040,7 @@ abstract class BaseTheme {
 			// The top level menu is the pedigree chart
 			$menu = $this->menuChartPedigree($individual);
 			$menu->setLabel(I18N::translate('Charts'));
-			$menu->setId('menu-chart');
+			$menu->setClass('menu-chart');
 
 			$submenus = array_filter(array(
 				$this->menuChartAncestors($individual),
@@ -1338,11 +1338,11 @@ abstract class BaseTheme {
 
 		foreach (I18N::activeLocales() as $locale) {
 			$language_tag = $locale->languageTag();
-			$submenu = new Menu($locale->endonym(), get_query_url(array('lang' => $language_tag), '&amp;'), 'menu-language-' . $language_tag);
-			if (WT_LOCALE === $language_tag) {
-				$submenu->addClass('', '', 'active');
-			}
-			$menu->addSubmenu($submenu);
+			$menu->addSubmenu(new Menu(
+				$locale->endonym(),
+				get_query_url(array('lang' => $language_tag), '&amp;'),
+				'menu-language-' . $language_tag . (WT_LOCALE === $language_tag ? ' active' : '')
+			));
 		}
 
 		if (count($menu->getSubmenus()) > 1 && !Auth::isSearchEngine()) {
@@ -1678,10 +1678,11 @@ abstract class BaseTheme {
 		if ($this->tree && !Auth::isSearchEngine() && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
 			$submenus = array();
 			foreach (Theme::installedThemes() as $theme) {
-				$submenu = new Menu($theme->themeName(), get_query_url(array('theme' => $theme->themeId()), '&amp;'), 'menu-theme-' . $theme->themeId());
-				if ($theme === $this) {
-					$submenu->addClass('', '', 'active');
-				}
+				$submenu = new Menu(
+					$theme->themeName(),
+					get_query_url(array('theme' => $theme->themeId()), '&amp;'),
+					'menu-theme-' . $theme->themeId() . ($theme === $this ? ' active' : '')
+				);
 				$submenus[] = $submenu;
 			}
 
diff --git a/app/Theme/ColorsTheme.php b/app/Theme/ColorsTheme.php
index 2b3e9c81d5..ba6a054b29 100644
--- a/app/Theme/ColorsTheme.php
+++ b/app/Theme/ColorsTheme.php
@@ -131,11 +131,11 @@ class ColorsTheme extends CloudsTheme {
 		$menu = new Menu(/* I18N: A colour scheme */ I18N::translate('Palette'), '#', 'menu-color');
 
 		foreach ($this->palettes as $palette_id => $palette_name) {
-			$submenu = new Menu($palette_name, get_query_url(array('themecolor' => $palette_id), '&amp;'), 'menu-color-' . $palette_id);
-			if ($this->palette === $palette_id) {
-				$submenu->addClass('', '', 'active');
-			}
-			$menu->addSubmenu($submenu);
+			$menu->addSubmenu(new Menu(
+				$palette_name,
+				get_query_url(array('themecolor' => $palette_id), '&amp;'),
+				'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : '')
+			));
 		}
 
 		return $menu;
diff --git a/themes/clouds/css-1.7.0/style.css b/themes/clouds/css-1.7.0/style.css
index 7f624987ea..831c6383e5 100644
--- a/themes/clouds/css-1.7.0/style.css
+++ b/themes/clouds/css-1.7.0/style.css
@@ -4591,675 +4591,675 @@ footer .error {
 
 /* ====== Theme Icons ========== */
 /* ***** Header icons **** */
-#menu-tree {
+.menu-tree {
 	background-position: 0 0;
 }
 
-#menu-mymenu {
+.menu-mymenu {
 	background-position: 0 -204px;
 }
 
-#menu-chart {
+.menu-chart {
 	background-position: 0 -29px;
 }
 
-#menu-list {
+.menu-list {
 	background-position: 0 -59px;
 }
 
-#menu-report {
+.menu-report {
 	background-position: 0 -117px;
 }
 
-#menu-calendar {
+.menu-calendar {
 	background-position: 0 -88px;
 }
 
-#menu-search {
+.menu-search {
 	background-position: 0 -146px;
 }
 
-#menu-help {
+.menu-help {
 	background-position: 0 -175px;
 }
 
-#menu-clippings {
+.menu-clippings {
 	background-position: 0 -233px;
 }
 
-#menu-indi {
+.menu-indi {
 	background-position: 0 -261px;
 }
 
-#menu-sour {
+.menu-sour {
 	background-position: 0 -320px;
 }
 
-#menu-fam {
+.menu-fam {
 	background-position: 0 -291px;
 }
 
-#menu-obje {
+.menu-obje {
 	background-position: 0 -378px;
 }
 
-#menu-note {
+.menu-note {
 	background-position: 0 -348px;
 }
 
-#menu-repo {
+.menu-repo {
 	background-position: 0 -407px;
 }
 
-#menu-story {
+.menu-story {
 	background-position: 0 -436px;
 }
 
 /* Header Sub-menu icons */
-#menu-admin {
+.menu-admin {
 	background-position: left -644px;
 }
 
-[dir=rtl] #menu-admin {
+[dir=rtl] .menu-admin {
 	background-position: right -644px;
 }
 
-#menu-branches {
+.menu-branches {
 	background-position: left -414px;
 }
 
-[dir=rtl] #menu-branches {
+[dir=rtl] .menu-branches {
 	background-position: right -414px;
 }
 
-#menu-calendar-day {
+.menu-calendar-day {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-day {
+[dir=rtl] .menu-calendar-day {
 	background-position: right -506px;
 }
 
-#menu-calendar-month {
+.menu-calendar-month {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-month {
+[dir=rtl] .menu-calendar-month {
 	background-position: right -506px;
 }
 
-#menu-calendar-year {
+.menu-calendar-year {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-year {
+[dir=rtl] .menu-calendar-year {
 	background-position: right -506px;
 }
 
-#menu-chart-ancestry {
+.menu-chart-ancestry {
 	background-position: left -0px;
 }
 
-[dir=rtl] #menu-chart-ancestry {
+[dir=rtl] .menu-chart-ancestry {
 	background-position: right -0px;
 }
 
-#menu-chart-compact {
+.menu-chart-compact {
 	background-position: left -0px;
 }
 
-[dir=rtl] #menu-chart-compact {
+[dir=rtl] .menu-chart-compact {
 	background-position: right -0px;
 }
-#menu-chart-descendants {
+.menu-chart-descendants {
 	background-position: left -69px;
 }
 
-[dir=rtl] #menu-chart-descendants {
+[dir=rtl] .menu-chart-descendants {
 	background-position: right -69px;
 }
 
-#menu-chart-familybook {
+.menu-chart-familybook {
 	background-position: left -92px;
 }
 
-[dir=rtl] #menu-chart-familybook {
+[dir=rtl] .menu-chart-familybook {
 	background-position: right -92px;
 }
 
-#menu-chart-fanchart {
+.menu-chart-fanchart {
 	background-position: left -23px;
 }
 
-[dir=rtl] #menu-chart-fanchart {
+[dir=rtl] .menu-chart-fanchart {
 	background-position: right -23px;
 }
 
-#menu-chart-hourglass {
+.menu-chart-hourglass {
 	background-position: left -115px;
 }
 
-[dir=rtl] #menu-chart-hourglass {
+[dir=rtl] .menu-chart-hourglass {
 	background-position: right -115px;
 }
 
-#menu-chart-lifespan {
+.menu-chart-lifespan {
 	background-position: left -161px;
 }
 
-[dir=rtl] #menu-chart-lifespan {
+[dir=rtl] .menu-chart-lifespan {
 	background-position: right -161px;
 }
 
-#menu-chart-pedigree {
+.menu-chart-pedigree {
 	background-position: left -184px;
 }
 
-[dir=rtl] #menu-chart-pedigree {
+[dir=rtl] .menu-chart-pedigree {
 	background-position: right -184px;
 }
 
-#menu-chart-pedigree_map {
+.menu-chart-pedigree_map {
 	background-position: left -207px;
 }
 
-[dir=rtl] #menu-chart-pedigree_map {
+[dir=rtl] .menu-chart-pedigree_map {
 	background-position: right -207px;
 }
 
-#menu-chart-relationship {
+.menu-chart-relationship {
 	background-position: left -230px;
 }
 
-[dir=rtl] #menu-chart-relationship {
+[dir=rtl] .menu-chart-relationship {
 	background-position: right -230px;
 }
 
-#menu-chart-statistics {
+.menu-chart-statistics {
 	background-position: left -253px;
 }
 
-[dir=rtl] #menu-chart-statistics {
+[dir=rtl] .menu-chart-statistics {
 	background-position: right -253px;
 }
 
-#menu-chart-timeline {
+.menu-chart-timeline {
 	background-position: left -276px;
 }
 
-[dir=rtl] #menu-chart-timeline {
+[dir=rtl] .menu-chart-timeline {
 	background-position: right -276px;
 }
 
-#menu-chart-tree {
+.menu-chart-tree {
 	background-position: left -138px;
 }
 
-[dir=rtl] #menu-chart-tree {
+[dir=rtl] .menu-chart-tree {
 	background-position: right -138px;
 }
 
-#menu-clippingsadd {
+.menu-clippingsadd {
 	background-position: left -621px;
 }
 
-[dir=rtl] #menu-clippingsadd {
+[dir=rtl] .menu-clippingsadd {
 	background-position: right -621px;
 }
 
-#menu-clippingscart {
+.menu-clippingscart {
 	background-position: left -621px;
 }
 
-[dir=rtl] #menu-clippingscart {
+[dir=rtl] .menu-clippingscart {
 	background-position: right -621px;
 }
 
-#menu-fam-addchil {
+.menu-fam-addchil {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-addchil {
+[dir=rtl] .menu-fam-addchil {
 	background-position: right -759px;
 }
 
-#menu-fam-addfav {
+.menu-fam-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-fam-addfav {
+[dir=rtl] .menu-fam-addfav {
 	background-position: right -736px;
 }
 
-#menu-fam-change {
+.menu-fam-change {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-change {
+[dir=rtl] .menu-fam-change {
 	background-position: right -759px;
 }
 
-#menu-fam-del {
+.menu-fam-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-fam-del {
+[dir=rtl] .menu-fam-del {
 	background-position: right -713px;
 }
 
-#menu-fam-editraw {
+.menu-fam-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-fam-editraw {
+[dir=rtl] .menu-fam-editraw {
 	background-position: right -667px;
 }
 
-#menu-fam-orderchil {
+.menu-fam-orderchil {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-orderchil {
+[dir=rtl] .menu-fam-orderchil {
 	background-position: right -759px;
 }
 
-#menu-help-contents {
+.menu-help-contents {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-contents {
+[dir=rtl] .menu-help-contents {
 	background-position: right -552px;
 }
 
-#menu-help-faq {
+.menu-help-faq {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-faq {
+[dir=rtl] .menu-help-faq {
 	background-position: right -552px;
 }
 
-#menu-help-genealogy {
+.menu-help-genealogy {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-genealogy {
+[dir=rtl] .menu-help-genealogy {
 	background-position: right -552px;
 }
 
-#menu-help-hide {
+.menu-help-hide {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-hide {
+[dir=rtl] .menu-help-hide {
 	background-position: right -552px;
 }
 
-#menu-help-show {
+.menu-help-show {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-show {
+[dir=rtl] .menu-help-show {
 	background-position: right -552px;
 }
 
-#menu-help-technical {
+.menu-help-technical {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-help-technical {
+[dir=rtl] .menu-help-technical {
 	background-position: right -598px;
 }
 
-#menu-help-wiki {
+.menu-help-wiki {
 	background-position: left -575px;
 }
 
-[dir=rtl] #menu-help-wiki {
+[dir=rtl] .menu-help-wiki {
 	background-position: right -575px;
 }
 
-#menu-indi-addfav {
+.menu-indi-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-indi-addfav {
+[dir=rtl] .menu-indi-addfav {
 	background-position: right -736px;
 }
 
-#menu-indi-addname {
+.menu-indi-addname {
 	background-position: left -690px;
 }
 
-[dir=rtl] #menu-indi-addname {
+[dir=rtl] .menu-indi-addname {
 	background-position: right -690px;
 }
 
-#menu-indi-del {
+.menu-indi-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-indi-del {
+[dir=rtl] .menu-indi-del {
 	background-position: right -713px;
 }
 
-#menu-indi-editraw {
+.menu-indi-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-indi-editraw {
+[dir=rtl] .menu-indi-editraw {
 	background-position: right -667px;
 }
 
-#menu-indi-editsex {
+.menu-indi-editsex {
 	background-position: left -690px;
 }
 
-[dir=rtl] #menu-indi-editsex {
+[dir=rtl] .menu-indi-editsex {
 	background-position: right -690px;
 }
 
-#menu-list-fam {
+.menu-list-fam {
 	background-position: left -437px;
 }
 
-[dir=rtl] #menu-list-fam {
+[dir=rtl] .menu-list-fam {
 	background-position: right -437px;
 }
 
-#menu-list-indi {
+.menu-list-indi {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-list-indi {
+[dir=rtl] .menu-list-indi {
 	background-position: right -460px;
 }
 
-#menu-list-note {
+.menu-list-note {
 	background-position: left -368px;
 }
 
-[dir=rtl] #menu-list-note {
+[dir=rtl] .menu-list-note {
 	background-position: right -368px;
 }
 
-#menu-list-obje {
+.menu-list-obje {
 	background-position: left -299px;
 }
 
-[dir=rtl] #menu-list-obje {
+[dir=rtl] .menu-list-obje {
 	background-position: right -299px;
 }
 
-#menu-list-plac {
+.menu-list-plac {
 	background-position: left -322px;
 }
 
-[dir=rtl] #menu-list-plac {
+[dir=rtl] .menu-list-plac {
 	background-position: right -322px;
 }
 
-#menu-list-repo {
+.menu-list-repo {
 	background-position: left -345px;
 }
 
-[dir=rtl] #menu-list-repo {
+[dir=rtl] .menu-list-repo {
 	background-position: right -345px;
 }
 
-#menu-list-sour {
+.menu-list-sour {
 	background-position: left -391px;
 }
 
-[dir=rtl] #menu-list-sour {
+[dir=rtl] .menu-list-sour {
 	background-position: right -391px;
 }
 
-#menu-myaccount {
+.menu-myaccount {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-myaccount {
+[dir=rtl] .menu-myaccount {
 	background-position: right -598px;
 }
 
-#menu-mypage {
+.menu-mypage {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-mypage {
+[dir=rtl] .menu-mypage {
 	background-position: right -598px;
 }
 
-#menu-mypedigree {
+.menu-mypedigree {
 	background-position: left -828px;
 }
 
-[dir=rtl] #menu-mypedigree {
+[dir=rtl] .menu-mypedigree {
 	background-position: right -828px;
 }
 
-#menu-myrecord {
+.menu-myrecord {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-myrecord {
+[dir=rtl] .menu-myrecord {
 	background-position: right -460px;
 }
 
-#menu-note-addfav {
+.menu-note-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-note-fav {
+[dir=rtl] .menu-note-fav {
 	background-position: right -736px;
 }
 
-#menu-note-del {
+.menu-note-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-note-del {
+[dir=rtl] .menu-note-del {
 	background-position: right -713px;
 }
 
-#menu-note-edit {
+.menu-note-edit {
 	background-position: left -805px;
 }
 
-[dir=rtl] #menu-note-edit {
+[dir=rtl] .menu-note-edit {
 	background-position: right -805px;
 }
 
-#menu-note-editraw {
+.menu-note-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-note-editraw {
+[dir=rtl] .menu-note-editraw {
 	background-position: right -667px;
 }
 
-#menu-obje-addfav {
+.menu-obje-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-obje-addfav {
+[dir=rtl] .menu-obje-addfav {
 	background-position: right -736px;
 }
 
-#menu-obje-del {
+.menu-obje-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-obje-del {
+[dir=rtl] .menu-obje-del {
 	background-position: right -713px;
 }
 
-#menu-obje-edit {
+.menu-obje-edit {
 	background-position: left -852px;
 }
 
-[dir=rtl] #menu-obje-edit {
+[dir=rtl] .menu-obje-edit {
 	background-position: right -852px;
 }
 
-#menu-obje-editraw {
+.menu-obje-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-obje-editraw {
+[dir=rtl] .menu-obje-editraw {
 	background-position: right -667px;
 }
 
-#menu-obje-link {
+.menu-obje-link {
 	background-position: left -875px;
 }
 
-[dir=rtl] #menu-obje-link {
+[dir=rtl] .menu-obje-link {
 	background-position: right -875px;
 }
 
-#menu-obje-link-fam {
+.menu-obje-link-fam {
 	background-position: left -437px;
 }
 
-[dir=rtl] #menu-obje-link-fam {
+[dir=rtl] .menu-obje-link-fam {
 	background-position: right -437px;
 }
 
-#menu-obje-link-indi {
+.menu-obje-link-indi {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-obje-link-indi {
+[dir=rtl] .menu-obje-link-indi {
 	background-position: right -460px;
 }
 
-#menu-obje-link-sour {
+.menu-obje-link-sour {
 	background-position: left -391px;
 }
 
-[dir=rtl] #menu-obje-link-sour {
+[dir=rtl] .menu-obje-link-sour {
 	background-position: right -391px;
 }
 
-#menu-repo-addfav {
+.menu-repo-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-repo-addfav {
+[dir=rtl] .menu-repo-addfav {
 	background-position: right -736px;
 }
 
-#menu-repo-del {
+.menu-repo-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-repo-del {
+[dir=rtl] .menu-repo-del {
 	background-position: right -713px;
 }
 
-#menu-repo-edit {
+.menu-repo-edit {
 	background-position: left -897px;
 }
 
-[dir=rtl] #menu-repo-edit {
+[dir=rtl] .menu-repo-edit {
 	background-position: right -897px;
 }
 
-#menu-repo-editraw {
+.menu-repo-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-repo-editraw {
+[dir=rtl] .menu-repo-editraw {
 	background-position: right -667px;
 }
 
-#menu-report li {
+.menu-report li {
 	background-position: left -483px;
 }
 
-[dir=rtl] #menu-report li {
+[dir=rtl] .menu-report li {
 	background-position: right -483px;
 }
 
-#menu-search-advanced {
+.menu-search-advanced {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-advanced {
+[dir=rtl] .menu-search-advanced {
 	background-position: right -529px;
 }
 
-#menu-search-general {
+.menu-search-general {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-general {
+[dir=rtl] .menu-search-general {
 	background-position: right -529px;
 }
 
-#menu-search-replace {
+.menu-search-replace {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-replace {
+[dir=rtl] .menu-search-replace {
 	background-position: right -529px;
 }
 
-#menu-search-soundex {
+.menu-search-soundex {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-soundex {
+[dir=rtl] .menu-search-soundex {
 	background-position: right -529px;
 }
 
-#menu-sour-addfav {
+.menu-sour-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-sour-addfav {
+[dir=rtl] .menu-sour-addfav {
 	background-position: right -736px;
 }
 
-#menu-sour-del {
+.menu-sour-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-sour-del {
+[dir=rtl] .menu-sour-del {
 	background-position: right -713px;
 }
 
-#menu-sour-edit {
+.menu-sour-edit {
 	background-position: left -782px;
 }
 
-[dir=rtl] #menu-sour-edit {
+[dir=rtl] .menu-sour-edit {
 	background-position: right -782px;
 }
 
-#menu-sour-editraw {
+.menu-sour-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-sour-editraw {
+[dir=rtl] .menu-sour-editraw {
 	background-position: right -667px;
 }
 
-#menu-story-sub {
+.menu-story-sub {
 	background-position: left -920px;
 }
 
-[dir=rtl] #menu-story-sub {
+[dir=rtl] .menu-story-sub {
 	background-position: right -920px;
 }
 
-#menu-tree li {
+.menu-tree li {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-tree li {
+[dir=rtl] .menu-tree li {
 	background-position: right -667px;
 }
 
diff --git a/themes/colors/css-1.7.0/style.css b/themes/colors/css-1.7.0/style.css
index fc68d29cc0..6756b2a163 100644
--- a/themes/colors/css-1.7.0/style.css
+++ b/themes/colors/css-1.7.0/style.css
@@ -4517,684 +4517,684 @@ footer {
 
 /* ====== Theme Icons ========== */
 /* ***** Header icons **** */
-#menu-tree {
+.menu-tree {
 	background-position:center 0;
 }
 
-#menu-mymenu {
+.menu-mymenu {
 	background-position:center -287px;
 }
 
-#menu-chart {
+.menu-chart {
 	background-position:center -41px;
 }
 
-#menu-list {
+.menu-list {
 	background-position: center -82px;
 }
 
-#menu-report {
+.menu-report {
 	background-position: center -164px;
 }
 
-#menu-calendar {
+.menu-calendar {
 	background-position: center -123px;
 }
 
-#menu-search {
+.menu-search {
 	background-position: center -205px;
 }
 
-#menu-help {
+.menu-help {
 	background-position: center -246px;
 }
 
-#menu-clippings {
+.menu-clippings {
 	background-position: center -328px;
 }
 
-#menu-indi {
+.menu-indi {
 	background-position: center -369px;
 }
 
-#menu-indi-orderfam {
+.menu-indi-orderfam {
 	background-position: left 0; /* error */
 }
 
-[dir=rtl] #menu-indi-orderfam {
+[dir=rtl] .menu-indi-orderfam {
 	background-position: right 0; /* error */
 }
 
-#menu-sour {
+.menu-sour {
 	background-position: center -451px;
 }
 
-#menu-fam {
+.menu-fam {
 	background-position: center -410px;
 }
 
-#menu-obje {
+.menu-obje {
 	background-position: center -533px;
 }
 
-#menu-note {
+.menu-note {
 	background-position: center -492px;
 }
 
-#menu-repo {
+.menu-repo {
 	background-position: center -574px;
 }
 
-#menu-story {
+.menu-story {
 	background-position: center -615px;
 }
 
 /* Header Sub-menu icons */
-#menu-admin {
+.menu-admin {
 	background-position: left -728px;
 }
 
-[dir=rtl] #menu-admin {
+[dir=rtl] .menu-admin {
 	background-position: right -728px;
 }
 
-#menu-branches {
+.menu-branches {
 	background-position: left -468px;
 }
 
-[dir=rtl] #menu-branches {
+[dir=rtl] .menu-branches {
 	background-position: right -468px;
 }
 
-#menu-calendar-day {
+.menu-calendar-day {
 	background-position: left -572px;
 }
 
-[dir=rtl] #menu-calendar-day {
+[dir=rtl] .menu-calendar-day {
 	background-position: right -572px;
 }
 
-#menu-calendar-month {
+.menu-calendar-month {
 	background-position: left -572px;
 }
 
-[dir=rtl] #menu-calendar-month {
+[dir=rtl] .menu-calendar-month {
 	background-position: right -572px;
 }
 
-#menu-calendar-year {
+.menu-calendar-year {
 	background-position: left -572px;
 }
 
-[dir=rtl] #menu-calendar-year {
+[dir=rtl] .menu-calendar-year {
 	background-position: right -572px;
 }
 
-#menu-chart-ancestry {
+.menu-chart-ancestry {
 	background-position: left -208px;
 }
 
-[dir=rtl] #menu-chart-ancestry {
+[dir=rtl] .menu-chart-ancestry {
 	background-position: right -208px;
 }
 
-#menu-chart-compact {
+.menu-chart-compact {
 	background-position: left -52px;
 }
 
-[dir=rtl] #menu-chart-compact {
+[dir=rtl] .menu-chart-compact {
 	background-position: right -52px;
 }
 
-#menu-chart-descendants {
+.menu-chart-descendants {
 	background-position: left -0px;
 }
 
-[dir=rtl] #menu-chart-descendants {
+[dir=rtl] .menu-chart-descendants {
 	background-position: right -0px;
 }
 
-#menu-chart-familybook {
+.menu-chart-familybook {
 	background-position: left -104px;
 }
 
-[dir=rtl] #menu-chart-familybook {
+[dir=rtl] .menu-chart-familybook {
 	background-position: right -104px;
 }
 
-#menu-chart-fanchart {
+.menu-chart-fanchart {
 	background-position: left -26px;
 }
 
-[dir=rtl] #menu-chart-fanchart {
+[dir=rtl] .menu-chart-fanchart {
 	background-position: right -26px;
 }
 
-#menu-chart-hourglass {
+.menu-chart-hourglass {
 	background-position: left -130px;
 }
 
-[dir=rtl] #menu-chart-hourglass {
+[dir=rtl] .menu-chart-hourglass {
 	background-position: right -130px;
 }
 
-#menu-chart-lifespan {
+.menu-chart-lifespan {
 	background-position: left -182px;
 }
 
-[dir=rtl] #menu-chart-lifespan {
+[dir=rtl] .menu-chart-lifespan {
 	background-position: right -182px;
 }
 
-#menu-chart-pedigree {
+.menu-chart-pedigree {
 	background-position: left -208px;
 }
 
-[dir=rtl] #menu-chart-pedigree {
+[dir=rtl] .menu-chart-pedigree {
 	background-position: right -208px;
 }
 
-#menu-chart-pedigree_map {
+.menu-chart-pedigree_map {
 	background-position: left -234px;
 }
 
-[dir=rtl] #menu-chart-pedigree_map {
+[dir=rtl] .menu-chart-pedigree_map {
 	background-position: right -234px;
 }
 
-#menu-chart-relationship {
+.menu-chart-relationship {
 	background-position: left -260px;
 }
 
-[dir=rtl] #menu-chart-relationship {
+[dir=rtl] .menu-chart-relationship {
 	background-position: right -260px;
 }
 
-#menu-chart-statistics {
+.menu-chart-statistics {
 	background-position: left -286px;
 }
 
-[dir=rtl] #menu-chart-statistics {
+[dir=rtl] .menu-chart-statistics {
 	background-position: right -286px;
 }
 
-#menu-chart-timeline {
+.menu-chart-timeline {
 	background-position: left -312px;
 }
 
-[dir=rtl] #menu-chart-timeline {
+[dir=rtl] .menu-chart-timeline {
 	background-position: right -312px;
 }
 
-#menu-chart-tree {
+.menu-chart-tree {
 	background-position: left -156px;
 }
 
-[dir=rtl] #menu-chart-tree {
+[dir=rtl] .menu-chart-tree {
 	background-position: right -156px;
 }
 
-#menu-clippingsadd {
+.menu-clippingsadd {
 	background-position: left -702px;
 }
 
-[dir=rtl] #menu-clippingsadd {
+[dir=rtl] .menu-clippingsadd {
 	background-position: right -702px;
 }
 
-#menu-clippingscart {
+.menu-clippingscart {
 	background-position: left -702px;
 }
 
-[dir=rtl] #menu-clippingscart {
+[dir=rtl] .menu-clippingscart {
 	background-position: right -702px;
 }
 
-#menu-fam-addchil {
+.menu-fam-addchil {
 	background-position: left -858px;
 }
 
-[dir=rtl] #menu-fam-addchil {
+[dir=rtl] .menu-fam-addchil {
 	background-position: right -858px;
 }
 
-#menu-fam-addfav {
+.menu-fam-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-fam-addfav {
+[dir=rtl] .menu-fam-addfav {
 	background-position: right -832px;
 }
 
-#menu-fam-change {
+.menu-fam-change {
 	background-position: left -858px;
 }
 
-[dir=rtl] #menu-fam-change {
+[dir=rtl] .menu-fam-change {
 	background-position: right -858px;
 }
 
-#menu-fam-del {
+.menu-fam-del {
 	background-position: left -936px;
 }
 
-[dir=rtl] #menu-fam-del {
+[dir=rtl] .menu-fam-del {
 	background-position: right -936px;
 }
 
-#menu-fam-editraw {
+.menu-fam-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-fam-editraw {
+[dir=rtl] .menu-fam-editraw {
 	background-position: right -574px;
 }
 
-#menu-fam-orderchil {
+.menu-fam-orderchil {
 	background-position: left -858px;
 }
 
-[dir=rtl] #menu-fam-orderchil {
+[dir=rtl] .menu-fam-orderchil {
 	background-position: right -858px;
 }
 
-#menu-help-contents {
+.menu-help-contents {
 	background-position: left -624px;
 }
 
-[dir=rtl] #menu-help-contents {
+[dir=rtl] .menu-help-contents {
 	background-position: right -624px;
 }
 
-#menu-help-faq {
+.menu-help-faq {
 	background-position: left -624px;
 }
 
-[dir=rtl] #menu-help-faq {
+[dir=rtl] .menu-help-faq {
 	background-position: right -624px;
 }
 
-#menu-help-genealogy {
+.menu-help-genealogy {
 	background-position: left -624px;
 }
 
-[dir=rtl] #menu-help-genealogy {
+[dir=rtl] .menu-help-genealogy {
 	background-position: right -624px;
 }
 
-#menu-help-hide {
+.menu-help-hide {
 	background-position: left -624px;
 }
 
-[dir=rtl] #menu-help-hide {
+[dir=rtl] .menu-help-hide {
 	background-position: right -624px;
 }
 
-#menu-help-show {
+.menu-help-show {
 	background-position: left -624px;
 }
 
-[dir=rtl] #menu-help-show {
+[dir=rtl] .menu-help-show {
 	background-position: right -624px;
 }
 
-#menu-help-technical {
+.menu-help-technical {
 	background-position: left -676px;
 }
 
-[dir=rtl] #menu-help-technical {
+[dir=rtl] .menu-help-technical {
 	background-position: right -676px;
 }
 
-#menu-help-wiki {
+.menu-help-wiki {
 	background-position: left -650px;
 }
 
-[dir=rtl] #menu-help-wiki {
+[dir=rtl] .menu-help-wiki {
 	background-position: right -650px;
 }
 
-#menu-indi-addfav {
+.menu-indi-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-indi-addfav {
+[dir=rtl] .menu-indi-addfav {
 	background-position: right -832px;
 }
 
-#menu-indi-addname {
+.menu-indi-addname {
 	background-position: left -780px;
 }
 
-[dir=rtl] #menu-indi-addname {
+[dir=rtl] .menu-indi-addname {
 	background-position: right -780px;
 }
 
-#menu-indi-del {
+.menu-indi-del {
 	background-position: left -806px;
 }
 
-[dir=rtl] #menu-indi-del {
+[dir=rtl] .menu-indi-del {
 	background-position: right -806px;
 }
 
-#menu-indi-editraw {
+.menu-indi-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-indi-editraw {
+[dir=rtl] .menu-indi-editraw {
 	background-position: right -574px;
 }
 
-#menu-indi-editsex {
+.menu-indi-editsex {
 	background-position: left -780px;
 }
 
-[dir=rtl] #menu-indi-editsex {
+[dir=rtl] .menu-indi-editsex {
 	background-position: right -780px;
 }
 
-#menu-list-fam {
+.menu-list-fam {
 	background-position: left -494px;
 }
 
-[dir=rtl] #menu-list-fam {
+[dir=rtl] .menu-list-fam {
 	background-position: right -494px;
 }
 
-#menu-list-indi {
+.menu-list-indi {
 	background-position: left -520px;
 }
 
-[dir=rtl] #menu-list-indi {
+[dir=rtl] .menu-list-indi {
 	background-position: right -520px;
 }
 
-#menu-list-note {
+.menu-list-note {
 	background-position: left -416px;
 }
 
-[dir=rtl] #menu-list-note {
+[dir=rtl] .menu-list-note {
 	background-position: right -416px;
 }
 
-#menu-list-obje {
+.menu-list-obje {
 	background-position: left -338px;
 }
 
-[dir=rtl] #menu-list-obje {
+[dir=rtl] .menu-list-obje {
 	background-position: right -338px;
 }
 
-#menu-list-plac {
+.menu-list-plac {
 	background-position: left -364px;
 }
 
-[dir=rtl] #menu-list-plac {
+[dir=rtl] .menu-list-plac {
 	background-position: right -364px;
 }
 
-#menu-list-repo {
+.menu-list-repo {
 	background-position: left -390px;
 }
 
-[dir=rtl] #menu-list-repo {
+[dir=rtl] .menu-list-repo {
 	background-position: right -390px;
 }
 
-#menu-list-sour {
+.menu-list-sour {
 	background-position: left -442px;
 }
 
-[dir=rtl] #menu-list-sour {
+[dir=rtl] .menu-list-sour {
 	background-position: right -442px;
 }
 
-#menu-myaccount {
+.menu-myaccount {
 	background-position: left -676px;
 }
 
-[dir=rtl] #menu-myaccount {
+[dir=rtl] .menu-myaccount {
 	background-position: right -676px;
 }
 
-#menu-mypage {
+.menu-mypage {
 	background-position: left -676px;
 }
 
-[dir=rtl] #menu-mypage {
+[dir=rtl] .menu-mypage {
 	background-position: right -676px;
 }
 
-#menu-mypedigree {
+.menu-mypedigree {
 	background-position: left -208px;
 }
 
-[dir=rtl] #menu-mypedigree {
+[dir=rtl] .menu-mypedigree {
 	background-position: right -208px;
 }
 
-#menu-myrecord {
+.menu-myrecord {
 	background-position: left -520px;
 }
 
-[dir=rtl] #menu-myrecord {
+[dir=rtl] .menu-myrecord {
 	background-position: right -520px;
 }
 
-#menu-note-addfav {
+.menu-note-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-note-fav {
+[dir=rtl] .menu-note-fav {
 	background-position: right -832px;
 }
 
-#menu-note-del {
+.menu-note-del {
 	background-position: left -806px;
 }
 
-[dir=rtl] #menu-note-del {
+[dir=rtl] .menu-note-del {
 	background-position: right -806px;
 }
 
-#menu-note-edit {
+.menu-note-edit {
 	background-position: left -910px;
 }
 
-[dir=rtl] #menu-note-edit {
+[dir=rtl] .menu-note-edit {
 	background-position: right -910px;
 }
 
-#menu-note-editraw {
+.menu-note-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-note-editraw {
+[dir=rtl] .menu-note-editraw {
 	background-position: right -574px;
 }
 
-#menu-obje-addfav {
+.menu-obje-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-obje-addfav {
+[dir=rtl] .menu-obje-addfav {
 	background-position: right -832px;
 }
 
-#menu-obje-del {
+.menu-obje-del {
 	background-position: left -1040px;
 }
 
-[dir=rtl] #menu-obje-del {
+[dir=rtl] .menu-obje-del {
 	background-position: right -1040px;
 }
 
-#menu-obje-edit {
+.menu-obje-edit {
 	background-position: left -962px;
 }
 
-[dir=rtl] #menu-obje-edit {
+[dir=rtl] .menu-obje-edit {
 	background-position: right -962px;
 }
 
-#menu-obje-editraw {
+.menu-obje-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-obje-editraw {
+[dir=rtl] .menu-obje-editraw {
 	background-position: right -574px;
 }
 
-#menu-obje-link {
+.menu-obje-link {
 	background-position: left -988px;
 }
 
-[dir=rtl] #menu-obje-link {
+[dir=rtl] .menu-obje-link {
 	background-position: right -988px;
 }
 
-#menu-obje-link-fam {
+.menu-obje-link-fam {
 	background-position: left -494px;
 }
 
-[dir=rtl] #menu-obje-link-fam {
+[dir=rtl] .menu-obje-link-fam {
 	background-position: right -494px;
 }
 
-#menu-obje-link-indi {
+.menu-obje-link-indi {
 	background-position: left -520px;
 }
 
-[dir=rtl] #menu-obje-link-indi {
+[dir=rtl] .menu-obje-link-indi {
 	background-position: right -520px;
 }
 
-#menu-obje-link-sour {
+.menu-obje-link-sour {
 	background-position: left -442px;
 }
 
-[dir=rtl] #menu-obje-link-sour {
+[dir=rtl] .menu-obje-link-sour {
 	background-position: right -442px;
 }
 
-#menu-repo-addfav {
+.menu-repo-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-repo-addfav {
+[dir=rtl] .menu-repo-addfav {
 	background-position: right -832px;
 }
 
-#menu-repo-del {
+.menu-repo-del {
 	background-position: left -806px;
 }
 
-[dir=rtl] #menu-repo-del {
+[dir=rtl] .menu-repo-del {
 	background-position: right -806px;
 }
 
-#menu-repo-edit {
+.menu-repo-edit {
 	background-position: left -1014px;
 }
 
-[dir=rtl] #menu-repo-edit {
+[dir=rtl] .menu-repo-edit {
 	background-position: right -1014px;
 }
 
-#menu-repo-editraw {
+.menu-repo-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-repo-editraw {
+[dir=rtl] .menu-repo-editraw {
 	background-position: right -574px;
 }
 
-#menu-report li {
+.menu-report li {
 	background-position: left -546px;
 }
 
-[dir=rtl] #menu-report li {
+[dir=rtl] .menu-report li {
 	background-position: right -546px;
 }
 
-#menu-search-advanced {
+.menu-search-advanced {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-search-advanced {
+[dir=rtl] .menu-search-advanced {
 	background-position: right -598px;
 }
 
-#menu-search-general {
+.menu-search-general {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-search-general {
+[dir=rtl] .menu-search-general {
 	background-position: right -598px;
 }
 
-#menu-search-replace {
+.menu-search-replace {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-search-replace {
+[dir=rtl] .menu-search-replace {
 	background-position: right -598px;
 }
 
-#menu-search-soundex {
+.menu-search-soundex {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-search-soundex {
+[dir=rtl] .menu-search-soundex {
 	background-position: right -598px;
 }
 
-#menu-sour-addfav {
+.menu-sour-addfav {
 	background-position: left -832px;
 }
 
-[dir=rtl] #menu-sour-addfav {
+[dir=rtl] .menu-sour-addfav {
 	background-position: right -832px;
 }
 
-#menu-sour-del {
+.menu-sour-del {
 	background-position: left -1066px;
 }
 
-[dir=rtl] #menu-sour-del {
+[dir=rtl] .menu-sour-del {
 	background-position: right -1066px;
 }
 
-#menu-sour-edit {
+.menu-sour-edit {
 	background-position: left -884px;
 }
 
-[dir=rtl] #menu-sour-edit {
+[dir=rtl] .menu-sour-edit {
 	background-position: right -884px;
 }
 
-#menu-sour-editraw {
+.menu-sour-editraw {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-sour-editraw {
+[dir=rtl] .menu-sour-editraw {
 	background-position: right -574px;
 }
 
-#menu-story-sub {
+.menu-story-sub {
 	background-position: left -1092px;
 }
 
-[dir=rtl] #menu-story-sub {
+[dir=rtl] .menu-story-sub {
 	background-position: right -1040px;
 }
 
-#menu-tree li {
+.menu-tree li {
 	background-position: left -754px;
 }
 
-[dir=rtl] #menu-tree li {
+[dir=rtl] .menu-tree li {
 	background-position: right -754px;
 }
 
diff --git a/themes/fab/css-1.7.0/style.css b/themes/fab/css-1.7.0/style.css
index 3ca561c630..d0dec48cd1 100644
--- a/themes/fab/css-1.7.0/style.css
+++ b/themes/fab/css-1.7.0/style.css
@@ -4288,11 +4288,11 @@ header h1 {
 	font-weight: 900;
 }
 
-#menu-language li {
+.menu-language li {
 	text-align: left; /* The language menu is always LTR, even on RTL pages */
 }
 
-#menu-theme li {
+.menu-theme li {
 	text-align: left; /* The theme menu is always LTR, even on RTL pages */
 }
 
diff --git a/themes/webtrees/css-1.7.0/style.css b/themes/webtrees/css-1.7.0/style.css
index 714b208042..2cc87b7aee 100644
--- a/themes/webtrees/css-1.7.0/style.css
+++ b/themes/webtrees/css-1.7.0/style.css
@@ -4434,684 +4434,684 @@ footer {
 
 /* ====== Theme Icons ========== */
 /* ***** Header icons **** */
-#menu-tree {
+.menu-tree {
 	background-position:center 0;
 }
 
-#menu-mymenu {
+.menu-mymenu {
 	background-position:center -70px;
 }
 
-#menu-chart {
+.menu-chart {
 	background-position:center -140px;
 }
 
-#menu-list {
+.menu-list {
 	background-position:center -210px;
 }
 
-#menu-report {
+.menu-report {
 	background-position:center -280px;
 }
 
-#menu-calendar {
+.menu-calendar {
 	background-position:center -350px;
 }
 
-#menu-search {
+.menu-search {
 	background-position:center -420px;
 }
 
-#menu-help {
+.menu-help {
 	background-position:center -490px;
 }
 
-#menu-clippings {
+.menu-clippings {
 	background-position:center -560px;
 }
 
-#menu-indi {
+.menu-indi {
 	background-position:center -630px;
 }
 
-#menu-indi-orderfam {
+.menu-indi-orderfam {
 	background-position: left 0;
 }
 
-[dir=rtl] #menu-indi-orderfam {
+[dir=rtl] .menu-indi-orderfam {
 	background-position: right 0;
 }
 
-#menu-sour {
+.menu-sour {
 	background-position:center -700px;
 }
 
-#menu-fam {
+.menu-fam {
 	background-position:center -770px;
 }
 
-#menu-obje {
+.menu-obje {
 	background-position:center -840px;
 }
 
-#menu-note {
+.menu-note {
 	background-position:center -910px;
 }
 
-#menu-repo {
+.menu-repo {
 	background-position:center -980px;
 }
 
-#menu-story {
+.menu-story {
 	background-position:center -1045px;
 }
 
 /* Header Sub-menu icons */
-#menu-admin {
+.menu-admin {
 	background-position: left 0;
 }
 
-[dir=rtl] #menu-admin {
+[dir=rtl] .menu-admin {
 	background-position: right 0;
 }
 
-#menu-branches {
+.menu-branches {
 	background-position: left -450px;
 }
 
-[dir=rtl] #menu-branches {
+[dir=rtl] .menu-branches {
 	background-position: right -450px;
 }
 
-#menu-calendar-day {
+.menu-calendar-day {
 	background-position: left -60px;
 }
 
-[dir=rtl] #menu-calendar-day {
+[dir=rtl] .menu-calendar-day {
 	background-position: right -60px;
 }
 
-#menu-calendar-month {
+.menu-calendar-month {
 	background-position: left -60px;
 }
 
-[dir=rtl] #menu-calendar-month {
+[dir=rtl] .menu-calendar-month {
 	background-position: right -60px;
 }
 
-#menu-calendar-year {
+.menu-calendar-year {
 	background-position: left -60px;
 }
 
-[dir=rtl] #menu-calendar-year {
+[dir=rtl] .menu-calendar-year {
 	background-position: right -60px;
 }
 
-#menu-chart-ancestry {
+.menu-chart-ancestry {
 	background-position: left -30px;
 }
 
-[dir=rtl] #menu-chart-ancestry {
+[dir=rtl] .menu-chart-ancestry {
 	background-position: right -30px;
 }
 
-#menu-chart-compact {
+.menu-chart-compact {
 	background-position: left -30px;
 }
 
-[dir=rtl] #menu-chart-compact {
+[dir=rtl] .menu-chart-compact {
 	background-position: right -30px;
 }
 
-#menu-chart-descendants {
+.menu-chart-descendants {
 	background-position: left -150px;
 }
 
-[dir=rtl] #menu-chart-descendants {
+[dir=rtl] .menu-chart-descendants {
 	background-position: right -150px;
 }
 
-#menu-chart-familybook {
+.menu-chart-familybook {
 	background-position: left -180px;
 }
 
-[dir=rtl] #menu-chart-familybook {
+[dir=rtl] .menu-chart-familybook {
 	background-position: right -180px;
 }
 
-#menu-chart-fanchart {
+.menu-chart-fanchart {
 	background-position: left -210px;
 }
 
-[dir=rtl] #menu-chart-fanchart {
+[dir=rtl] .menu-chart-fanchart {
 	background-position: right -210px;
 }
 
-#menu-chart-hourglass {
+.menu-chart-hourglass {
 	background-position: left -270px;
 }
 
-[dir=rtl] #menu-chart-hourglass {
+[dir=rtl] .menu-chart-hourglass {
 	background-position: right -270px;
 }
 
-#menu-chart-lifespan {
+.menu-chart-lifespan {
 	background-position: left -660px;
 }
 
-[dir=rtl] #menu-chart-lifespan {
+[dir=rtl] .menu-chart-lifespan {
 	background-position: right -660px;
 }
 
-#menu-chart-pedigree {
+.menu-chart-pedigree {
 	background-position: left -480px;
 }
 
-[dir=rtl] #menu-chart-pedigree {
+[dir=rtl] .menu-chart-pedigree {
 	background-position: right -480px;
 }
 
-#menu-chart-pedigree_map {
+.menu-chart-pedigree_map {
 	background-position: left -720px;
 }
 
-[dir=rtl] #menu-chart-pedigree_map {
+[dir=rtl] .menu-chart-pedigree_map {
 	background-position: right -720px;
 }
 
-#menu-chart-relationship {
+.menu-chart-relationship {
 	background-position: left -540px;
 }
 
-[dir=rtl] #menu-chart-relationship {
+[dir=rtl] .menu-chart-relationship {
 	background-position: right -540px;
 }
 
-#menu-chart-statistics {
+.menu-chart-statistics {
 	background-position: left -630px;
 }
 
-[dir=rtl] #menu-chart-statistics {
+[dir=rtl] .menu-chart-statistics {
 	background-position: right -630px;
 }
 
-#menu-chart-timeline {
+.menu-chart-timeline {
 	background-position: left -660px;
 }
 
-[dir=rtl] #menu-chart-timeline {
+[dir=rtl] .menu-chart-timeline {
 	background-position: right -660px;
 }
 
-#menu-chart-tree {
+.menu-chart-tree {
 	background-position: left -240px;
 }
 
-[dir=rtl] #menu-chart-tree {
+[dir=rtl] .menu-chart-tree {
 	background-position: right -240px;
 }
 
-#menu-clippingsadd {
+.menu-clippingsadd {
 	background-position: left -930px;
 }
 
-[dir=rtl] #menu-clippingsadd {
+[dir=rtl] .menu-clippingsadd {
 	background-position: right -930px;
 }
 
-#menu-clippingscart {
+.menu-clippingscart {
 	background-position: left -900px;
 }
 
-[dir=rtl] #menu-clippingscart {
+[dir=rtl] .menu-clippingscart {
 	background-position: right -900px;
 }
 
-#menu-fam-addchil {
+.menu-fam-addchil {
 	background-position: left -1050px;
 }
 
-[dir=rtl] #menu-fam-addchil {
+[dir=rtl] .menu-fam-addchil {
 	background-position: right -1050px;
 }
 
-#menu-fam-addfav {
+.menu-fam-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-fam-addfav {
+[dir=rtl] .menu-fam-addfav {
 	background-position: right -870px;
 }
 
-#menu-fam-change {
+.menu-fam-change {
 	background-position: left -90px;
 }
 
-[dir=rtl] #menu-fam-change {
+[dir=rtl] .menu-fam-change {
 	background-position: right -90px;
 }
 
-#menu-fam-del {
+.menu-fam-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-fam-del {
+[dir=rtl] .menu-fam-del {
 	background-position: right -840px;
 }
 
-#menu-fam-editraw {
+.menu-fam-editraw {
 	background-position: left -90px;
 }
 
-[dir=rtl] #menu-fam-editraw {
+[dir=rtl] .menu-fam-editraw {
 	background-position: right -90px;
 }
 
-#menu-fam-orderchil {
+.menu-fam-orderchil {
 	background-position: left -1080px;
 }
 
-[dir=rtl] #menu-fam-orderchil {
+[dir=rtl] .menu-fam-orderchil {
 	background-position: right -1080px;
 }
 
-#menu-help-contents {
+.menu-help-contents {
 	background-position: left -300px;
 }
 
-[dir=rtl] #menu-help-contents {
+[dir=rtl] .menu-help-contents {
 	background-position: right -300px;
 }
 
-#menu-help-faq {
+.menu-help-faq {
 	background-position: left -300px;
 }
 
-[dir=rtl] #menu-help-faq {
+[dir=rtl] .menu-help-faq {
 	background-position: right -300px;
 }
 
-#menu-help-genealogy {
+.menu-help-genealogy {
 	background-position: left -120px;
 }
 
-[dir=rtl] #menu-help-genealogy {
+[dir=rtl] .menu-help-genealogy {
 	background-position: right -120px;
 }
 
-#menu-help-hide {
+.menu-help-hide {
 	background-position: left -300px;
 }
 
-[dir=rtl] #menu-help-hide {
+[dir=rtl] .menu-help-hide {
 	background-position: right -300px;
 }
 
-#menu-help-show {
+.menu-help-show {
 	background-position: left -300px;
 }
 
-[dir=rtl] #menu-help-show {
+[dir=rtl] .menu-help-show {
 	background-position: right -300px;
 }
 
-#menu-help-technical {
+.menu-help-technical {
 	background-position: left -120px;
 }
 
-[dir=rtl] #menu-help-technical {
+[dir=rtl] .menu-help-technical {
 	background-position: right -120px;
 }
 
-#menu-help-wiki {
+.menu-help-wiki {
 	background-position: left -690px;
 }
 
-[dir=rtl] #menu-help-wiki {
+[dir=rtl] .menu-help-wiki {
 	background-position: right -690px;
 }
 
-#menu-indi-addfav {
+.menu-indi-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-indi-addfav {
+[dir=rtl] .menu-indi-addfav {
 	background-position: right -870px;
 }
 
-#menu-indi-addname {
+.menu-indi-addname {
 	background-position: left -780px;
 }
 
-[dir=rtl] #menu-indi-addname {
+[dir=rtl] .menu-indi-addname {
 	background-position: right -780px;
 }
 
-#menu-indi-del {
+.menu-indi-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-indi-del {
+[dir=rtl] .menu-indi-del {
 	background-position: right -840px;
 }
 
-#menu-indi-editraw {
+.menu-indi-editraw {
 	background-position: left -750px;
 }
 
-[dir=rtl] #menu-indi-editraw {
+[dir=rtl] .menu-indi-editraw {
 	background-position: right -750px;
 }
 
-#menu-indi-editsex {
+.menu-indi-editsex {
 	background-position: left -810px;
 }
 
-[dir=rtl] #menu-indi-editsex {
+[dir=rtl] .menu-indi-editsex {
 	background-position: right -810px;
 }
 
-#menu-list-fam {
+.menu-list-fam {
 	background-position: left -90px;
 }
 
-[dir=rtl] #menu-list-fam {
+[dir=rtl] .menu-list-fam {
 	background-position: right -90px;
 }
 
-#menu-list-indi {
+.menu-list-indi {
 	background-position: left -120px;
 }
 
-[dir=rtl] #menu-list-indi {
+[dir=rtl] .menu-list-indi {
 	background-position: right -120px;
 }
 
-#menu-list-note {
+.menu-list-note {
 	background-position: left -420px;
 }
 
-[dir=rtl] #menu-list-note {
+[dir=rtl] .menu-list-note {
 	background-position: right -420px;
 }
 
-#menu-list-obje {
+.menu-list-obje {
 	background-position: left -330px;
 }
 
-[dir=rtl] #menu-list-obje {
+[dir=rtl] .menu-list-obje {
 	background-position: right -330px;
 }
 
-#menu-list-plac {
+.menu-list-plac {
 	background-position: left -510px;
 }
 
-[dir=rtl] #menu-list-plac {
+[dir=rtl] .menu-list-plac {
 	background-position: right -510px;
 }
 
-#menu-list-repo {
+.menu-list-repo {
 	background-position: left -360px;
 }
 
-[dir=rtl] #menu-list-repo {
+[dir=rtl] .menu-list-repo {
 	background-position: right -360px;
 }
 
-#menu-list-sour {
+.menu-list-sour {
 	background-position: left -180px;
 }
 
-[dir=rtl] #menu-list-sour {
+[dir=rtl] .menu-list-sour {
 	background-position: right -180px;
 }
 
-#menu-myaccount {
+.menu-myaccount {
 	background-position: left -390px;
 }
 
-[dir=rtl] #menu-myaccount {
+[dir=rtl] .menu-myaccount {
 	background-position: right -390px;
 }
 
-#menu-mypage {
+.menu-mypage {
 	background-position: left -390px;
 }
 
-[dir=rtl] #menu-mypage {
+[dir=rtl] .menu-mypage {
 	background-position: right -390px;
 }
 
-#menu-mypedigree {
+.menu-mypedigree {
 	background-position: left -480px;
 }
 
-[dir=rtl] #menu-mypedigree {
+[dir=rtl] .menu-mypedigree {
 	background-position: right -480px;
 }
 
-#menu-myrecord {
+.menu-myrecord {
 	background-position: left -120px;
 }
 
-[dir=rtl] #menu-myrecord {
+[dir=rtl] .menu-myrecord {
 	background-position: right -120px;
 }
 
-#menu-note-addfav {
+.menu-note-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-note-addfav {
+[dir=rtl] .menu-note-addfav {
 	background-position: right -870px;
 }
 
-#menu-note-del {
+.menu-note-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-note-del {
+[dir=rtl] .menu-note-del {
 	background-position: right -840px;
 }
 
-#menu-note-edit {
+.menu-note-edit {
 	background-position: left -1020px;
 }
 
-[dir=rtl] #menu-note-edit {
+[dir=rtl] .menu-note-edit {
 	background-position: right -1020px;
 }
 
-#menu-note-editraw {
+.menu-note-editraw {
 	background-position: left -1020px;
 }
 
-[dir=rtl] #menu-note-editraw {
+[dir=rtl] .menu-note-editraw {
 	background-position: right -1020px;
 }
 
-#menu-obje-addfav {
+.menu-obje-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-obje-addfav {
+[dir=rtl] .menu-obje-addfav {
 	background-position: right -870px;
 }
 
-#menu-obje-del {
+.menu-obje-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-obje-del {
+[dir=rtl] .menu-obje-del {
 	background-position: right -840px;
 }
 
-#menu-obje-edit {
+.menu-obje-edit {
 	background-position: left -1110px;
 }
 
-[dir=rtl] #menu-obje-edit {
+[dir=rtl] .menu-obje-edit {
 	background-position: right -1110px;
 }
 
-#menu-obje-editraw {
+.menu-obje-editraw {
 	background-position: left -1110px;
 }
 
-[dir=rtl] #menu-obje-editraw {
+[dir=rtl] .menu-obje-editraw {
 	background-position: right -1110px;
 }
 
-#menu-obje-link {
+.menu-obje-link {
 	background-position: left -1140px;
 }
 
-[dir=rtl] #menu-obje-link {
+[dir=rtl] .menu-obje-link {
 	background-position: right -1140px;
 }
 
-#menu-obje-link-fam {
+.menu-obje-link-fam {
 	background-position: left -90px;
 }
 
-[dir=rtl] #menu-obje-link-fam {
+[dir=rtl] .menu-obje-link-fam {
 	background-position: right -90px;
 }
 
-#menu-obje-link-indi {
+.menu-obje-link-indi {
 	background-position: left -120px;
 }
 
-[dir=rtl] #menu-obje-link-indi {
+[dir=rtl] .menu-obje-link-indi {
 	background-position: right -120px;
 }
 
-#menu-obje-link-sour {
+.menu-obje-link-sour {
 	background-position: left -180px;
 }
 
-[dir=rtl] #menu-obje-link-sour {
+[dir=rtl] .menu-obje-link-sour {
 	background-position: right -180px;
 }
 
-#menu-repo-addfav {
+.menu-repo-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-repo-addfav {
+[dir=rtl] .menu-repo-addfav {
 	background-position: right -870px;
 }
 
-#menu-repo-del {
+.menu-repo-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-repo-del {
+[dir=rtl] .menu-repo-del {
 	background-position: right -840px;
 }
 
-#menu-repo-edit {
+.menu-repo-edit {
 	background-position: left -990px;
 }
 
-[dir=rtl] #menu-repo-edit {
+[dir=rtl] .menu-repo-edit {
 	background-position: right -990px;
 }
 
-#menu-repo-editraw {
+.menu-repo-editraw {
 	background-position: left -990px;
 }
 
-[dir=rtl] #menu-repo-editraw {
+[dir=rtl] .menu-repo-editraw {
 	background-position: right -990px;
 }
 
-#menu-report li {
+.menu-report li {
 	background-position: left -570px;
 }
 
-[dir=rtl] #menu-report li {
+[dir=rtl] .menu-report li {
 	background-position: right -570px;
 }
 
-#menu-search-advanced {
+.menu-search-advanced {
 	background-position: left -600px;
 }
 
-[dir=rtl] #menu-search-advanced {
+[dir=rtl] .menu-search-advanced {
 	background-position: right -600px;
 }
 
-#menu-search-general {
+.menu-search-general {
 	background-position: left -600px;
 }
 
-[dir=rtl] #menu-search-general {
+[dir=rtl] .menu-search-general {
 	background-position: right -600px;
 }
 
-#menu-search-replace {
+.menu-search-replace {
 	background-position: left -600px;
 }
 
-[dir=rtl] #menu-search-replace {
+[dir=rtl] .menu-search-replace {
 	background-position: right -600px;
 }
 
-#menu-search-soundex {
+.menu-search-soundex {
 	background-position: left -600px;
 }
 
-[dir=rtl] #menu-search-soundex {
+[dir=rtl] .menu-search-soundex {
 	background-position: right -600px;
 }
 
-#menu-sour-addfav {
+.menu-sour-addfav {
 	background-position: left -870px;
 }
 
-[dir=rtl] #menu-sour-addfav {
+[dir=rtl] .menu-sour-addfav {
 	background-position: right -870px;
 }
 
-#menu-sour-del {
+.menu-sour-del {
 	background-position: left -840px;
 }
 
-[dir=rtl] #menu-sour-del {
+[dir=rtl] .menu-sour-del {
 	background-position: right -840px;
 }
 
-#menu-sour-edit {
+.menu-sour-edit {
 	background-position: left -960px;
 }
 
-[dir=rtl] #menu-sour-edit {
+[dir=rtl] .menu-sour-edit {
 	background-position: right -960px;
 }
 
-#menu-sour-editraw {
+.menu-sour-editraw {
 	background-position: left -960px;
 }
 
-[dir=rtl] #menu-sour-editraw {
+[dir=rtl] .menu-sour-editraw {
 	background-position: right -960px;
 }
 
-#menu-story-sub {
+.menu-story-sub {
 	background-position: left -1208px;
 }
 
-[dir=rtl] #menu-story-sub {
+[dir=rtl] .menu-story-sub {
 	background-position: right -1208px;
 }
 
-#menu-tree li {
+.menu-tree li {
 	background-position: left -240px;
 }
 
-[dir=rtl] #menu-tree li {
+[dir=rtl] .menu-tree li {
 	background-position: right -240px;
 }
 
diff --git a/themes/xenea/css-1.7.0/style.css b/themes/xenea/css-1.7.0/style.css
index 51ffaa0fb0..fca24dbdfc 100644
--- a/themes/xenea/css-1.7.0/style.css
+++ b/themes/xenea/css-1.7.0/style.css
@@ -4195,30 +4195,30 @@ header h1 {
 	position: relative;
 }
 
-#menu-theme,
-#menu-favorites {
+.menu-theme,
+.menu-favorites {
 	float: left;
 }
 
-[dir=rtl] #menu-theme,
-[dir=rtl] #menu-favorites {
+[dir=rtl] .menu-theme,
+[dir=rtl] .menu-favorites {
 	float: right;
 }
 
-#menu-language {
+.menu-language {
 	float: right;
 }
 
-[dir=rtl] #menu-language {
+[dir=rtl] .menu-language {
 	float: left;
 }
 
-#menu-language ul {
+.menu-language ul {
 	left: auto;
 	right: 0;
 }
 
-[dir=rtl] #menu-language ul {
+[dir=rtl] .menu-language ul {
 	left: 0;
 	right: auto;
 }
@@ -4446,668 +4446,668 @@ footer {
 
 /* ====== Theme Icons ========== */
 /* ***** Header icons **** */
-#menu-tree {
+.menu-tree {
 	background-position:center -0px;
 }
 
-#menu-mymenu {
+.menu-mymenu {
 	background-position:center -203px;
 }
 
-#menu-chart {
+.menu-chart {
 	background-position:center -29px;
 }
 
-#menu-list {
+.menu-list {
 	background-position:center -58px;
 }
 
-#menu-report {
+.menu-report {
 	background-position:center -116px;
 }
 
-#menu-calendar {
+.menu-calendar {
 	background-position:center -87px;
 }
 
-#menu-search {
+.menu-search {
 	background-position:center -145px;
 }
 
-#menu-help {
+.menu-help {
 	background-position:center -174px;
 }
 
-#menu-clippings {
+.menu-clippings {
 	background-position:center -232px;
 }
 
-#menu-indi {
+.menu-indi {
 	background-position:center -261px;
 }
 
-#menu-sour {
+.menu-sour {
 	background-position:center -319px;
 }
 
-#menu-fam {
+.menu-fam {
 	background-position:center -290px;
 }
 
-#menu-obje {
+.menu-obje {
 	background-position: center -377px;
 }
 
-#menu-note {
+.menu-note {
 	background-position:center -348px;
 }
 
-#menu-repo {
+.menu-repo {
 	background-position: center -406px;
 }
 
-#menu-story {
+.menu-story {
 	background-position: center -435px;
 }
 
 /* Header Sub-menu icons */
-#menu-admin {
+.menu-admin {
 	background-position: left -644px;
 }
 
-[dir=rtl] #menu-admin {
+[dir=rtl] .menu-admin {
 	background-position: right -644px;
 }
 
-#menu-branches {
+.menu-branches {
 	background-position: left -414px;
 }
 
-[dir=rtl] #menu-branches {
+[dir=rtl] .menu-branches {
 	background-position: right -414px;
 }
 
-#menu-calendar-day {
+.menu-calendar-day {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-day {
+[dir=rtl] .menu-calendar-day {
 	background-position: right -506px;
 }
 
-#menu-calendar-month {
+.menu-calendar-month {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-month {
+[dir=rtl] .menu-calendar-month {
 	background-position: right -506px;
 }
 
-#menu-calendar-year {
+.menu-calendar-year {
 	background-position: left -506px;
 }
 
-[dir=rtl] #menu-calendar-year {
+[dir=rtl] .menu-calendar-year {
 	background-position: right -506px;
 }
 
-#menu-chart-ancestry {
+.menu-chart-ancestry {
 	background-position: left -0px;
 }
 
-[dir=rtl] #menu-chart-ancestry {
+[dir=rtl] .menu-chart-ancestry {
 	background-position: right -0px;
 }
 
-#menu-chart-compact {
+.menu-chart-compact {
 	background-position: left -46px;
 }
 
-[dir=rtl] #menu-chart-compact {
+[dir=rtl] .menu-chart-compact {
 	background-position: right -46px;
 }
 
-#menu-chart-descendants {
+.menu-chart-descendants {
 	background-position: left -69px;
 }
 
-[dir=rtl] #menu-chart-descendants {
+[dir=rtl] .menu-chart-descendants {
 	background-position: right -69px;
 }
 
-#menu-chart-familybook {
+.menu-chart-familybook {
 	background-position: left -92px;
 }
 
-[dir=rtl] #menu-chart-familybook {
+[dir=rtl] .menu-chart-familybook {
 	background-position: right -92px;
 }
 
-#menu-chart-fanchart {
+.menu-chart-fanchart {
 	background-position: left -23px;
 }
 
-[dir=rtl] #menu-chart-fanchart {
+[dir=rtl] .menu-chart-fanchart {
 	background-position: right -23px;
 }
 
-#menu-chart-hourglass {
+.menu-chart-hourglass {
 	background-position: left -115px;
 }
 
-[dir=rtl] #menu-chart-hourglass {
+[dir=rtl] .menu-chart-hourglass {
 	background-position: right -115px;
 }
 
-#menu-chart-lifespan {
+.menu-chart-lifespan {
 	background-position: left -161px;
 }
 
-[dir=rtl] #menu-chart-lifespan {
+[dir=rtl] .menu-chart-lifespan {
 	background-position: right -161px;
 }
 
-#menu-chart-pedigree {
+.menu-chart-pedigree {
 	background-position: left -184px;
 }
 
-[dir=rtl] #menu-chart-pedigree {
+[dir=rtl] .menu-chart-pedigree {
 	background-position: right -184px;
 }
 
-#menu-chart-pedigree_map {
+.menu-chart-pedigree_map {
 	background-position: left -207px;
 }
 
-[dir=rtl] #menu-chart-pedigree_map {
+[dir=rtl] .menu-chart-pedigree_map {
 	background-position: right -207px;
 }
 
-#menu-chart-relationship {
+.menu-chart-relationship {
 	background-position: left -230px;
 }
 
-[dir=rtl] #menu-chart-relationship {
+[dir=rtl] .menu-chart-relationship {
 	background-position: right -230px;
 }
 
-#menu-chart-statistics {
+.menu-chart-statistics {
 	background-position: left -253px;
 }
 
-[dir=rtl] #menu-chart-statistics {
+[dir=rtl] .menu-chart-statistics {
 	background-position: right -253px;
 }
 
-#menu-chart-timeline {
+.menu-chart-timeline {
 	background-position: left -276px;
 }
 
-[dir=rtl] #menu-chart-timeline {
+[dir=rtl] .menu-chart-timeline {
 	background-position: right -276px;
 }
 
-#menu-chart-tree {
+.menu-chart-tree {
 	background-position: left -138px;
 }
 
-[dir=rtl] #menu-chart-tree {
+[dir=rtl] .menu-chart-tree {
 	background-position: right -138px;
 }
 
-#menu-clippingsadd {
+.menu-clippingsadd {
 	background-position: left -621px;
 }
 
-[dir=rtl] #menu-clippingsadd {
+[dir=rtl] .menu-clippingsadd {
 	background-position: right -621px;
 }
 
-#menu-clippingscart {
+.menu-clippingscart {
 	background-position: left -621px;
 }
 
-[dir=rtl] #menu-clippingscart {
+[dir=rtl] .menu-clippingscart {
 	background-position: right -621px;
 }
 
-#menu-fam-addchil {
+.menu-fam-addchil {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-addchil {
+[dir=rtl] .menu-fam-addchil {
 	background-position: right -759px;
 }
 
-#menu-fam-addfav {
+.menu-fam-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-fam-addfav {
+[dir=rtl] .menu-fam-addfav {
 	background-position: right -736px;
 }
 
-#menu-fam-change {
+.menu-fam-change {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-change {
+[dir=rtl] .menu-fam-change {
 	background-position: right -759px;
 }
 
-#menu-fam-del {
+.menu-fam-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-fam-del {
+[dir=rtl] .menu-fam-del {
 	background-position: right -713px;
 }
 
-#menu-fam-editraw {
+.menu-fam-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-fam-editraw {
+[dir=rtl] .menu-fam-editraw {
 	background-position: right -667px;
 }
 
-#menu-fam-orderchil {
+.menu-fam-orderchil {
 	background-position: left -759px;
 }
 
-[dir=rtl] #menu-fam-orderchil {
+[dir=rtl] .menu-fam-orderchil {
 	background-position: right -759px;
 }
 
-#menu-help-contents {
+.menu-help-contents {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-contents {
+[dir=rtl] .menu-help-contents {
 	background-position: right -552px;
 }
 
-#menu-help-faq {
+.menu-help-faq {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-faq {
+[dir=rtl] .menu-help-faq {
 	background-position: right -552px;
 }
 
-#menu-help-genealogy {
+.menu-help-genealogy {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-genealogy {
+[dir=rtl] .menu-help-genealogy {
 	background-position: right -552px;
 }
 
-#menu-help-hide {
+.menu-help-hide {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-hide {
+[dir=rtl] .menu-help-hide {
 	background-position: right -552px;
 }
 
-#menu-help-show {
+.menu-help-show {
 	background-position: left -552px;
 }
 
-[dir=rtl] #menu-help-show {
+[dir=rtl] .menu-help-show {
 	background-position: right -552px;
 }
 
-#menu-help-technical {
+.menu-help-technical {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-help-technical {
+[dir=rtl] .menu-help-technical {
 	background-position: right -598px;
 }
 
-#menu-help-wiki {
+.menu-help-wiki {
 	background-position: left -575px;
 }
 
-[dir=rtl] #menu-help-wiki {
+[dir=rtl] .menu-help-wiki {
 	background-position: right -575px;
 }
 
-#menu-indi-addfav {
+.menu-indi-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-indi-addfav {
+[dir=rtl] .menu-indi-addfav {
 	background-position: right -736px;
 }
 
-#menu-indi-addname {
+.menu-indi-addname {
 	background-position: left -690px;
 }
 
-[dir=rtl] #menu-indi-addname {
+[dir=rtl] .menu-indi-addname {
 	background-position: right -690px;
 }
 
-#menu-indi-del {
+.menu-indi-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-indi-del {
+[dir=rtl] .menu-indi-del {
 	background-position: right -713px;
 }
 
-#menu-indi-editraw {
+.menu-indi-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-indi-editraw {
+[dir=rtl] .menu-indi-editraw {
 	background-position: right -667px;
 }
 
-#menu-indi-editsex {
+.menu-indi-editsex {
 	background-position: left -690px;
 }
 
-[dir=rtl] #menu-indi-editsex {
+[dir=rtl] .menu-indi-editsex {
 	background-position: right -690px;
 }
 
-#menu-list-fam {
+.menu-list-fam {
 	background-position: left -437px;
 }
 
-[dir=rtl] #menu-list-fam {
+[dir=rtl] .menu-list-fam {
 	background-position: right -437px;
 }
 
-#menu-list-indi {
+.menu-list-indi {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-list-indi {
+[dir=rtl] .menu-list-indi {
 	background-position: right -460px;
 }
 
-#menu-list-note {
+.menu-list-note {
 	background-position: left -368px;
 }
 
-[dir=rtl] #menu-list-note {
+[dir=rtl] .menu-list-note {
 	background-position: right -368px;
 }
 
-#menu-list-obje {
+.menu-list-obje {
 	background-position: left -299px;
 }
 
-[dir=rtl] #menu-list-obje {
+[dir=rtl] .menu-list-obje {
 	background-position: right -299px;
 }
 
-#menu-list-plac {
+.menu-list-plac {
 	background-position: left -322px;
 }
 
-[dir=rtl] #menu-list-plac {
+[dir=rtl] .menu-list-plac {
 	background-position: right -322px;
 }
 
-#menu-list-repo {
+.menu-list-repo {
 	background-position: left -345px;
 }
 
-[dir=rtl] #menu-list-repo {
+[dir=rtl] .menu-list-repo {
 	background-position: right -345px;
 }
 
-#menu-list-sour {
+.menu-list-sour {
 	background-position: left -391px;
 }
 
-[dir=rtl] #menu-list-sour {
+[dir=rtl] .menu-list-sour {
 	background-position: right -391px;
 }
 
-#menu-myaccount {
+.menu-myaccount {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-myaccount {
+[dir=rtl] .menu-myaccount {
 	background-position: right -598px;
 }
 
-#menu-mypage {
+.menu-mypage {
 	background-position: left -598px;
 }
 
-[dir=rtl] #menu-mypage {
+[dir=rtl] .menu-mypage {
 	background-position: right -598px;
 }
 
-#menu-mypedigree {
+.menu-mypedigree {
 	background-position: left -828px;
 }
 
-[dir=rtl] #menu-mypedigree {
+[dir=rtl] .menu-mypedigree {
 	background-position: right -828px;
 }
 
-#menu-myrecord {
+.menu-myrecord {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-myrecord {
+[dir=rtl] .menu-myrecord {
 	background-position: right -460px;
 }
 
-#menu-note-addfav {
+.menu-note-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-note-addfav {
+[dir=rtl] .menu-note-addfav {
 	background-position: right -736px;
 }
 
-#menu-note-del {
+.menu-note-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-note-del {
+[dir=rtl] .menu-note-del {
 	background-position: right -713px;
 }
 
-#menu-note-edit {
+.menu-note-edit {
 	background-position: left -805px;
 }
 
-[dir=rtl] #menu-note-edit {
+[dir=rtl] .menu-note-edit {
 	background-position: right -805px;
 }
 
-#menu-note-editraw {
+.menu-note-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-note-editraw {
+[dir=rtl] .menu-note-editraw {
 	background-position: right -667px;
 }
 
-#menu-obje-addfav {
+.menu-obje-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-obje-addfav {
+[dir=rtl] .menu-obje-addfav {
 	background-position: right -736px;
 }
 
-#menu-obje-del {
+.menu-obje-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-obje-del {
+[dir=rtl] .menu-obje-del {
 	background-position: right -713px;
 }
 
-#menu-obje-edit {
+.menu-obje-edit {
 	background-position: left -852px;
 }
 
-[dir=rtl] #menu-obje-edit {
+[dir=rtl] .menu-obje-edit {
 	background-position: right -852px;
 }
 
-#menu-obje-editraw {
+.menu-obje-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-obje-editraw {
+[dir=rtl] .menu-obje-editraw {
 	background-position: right -667px;
 }
 
-#menu-obje-link {
+.menu-obje-link {
 	background-position: left -875px;
 }
 
-[dir=rtl] #menu-obje-link {
+[dir=rtl] .menu-obje-link {
 	background-position: right -875px;
 }
 
-#menu-obje-link-fam {
+.menu-obje-link-fam {
 	background-position: left -437px;
 }
 
-[dir=rtl] #menu-obje-link-fam {
+[dir=rtl] .menu-obje-link-fam {
 	background-position: right -437px;
 }
 
-#menu-obje-link-indi {
+.menu-obje-link-indi {
 	background-position: left -460px;
 }
 
-[dir=rtl] #menu-obje-link-indi {
+[dir=rtl] .menu-obje-link-indi {
 	background-position: right -460px;
 }
 
-#menu-obje-link-sour {
+.menu-obje-link-sour {
 	background-position: left -391px;
 }
 
-[dir=rtl] #menu-obje-link-sour {
+[dir=rtl] .menu-obje-link-sour {
 	background-position: right -391px;
 }
 
-#menu-repo-addfav {
+.menu-repo-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-repo-addfav {
+[dir=rtl] .menu-repo-addfav {
 	background-position: right -736px;
 }
 
-#menu-repo-del {
+.menu-repo-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-repo-del {
+[dir=rtl] .menu-repo-del {
 	background-position: right -713px;
 }
 
-#menu-repo-edit {
+.menu-repo-edit {
 	background-position: left -897px;
 }
 
-[dir=rtl] #menu-repo-edit {
+[dir=rtl] .menu-repo-edit {
 	background-position: right -897px;
 }
 
-#menu-repo-editraw {
+.menu-repo-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-repo-editraw {
+[dir=rtl] .menu-repo-editraw {
 	background-position: right -667px;
 }
 
-#menu-report li {
+.menu-report li {
 	background-position: left -483px;
 }
 
-[dir=rtl] #menu-report li {
+[dir=rtl] .menu-report li {
 	background-position: right -483px;
 }
 
-#menu-search-advanced {
+.menu-search-advanced {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-advanced {
+[dir=rtl] .menu-search-advanced {
 	background-position: right -529px;
 }
 
-#menu-search-general {
+.menu-search-general {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-general {
+[dir=rtl] .menu-search-general {
 	background-position: right -529px;
 }
 
-#menu-search-replace {
+.menu-search-replace {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-replace {
+[dir=rtl] .menu-search-replace {
 	background-position: right -529px;
 }
 
-#menu-search-soundex {
+.menu-search-soundex {
 	background-position: left -529px;
 }
 
-[dir=rtl] #menu-search-soundex {
+[dir=rtl] .menu-search-soundex {
 	background-position: right -529px;
 }
 
-#menu-sour-addfav {
+.menu-sour-addfav {
 	background-position: left -736px;
 }
 
-[dir=rtl] #menu-sour-addfav {
+[dir=rtl] .menu-sour-addfav {
 	background-position: right -736px;
 }
 
-#menu-sour-del {
+.menu-sour-del {
 	background-position: left -713px;
 }
 
-[dir=rtl] #menu-sour-del {
+[dir=rtl] .menu-sour-del {
 	background-position: right -713px;
 }
 
-#menu-sour-edit {
+.menu-sour-edit {
 	background-position: left -782px;
 }
 
-[dir=rtl] #menu-sour-edit {
+[dir=rtl] .menu-sour-edit {
 	background-position: right -782px;
 }
 
-#menu-sour-editraw {
+.menu-sour-editraw {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-sour-editraw {
+[dir=rtl] .menu-sour-editraw {
 	background-position: right -667px;
 }
 
-#menu-tree li {
+.menu-tree li {
 	background-position: left -667px;
 }
 
-[dir=rtl] #menu-tree li {
+[dir=rtl] .menu-tree li {
 	background-position: right -667px;
 }