diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 381dc4dfc9..499445abef 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -94,7 +94,7 @@ class BookmarkPlugin extends MicroAppPlugin
      */
     function onEndShowStyles($action)
     {
-        $action->cssLink($this->path('bookmark.css'));
+        $action->cssLink($this->path('css/bookmark.css'));
         return true;
     }
 
diff --git a/plugins/Bookmark/bookmark.css b/plugins/Bookmark/bookmark.css
deleted file mode 100644
index 966adbc66c..0000000000
--- a/plugins/Bookmark/bookmark.css
+++ /dev/null
@@ -1 +0,0 @@
-.bookmark-tags li { display: inline; }
diff --git a/plugins/Bookmark/css/bookmark.css b/plugins/Bookmark/css/bookmark.css
new file mode 100644
index 0000000000..77b7ab316f
--- /dev/null
+++ b/plugins/Bookmark/css/bookmark.css
@@ -0,0 +1,135 @@
+/* Bookmark specific styles */
+
+.bookmark-tags li { display: inline; }
+
+.bookmark h3 {
+    margin: 0px 0px 8px 0px;
+    line-height: 3em;
+}
+
+.bookmark-notice-count {
+    border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+    padding: 1px 6px;
+    font-size: 1.2em;
+    line-height: 1.2em;
+    background: #fff;
+    border: 1px solid #7b8dbb;
+    color: #3e3e8c !important;
+    position: relative;
+    right: 4px;
+    margin-left: 10px;
+}
+
+.bookmark-notice-count:hover {
+    text-decoration: none;
+    background: #f2f2f2;
+    border: 1px solid #7b8dbb;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+.notice .bookmark-description {
+    clear: both;
+    margin-left: 0px;
+    margin-bottom: 0px;
+}
+
+.notice .bookmark-author {
+    margin-left: 0px;
+    float: left;
+}
+
+.bookmark-tags {
+    clear: both;
+    margin-bottom: 8px;
+    line-height: 1.6em;
+}
+
+ul.bookmark-tags a {
+    border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+    padding: 1px 6px;
+    background: #f2f2f2;
+    color: #3e3e8c !important;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+    font-size: 0.88em;
+}
+
+ul.bookmark-tags a:hover {
+    background-color: #cdd1dd;
+    text-decoration: none;
+}
+
+.bookmark-avatar {
+    float: none !important;
+    position: relative;
+    top: 2px;
+}
+
+.bookmark div.entry-content {
+    font-size: 0.88em;
+    line-height: 1.2em;
+    margin-top: 6px;
+    opacity: 0.6;
+    margin-bottom: 0px;
+}
+
+.bookmark:hover div.entry-content {
+    opacity: 1;
+}
+
+#bookmarkpopup {
+    min-width: 600px;
+    margin-top: 0px;
+    height: 100%;
+    border: 10px solid #364A84;
+    background: #364A84;
+}
+
+#bookmarkpopup #wrap {
+    width: auto;
+    min-width: 560px;
+    padding: 40px 0px 25px 0px;
+    margin-right: 2px;
+    background: #fff url(../mobilelogo.png) no-repeat 6px 6px;
+}
+
+#bookmarkpopup #header {
+    width: auto;
+    padding: 0px 10px;
+}
+
+#bookmarkpopup .form_settings label {
+    margin-top: 2px;
+    text-align: right;
+    width: 24%;
+    font-size: 1.2em;
+}
+
+#bookmarkpopup .form_settings .form_data input {
+    width: 60%;
+}
+
+#bookmarkpopup .form_guide {
+    color: #777;
+}
+
+#bookmarkpopup #bookmark-submit {
+    min-width: 100px;
+}
+
+#bookmarkpopup fieldset fieldset {
+    margin-bottom: 10px;
+}
+
+#form_initial_bookmark.form_settings .form_data li {
+    margin-bottom: 0px;
+}
+
+#form_new_bookmark.form_settings .bookmarkform-thumbnail {
+    position: absolute;
+    top: 50px;
+    right: 0px;
+}
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index c5da9e7d8c..66ba099dd4 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -847,143 +847,6 @@ h4.blog-entry-title {
     line-height: 1.2em;
 }
 
-/* Bookmark specific styles */
-/* TODO separate base styles and move to plugin */
-
-.bookmark h3 {
-    margin: 0px 0px 8px 0px;
-    float: left;
-    line-height: 1.2em;
-    max-width: 92%;
-}
-
-.bookmark-notice-count {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-    padding: 1px 6px;
-    font-size: 1.2em;
-    line-height: 1.2em;
-    background: #fff;
-    border: 1px solid #7b8dbb;
-    color: #3e3e8c !important;
-    position: relative;
-    right: 4px;
-    margin-left: 10px;
-}
-
-.bookmark-notice-count:hover {
-    text-decoration: none;
-    background: #f2f2f2;
-    border: 1px solid #7b8dbb;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-}
-
-.notice .bookmark-description {
-    clear: both;
-    margin-left: 0px;
-    margin-bottom: 0px;
-}
-
-.notice .bookmark-author {
-    margin-left: 0px;
-    float: left;
-}
-
-.bookmark-tags {
-    clear: both;
-    margin-bottom: 8px;
-    line-height: 1.6em;
-}
-
-ul.bookmark-tags a {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-    padding: 1px 6px;
-    background: #f2f2f2;
-    color: #3e3e8c !important;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-    font-size: 0.88em;
-}
-
-ul.bookmark-tags a:hover {
-    background-color: #cdd1dd;
-    text-decoration: none;
-}
-
-.bookmark-avatar {
-    float: none !important;
-    position: relative;
-    top: 2px;
-}
-
-.bookmark div.entry-content {
-    font-size: 0.88em;
-    line-height: 1.2em;
-    margin-top: 6px;
-    opacity: 0.6;
-    margin-bottom: 0px;
-}
-
-.bookmark:hover div.entry-content {
-    opacity: 1;
-}
-
-#bookmarkpopup {
-    min-width: 600px;
-    margin-top: 0px;
-    height: 100%;
-    border: 10px solid #364A84;
-    background: #364A84;
-}
-
-#bookmarkpopup #wrap {
-    width: auto;
-    min-width: 560px;
-    padding: 40px 0px 25px 0px;
-    margin-right: 2px;
-    background: #fff url(../mobilelogo.png) no-repeat 6px 6px;
-}
-
-#bookmarkpopup #header {
-    width: auto;
-    padding: 0px 10px;
-}
-
-#bookmarkpopup .form_settings label {
-    margin-top: 2px;
-    text-align: right;
-    width: 24%;
-    font-size: 1.2em;
-}
-
-#bookmarkpopup .form_settings .form_data input {
-    width: 60%;
-}
-
-#bookmarkpopup .form_guide {
-    color: #777;
-}
-
-#bookmarkpopup #bookmark-submit {
-    min-width: 100px;
-}
-
-#bookmarkpopup fieldset fieldset {
-    margin-bottom: 10px;
-}
-
-#form_initial_bookmark.form_settings .form_data li {
-    margin-bottom: 0px;
-}
-
-#form_new_bookmark.form_settings .bookmarkform-thumbnail {
-    position: absolute;
-    top: 50px;
-    right: 0px;
-}
-
 /* Onboard specific styles */
 /* TODO move to plugin */