diff --git a/public/templates/directives/track-editor.html b/public/templates/directives/track-editor.html
index 1fd4ef9c..d8cf5a82 100644
--- a/public/templates/directives/track-editor.html
+++ b/public/templates/directives/track-editor.html
@@ -49,7 +49,7 @@
             </div>
         </div>
         <div class="row-fluid">
-            <div class="form-row album span6" ng-class="{'has-error': errors.album_id != null}">
+            <div class="form-row album-selector span6" ng-class="{'has-error': errors.album_id != null}">
                 <a pfm-popup="album-selector" pfm-popup-close-on-click href="#" class="btn btn-small">
                     Album:
                     <strong ng-show="selectedAlbum">{{selectedAlbum.title}}</strong>
@@ -67,7 +67,7 @@
                 </div>
                 <div class="error">{{errors.album_id}}</div>
             </div>
-            <div class="form-row show-songs span6" ng-show="track.track_type_id == 2" ng-class="{'has-error': errors.show_song_ids != null}">
+            <div class="form-row show-songs-selector span6" ng-show="track.track_type_id == 2" ng-class="{'has-error': errors.show_song_ids != null}">
                 <a pfm-popup="song-selector" pfm-popup-close-on-click href="#" class="btn btn-small">Show Songs: <strong>{{selectedSongsTitle}}</strong></a>
                 <div id="song-selector" class="pfm-popup">
                     <ul>
diff --git a/resources/assets/styles/account-content-selectors.less b/resources/assets/styles/account-content-selectors.less
new file mode 100644
index 00000000..fe811613
--- /dev/null
+++ b/resources/assets/styles/account-content-selectors.less
@@ -0,0 +1,82 @@
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import 'base/bootstrap/bootstrap';
+@import 'mixins';
+
+
+.show-songs-selector, .album-selector {
+  .btn {
+    display: block;
+    float: none;
+  }
+}
+
+.show-songs-selector, .album-selector, .track-selector {
+  .btn {
+    .border-radius(0px);
+    padding: 3px 10px;
+    font-size: 8pt;
+    text-align: left;
+  }
+
+  .error {
+    margin-top: 10px;
+  }
+
+  .pfm-popup {
+    width: 300px;
+
+    ul {
+      margin: 0px;
+      padding: 0px;
+      list-style: none;
+
+      li {
+        margin: 0px;
+        padding: 0px;
+
+        a {
+          .ellipsis();
+          display: block;
+          padding: 3px 10px;
+          font-size: 8pt;
+          color: #333333;
+
+          &:hover {
+            #gradient> .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
+            text-decoration: none;
+            color: @dropdownLinkColorHover;
+          }
+        }
+
+        &.selected {
+          a {
+            #gradient> .vertical(@green, darken(@green, 5%));
+            color: #fff;
+            font-weight: bold;
+
+            &:hover {
+              #gradient> .vertical(fadeout(@green, 20%), fadeout(darken(@green, 5%), 20%));
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/resources/assets/styles/app.less b/resources/assets/styles/app.less
index 92413476..d952709d 100644
--- a/resources/assets/styles/app.less
+++ b/resources/assets/styles/app.less
@@ -23,6 +23,7 @@
 @import 'mixins';
 @import 'layout';
 @import 'account-content';
+@import 'account-content-selectors';
 @import 'account-albums';
 @import 'admin';
 @import 'components/components';
diff --git a/resources/assets/styles/components/track-editor.less b/resources/assets/styles/components/track-editor.less
index d8486fdc..8a7800c7 100644
--- a/resources/assets/styles/components/track-editor.less
+++ b/resources/assets/styles/components/track-editor.less
@@ -26,67 +26,6 @@
       margin-top: 0px;
     }
   }
-
-  .show-songs, .album {
-    .btn {
-      display: block;
-      float: none;
-    }
-  }
-
-  .show-songs, .album, .track-selector {
-    .btn {
-      .border-radius(0px);
-      padding: 3px 10px;
-      font-size: 8pt;
-      text-align: left;
-    }
-
-    .error {
-      margin-top: 10px;
-    }
-
-    .pfm-popup {
-      width: 300px;
-
-      ul {
-        margin: 0px;
-        padding: 0px;
-        list-style: none;
-
-        li {
-          margin: 0px;
-          padding: 0px;
-
-          a {
-            .ellipsis();
-            display: block;
-            padding: 3px 10px;
-            font-size: 8pt;
-            color: #333333;
-
-            &:hover {
-              #gradient> .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
-              text-decoration: none;
-              color: @dropdownLinkColorHover;
-            }
-          }
-
-          &.selected {
-            a {
-              #gradient> .vertical(@green, darken(@green, 5%));
-              color: #fff;
-              font-weight: bold;
-
-              &:hover {
-                #gradient> .vertical(fadeout(@green, 20%), fadeout(darken(@green, 5%), 20%));
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }
 
 .license-grid {