diff --git a/app/soc/content/images/jqgrid_loading.gif b/app/soc/content/images/soc/jqgrid_loading.gif
similarity index 100%
rename from app/soc/content/images/jqgrid_loading.gif
rename to app/soc/content/images/soc/jqgrid_loading.gif
Binary files differ
diff --git a/app/soc/content/images/melange-server-error-background.png b/app/soc/content/images/soc/melange-server-error-background.png
similarity index 100%
rename from app/soc/content/images/melange-server-error-background.png
rename to app/soc/content/images/soc/melange-server-error-background.png
Binary files differ
diff --git a/app/soc/content/images/melange-user-error-background.png b/app/soc/content/images/soc/melange-user-error-background.png
similarity index 100%
rename from app/soc/content/images/melange-user-error-background.png
rename to app/soc/content/images/soc/melange-user-error-background.png
Binary files differ
diff --git a/app/soc/content/js/melange.list.js b/app/soc/content/js/melange.list.js
index eac8f1f..a181e11 100644
--- a/app/soc/content/js/melange.list.js
+++ b/app/soc/content/js/melange.list.js
@@ -1091,7 +1091,7 @@
 
       // Prepare the Loading message, substituting it with an animated image
       jQuery("#load_" + _self.jqgrid.id).closest("div").css("line-height","100%");
-      jQuery("#load_" + _self.jqgrid.id).html("<img src='/soc/content/" + melange.config.app_version + "/images/jqgrid_loading.gif'></img>");
+      jQuery("#load_" + _self.jqgrid.id).html("<img src='/soc/content/" + melange.config.app_version + "/images/soc/jqgrid_loading.gif'></img>");
 
       _self.jqgrid.object = jQuery("#" + _self.jqgrid.id);
 
diff --git a/app/soc/content/less/common.less b/app/soc/content/less/common.less
new file mode 100644
index 0000000..f1d9eaf
--- /dev/null
+++ b/app/soc/content/less/common.less
@@ -0,0 +1,4 @@
+@images_location: "../../images";
+@images_soc_location: "@{images_location}/soc";
+@images_gci_location: "@{images_location}/gci";
+@images_gsoc_location: "@{images_location}/gsoc";
diff --git a/app/soc/content/less/gci/buttons.less b/app/soc/content/less/gci/buttons.less
index 34817e6..118669d 100644
--- a/app/soc/content/less/gci/buttons.less
+++ b/app/soc/content/less/gci/buttons.less
@@ -1,3 +1,12 @@
+@import "common.less";
+
+// Images locations
+@image_switch_on: "@{images_gsoc_location}/ui_switch_on.png";
+@image_switch_off: "@{images_gsoc_location}/ui_switch_off.png";
+@image_switch_slider_left: "@{images_gsoc_location}/ui_switch_slider_left.png";
+@image_switch_slider_right: "@{images_gsoc_location}/ui_switch_slider_right.png";
+@image_switch_slider_center: "@{images_gsoc_location}/ui_switch_slider_center.png";
+
 /* Tooltip */
 /* Slide checkboxes */
 .iPhoneCheckContainer {
@@ -40,7 +49,7 @@
 }
 label.iPhoneCheckLabelOn {
   color: white;
-  background: url(../../images/gsoc/ui_switch_on.png) no-repeat;
+  background: url(@image_switch_on) no-repeat;
   text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
   left: 0;
   padding-top: 5px;
@@ -50,7 +59,7 @@
 }
 label.iPhoneCheckLabelOff {
   color: #8b8b8b;
-  background: url(../../images/gsoc/ui_switch_off.png) no-repeat right 0;
+  background: url(@image_switch_off) no-repeat right 0;
   text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
   text-align: right;
   right: 0;
@@ -66,19 +75,19 @@
   top: 0;
   left: 0;
   width: 0;
-  background: url(../../images/gsoc/ui_switch_slider_left.png) no-repeat;
+  background: url(@image_switch_slider_left) no-repeat;
   padding-left: 3px;
 }
 .iPhoneCheckHandleRight {
   height: 100%;
   width: 100%;
   padding-right: 3px;
-  background: url(../../images/gsoc/ui_switch_slider_right.png) no-repeat right 0;
+  background: url(@image_switch_slider_right) no-repeat right 0;
 }
 .iPhoneCheckHandleCenter {
   height: 100%;
   width: 100%;
-  background: url(../../images/gsoc/ui_switch_slider_center.png);
+  background: url(@image_switch_slider_center);
 }
 
 .verify_togglebutton {
diff --git a/app/soc/content/less/gci/dashboard.less b/app/soc/content/less/gci/dashboard.less
index 29fb4b4..1a15921 100644
--- a/app/soc/content/less/gci/dashboard.less
+++ b/app/soc/content/less/gci/dashboard.less
@@ -1,8 +1,36 @@
+@import "common.less";
+
 /*////////////////
 
   Iconic Dashboard
 
 ////////////////*/
+
+// Images locations
+@image_block_form_bg: "@{images_gci_location}/block-form-bg.png";
+
+@images_dashboard_location: "@{images_soc_location}/dashboard";
+
+@image_accept_proposals: "@{images_dashboard_location}/accept_proposals.png";
+@image_allocate: "@{images_dashboard_location}/allocate.png";
+@image_create: "@{images_dashboard_location}/create.png";
+@image_date: "@{images_dashboard_location}/date.png";
+@image_duplicates: "@{images_dashboard_location}/duplicates.png";
+@image_edit: "@{images_dashboard_location}/edit.png";
+@image_grade: "@{images_dashboard_location}/grade.png";
+@image_lookup: "@{images_dashboard_location}/lookup.png";
+@image_mail: "@{images_dashboard_location}/mail.png";
+@image_marker: "@{images_dashboard_location}/marker.png";
+@image_proposals: "@{images_dashboard_location}/proposals.png";
+@image_report: "@{images_dashboard_location}/report.png";
+@image_requests: "@{images_dashboard_location}/requests.png";
+@image_settings: "@{images_dashboard_location}/settings.png";
+@image_todo: "@{images_dashboard_location}/todo.png";
+@image_transfer: "@{images_dashboard_location}/transfer.png";
+@image_users: "@{images_dashboard_location}/users.png";
+@image_view: "@{images_dashboard_location}/view.png";
+@image_withdraw: "@{images_dashboard_location}/withdraw.png";
+
 .dashboard {
   min-height: 500px;
 }
@@ -35,7 +63,7 @@
 .block-dashboard {
   width: 100%;
   display: inline-block;
-  background: #e0e0e0 url(../../images/gci/block-form-bg.png) 0 0 repeat-x;
+  background: #e0e0e0 url(@image_block_form_bg) 0 0 repeat-x;
   border: 1px solid #b4b4b4;
   box-shadow: 0 4px 18px #C8C8C8;
 }
@@ -99,44 +127,44 @@
 
 /* icons entry */
 .column-entry.lookup_profile {
-  background-image: url(../../images/soc/dashboard/lookup.png);
+  background-image: url(@image_lookup);
 }
 .column-entry.allocate_slots,
 .column-entry.slots_allocation
 {
-  background-image: url(../../images/soc/dashboard/allocate.png);
+  background-image: url(@image_allocate);
 }
 .column-entry.slots_transfer,
 .column-entry.bulk_create_tasks
 {
-  background-image: url(../../images/soc/dashboard/transfer.png);
+  background-image: url(@image_transfer);
 }
 .column-entry.duplicates {
-  background-image: url(../../images/soc/dashboard/duplicates.png);
+  background-image: url(@image_duplicates);
 }
 .column-entry.proposals_submitted,
 .column-entry.manage_proposals,
 .column-entry.proposals {
-  background-image: url(../../images/soc/dashboard/proposals.png);
+  background-image: url(@image_proposals);
 }
 .column-entry.accept_proposals,
 .column-entry.manage_projects
 {
-  background-image: url(../../images/soc/dashboard/accept_proposals.png);
+  background-image: url(@image_accept_proposals);
 }
 .column-entry.withdraw_projects {
-  background-image: url(../../images/soc/dashboard/withdraw.png);
+  background-image: url(@image_withdraw);
 }
 .column-entry.reminder_emails {
-  background-image: url(../../images/soc/dashboard/mail.png);
+  background-image: url(@image_mail);
 }
 .column-entry.program_settings,
 .column-entry.edit_program
 {
-  background-image: url(../../images/soc/dashboard/settings.png);
+  background-image: url(@image_settings);
 }
 .column-entry.edit_timeline {
-  background-image: url(../../images/soc/dashboard/date.png);
+  background-image: url(@image_date);
 }
 
 .column-entry.adminning_organizations,
@@ -144,13 +172,13 @@
 .column-entry.students,
 .column-entry.manage_organizations
 {
-  background-image: url(../../images/soc/dashboard/users.png);
+  background-image: url(@image_users);
 }
 .column-entry.participant_locations {
-  background-image: url(../../images/soc/dashboard/marker.png);
+  background-image: url(@image_marker);
 }
 .column-entry.report_statistic {
-  background-image: url(../../images/soc/dashboard/report.png);
+  background-image: url(@image_report);
 }
 .column-entry.todo,
 .column-entry.documents,
@@ -164,23 +192,23 @@
 .column-entry.create_tasks,
 .column-entry.edit_org_profile
 {
-  background-image: url(../../images/soc/dashboard/todo.png);
+  background-image: url(@image_todo);
 }
 .column-entry.evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/grade.png);
+  background-image: url(@image_grade);
 }
 .column-entry.create_mentor_evaluation,
 .column-entry.create_student_evaluation,
 .column-entry.create_evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/create.png);
+  background-image: url(@image_create);
 }
 .column-entry.edit_mentor_evaluation,
 .column-entry.edit_student_evaluation,
 .column-entry.edit_evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/edit.png);
+  background-image: url(@image_edit);
 }
 .column-entry.view_mentor_evaluation,
 .column-entry.view_student_evaluation,
@@ -190,13 +218,13 @@
 .column-entry.list_invites,
 .column-entry.list_org_invites
 {
-  background-image: url(../../images/soc/dashboard/view.png);
+  background-image: url(@image_view);
 }
 .column-entry.requests,
 .column-entry.invite_mentor,
 .column-entry.invite_org_admin
 {
-  background-image: url(../../images/soc/dashboard/requests.png);
+  background-image: url(@image_requests);
 }
 
 /* notify icon */
diff --git a/app/soc/content/less/gci/forms.less b/app/soc/content/less/gci/forms.less
index 1844a27..48b0b8a 100644
--- a/app/soc/content/less/gci/forms.less
+++ b/app/soc/content/less/gci/forms.less
@@ -1,7 +1,13 @@
+@import "common.less";
 /*
 GCI forms specific CSS.
 */
 
+// Images locations
+@image_progress_bar: "@{images_gci_location}/jqueryui/pbar-ani.gif";
+@image_glyphicons_halflings: "@{images_gci_location}/bootstrap/glyphicons-halflings.png";
+@image_glyphicons_halflings_white: "@{images_gci_location}/bootstrap/glyphicons-halflings-white.png";
+
 .block-flash.success {/*Form successfully saved message*/
     background: #68dd94;
     border: 1px solid #15913b;
@@ -32,7 +38,7 @@
 }
 .progress .bar {
     width: 0%;
-    background: url(../../images/gci/jqueryui/pbar-ani.gif) !important;
+    background: url(@image_progress_bar) !important;
     height: 20px;
 }
 .filedownload .filename {
@@ -732,7 +738,7 @@
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("../../images/gci/bootstrap/glyphicons-halflings.png");
+  background-image: url(@image_glyphicons_halflings);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 }
@@ -752,7 +758,7 @@
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
 .dropdown-menu > .active > a > [class*=" icon-"] {
-  background-image: url("../../images/gci/bootstrap/glyphicons-halflings-white.png");
+  background-image: url(@image_glyphicons_halflings_white);
 }
 
 .icon-glass {
diff --git a/app/soc/content/less/gci/style.less b/app/soc/content/less/gci/style.less
index c4115a2..dd93b69 100644
--- a/app/soc/content/less/gci/style.less
+++ b/app/soc/content/less/gci/style.less
@@ -1,3 +1,4 @@
+@import "common.less";
 /*
 cog colors
 
@@ -7,6 +8,68 @@
 
 */
 
+// Images locations
+@image_arrow_blue_sm: "@{images_gci_location}/arrow-blue-sm.png";
+@image_arrow_white_lg: "@{images_gci_location}/arrow-white-lg.png";
+@image_arrow_white_sm: "@{images_gci_location}/arrow-white-sm.png";
+@image_arrow_red_sm: "@{images_gci_location}/arrow-red-sm.png";
+@image_block_cog_current_task: "@{images_gci_location}/block-cog-current-task.png";
+@image_block_cog_featured: "@{images_gci_location}/block-cog-featured.png";
+@image_block_cog_featured_student: "@{images_gci_location}/block-cog-featured-student.png";
+@image_block_cog_task: "@{images_gci_location}/block-cog-task.png";
+@image_block_comments_bg: "@{images_gci_location}/block-comments-bg.gif";
+@image_block_form_bg: "@{images_gci_location}/block-form-bg.png";
+
+@image_block_how_it_works_bg: "@{images_gci_location}/block-how-it-works-bg.gif";
+@image_block_how_it_works_more: "@{images_gci_location}/block-how-it-works-more.jpg";
+@image_block_how_it_works_repeat: "@{images_gci_location}/block-how-it-works-repeat.png";
+@image_block_how_it_works_repeat_arrow: "@{images_gci_location}/block-how-it-works-repeat-arrow.png";
+@image_block_how_it_works_start: "@{images_gci_location}/block-how-it-works-start.png";
+@image_block_how_it_works_step1: "@{images_gci_location}/block-how-it-works-step1.png";
+@image_block_how_it_works_step1_arrow: "@{images_gci_location}/block-how-it-works-step1-arrow.png";
+@image_block_how_it_works_step1_cog: "@{images_gci_location}/block-how-it-works-step1-cog.png";
+@image_block_how_it_works_step2: "@{images_gci_location}/block-how-it-works-step2.png";
+@image_block_how_it_works_step2_arrow: "@{images_gci_location}/block-how-it-works-step2-arrow.png";
+@image_block_how_it_works_step2_3_cog: "@{images_gci_location}/block-how-it-works-step2-3-cog.png";
+@image_block_how_it_works_step2_cog_center: "@{images_gci_location}/block-how-it-works-step2-cog-center.png";
+@image_block_how_it_works_step3: "@{images_gci_location}/block-how-it-works-step3.png";
+@image_block_how_it_works_step3_arrow: "@{images_gci_location}/block-how-it-works-step3-arrow.png";
+@image_block_how_it_works_step3_cog_center: "@{images_gci_location}/block-how-it-works-step3-cog-center.png";
+
+@image_block_leaderboard_top_trophy: "@{images_gci_location}/block-leaderboard-top-trophy.png";
+@image_block_leaderboard_content_bg: "@{images_gci_location}/block-leaderboard-content-bg.png";
+
+@image_block_stopwatch_sm: "@{images_gci_location}/stopwatch-sm.png";
+
+@image_block_task_action_bg: "@{images_gci_location}/block-task-action-bg.png";
+@image_block_task_open: "@{images_gci_location}/block-task-open.png";
+@image_block_task_title_bg: "@{images_gci_location}/block-task-title-bg.gif";
+@image_block_task_uploaded_code_bg: "@{images_gci_location}/block-task-uploaded-code-bg.gif";
+@image_block_timeline_watch: "@{images_gci_location}/block-timeline-watch.png";
+@image_block_timeline_watch_back: "@{images_gci_location}/block-timeline-watch-back.png";
+@image_block_timeline_watch_dial: "@{images_gci_location}/block-timeline-watch-dial.png";
+@image_block_timeline_watch_front: "@{images_gci_location}/block-timeline-watch-front.png";
+@image_block_timeline_watch_percent_25: "@{images_gci_location}/block-timeline-watch-percent-25.png";
+@image_block_timeline_watch_percent_33: "@{images_gci_location}/block-timeline-watch-percent-33.png";
+@image_block_timeline_watch_percent_50: "@{images_gci_location}/block-timeline-watch-percent-50.png";
+@image_block_timeline_watch_percent_75: "@{images_gci_location}/block-timeline-watch-percent-75.png";
+@image_block_user_welcome_bg: "@{images_gci_location}/block-user-welcome-bg.png";
+
+@image_body_bg: "@{images_gci_location}/body-bg.gif";
+
+@image_cog_grey_sm: "@{images_gci_location}/cog-grey-sm.png";
+
+@image_dashboard_task_cog_easy: "@{images_gci_location}/dashboard-task-cog-easy.png";
+@image_dashboard_task_cog_hard: "@{images_gci_location}/dashboard-task-cog-hard.png";
+@image_dashboard_task_cog_medium: "@{images_gci_location}/dashboard-task-cog-medium.png";
+@image_dashboard_task_cog_easy_complete: "@{images_gci_location}/dashboard-task-cog-easy-complete.png";
+@image_dashboard_task_cog_hard_complete: "@{images_gci_location}/dashboard-task-cog-hard-complete.png";
+@image_dashboard_task_cog_medium_complete: "@{images_gci_location}/dashboard-task-cog-medium-complete.png";
+@image_dashboard_task_icons: "@{images_gci_location}/dashboard-task-icons.png";
+@image_dashboard_task_single_bg: "@{images_gci_location}/dashboard-task-single-bg.gif";
+
+@image_extend_deadline_top_arrow: "@{images_gci_location}/extend-deadline-top-arrow.png";
+
 /* @group Normalize.css */
 @import url("normalize.css");
 /* @end */
@@ -202,7 +265,7 @@
 a.btn,
 input.button,
 input.btn {
-    background: #c53926 url(../../images/gci/arrow-white-lg.png) 95% 50% no-repeat;
+    background: #c53926 url(@image_arrow_white_lg) 95% 50% no-repeat;
     border: none;
         border-radius: 3px;
         -moz-border-radius: 3px;
@@ -228,7 +291,7 @@
 form input[type="submit"].task-btn,
 a.task-btn,
 input.task-btn {
-    background: #fff url(../../images/gci/dashboard-task-icons.png) 7px 5px no-repeat;
+    background: #fff url(@image_dashboard_task_icons) 7px 5px no-repeat;
     border: none;
     border-radius: 10px;
     -moz-border-radius: 10px;
@@ -317,7 +380,7 @@
 
 /* @group Layout */
 body {
-    background:url(../../images/gci/body-bg.gif) top center no-repeat;
+    background:url(@image_body_bg) top center no-repeat;
 }
 .header {
     height: 143px;
@@ -446,12 +509,12 @@
         padding: 4px 0 4px 25px;
     }
     .block .block-footer a {
-        background:url(../../images/gci/arrow-white-sm.png) right center no-repeat;
+        background:url(@image_arrow_white_sm) right center no-repeat;
         color: #fff;
         padding-right: 9px;
     }
     .block-comments {
-        background: #e0e0e0 url(../../images/gci/block-comments-bg.gif) 0 0 repeat-x;
+        background: #e0e0e0 url(@image_block_comments_bg) 0 0 repeat-x;
         padding: 15px 20px 20px 38px;
     }
         .block-comments .block-comments-title {
@@ -539,7 +602,7 @@
             padding-left: 10px;
         }
     .block-task-uploaded-code {
-        background: #52b8ef url(../../images/gci/block-task-uploaded-code-bg.gif) 0 0 repeat-x;
+        background: #52b8ef url(@image_block_task_uploaded_code_bg) 0 0 repeat-x;
         color: #fff;
         padding: 15px 18px 20px 38px;
     }
@@ -646,7 +709,7 @@
 
 /* BEGIN Stopwatch and countdown*/
 .stopwatch .stopwatch-watch {
-    background:url(../../images/gci/block-timeline-watch.png) 0 0 no-repeat;
+    background:url(@image_block_timeline_watch) 0 0 no-repeat;
     height: 85px;
     width: 79px;
     float: left;
@@ -654,7 +717,7 @@
     margin-left: -15px;
 }
 .stopwatch-svgcanvas {
-  background-image:url(../../images/gci/block-timeline-watch-back.png);
+  background-image:url(@image_block_timeline_watch_back);
   height: 91px;
   width: 91px;
   position: relative;
@@ -663,25 +726,25 @@
   margin-left: -15px;
 }
 .stopwatch-front {
-  background-image:url(../../images/gci/block-timeline-watch-front.png);
+  background-image:url(@image_block_timeline_watch_front);
   display: none;
 }
 .stopwatch-dial {
-  background-image:url(../../images/gci/block-timeline-watch-dial.png);
+  background-image:url(@image_block_timeline_watch_dial);
   display: none;
 }
 
     .stopwatch.percent-25 .stopwatch-watch {
-        background-image:url(../../images/gci/block-timeline-watch-percent-25.png);
+        background-image:url(@image_block_timeline_watch_percent_25);
     }
     .stopwatch.percent-33 .stopwatch-watch {
-        background-image:url(../../images/gci/block-timeline-watch-percent-33.png);
+        background-image:url(@image_block_timeline_watch_percent_33);
     }
     .stopwatch.percent-50 .stopwatch-watch {
-        background-image:url(../../images/gci/block-timeline-watch-percent-50.png);
+        background-image:url(@image_block_timeline_watch_percent_50);
     }
     .stopwatch.percent-75 .stopwatch-watch {
-        background-image:url(../../images/gci/block-timeline-watch-percent-75.png);
+        background-image:url(@image_block_timeline_watch_percent_75);
     }
     .stopwatch .stopwatch-remaining {
         float: right;
@@ -775,7 +838,7 @@
 
 /* BEGIN accepted organizations block */
 .block-accepted-organizations {
-  background: #E0E0E0 url(../../images/gci/block-form-bg.png) 0 0 repeat-x;
+  background: #E0E0E0 url(@image_block_form_bg) 0 0 repeat-x;
   border: 1px solid #B4B4B4;
   padding: 13px 20px;
 }
@@ -826,7 +889,7 @@
 
 /*Difficulties*/
 .block-featured-task .cog {/*Featured task, homepage block*/
-    background-image:url(../../images/gci/block-cog-featured.png);
+    background-image:url(@image_block_cog_featured);
     height: 77px;
     width: 73px;
 }
@@ -840,7 +903,7 @@
         background-position: 0 -155px;
     }
 .block-student-featured-task .cog {/*Featured task, student dashboard block*/
-    background-image:url(../../images/gci/block-cog-featured-student.png);
+    background-image:url(@image_block_cog_featured_student);
     height: 79px;
     width: 78px;
 }
@@ -854,7 +917,7 @@
         background-position: 0 -158px;
     }
 .block-status .cog {/*Sidebar current task block*/
-    background-image:url(../../images/gci/block-cog-current-task.png);
+    background-image:url(@image_block_cog_current_task);
     height: 62px;
     width: 62px;
 }
@@ -877,25 +940,25 @@
     width: 70px;
 }
     .task-single.level-hard .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-hard.png);
+        background-image:url(@image_dashboard_task_cog_hard);
     }
     .task-single.level-medium .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-medium.png);
+        background-image:url(@image_dashboard_task_cog_medium);
     }
     .task-single.level-easy .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-easy.png);
+        background-image:url(@image_dashboard_task_cog_easy);
     }
 .block-completed-tasks .task-single {/*Student completed tasks*/
 
 }
     .block-completed-tasks .task-single.level-hard .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-hard-complete.png);
+        background-image:url(@image_dashboard_task_cog_hard_complete);
     }
     .block-completed-tasks .task-single.level-medium .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-medium-complete.png);
+        background-image:url(@image_dashboard_task_cog_medium_complete);
     }
     .block-completed-tasks .task-single.level-easy .cog {
-        background-image:url(../../images/gci/dashboard-task-cog-easy-complete.png);
+        background-image:url(@image_dashboard_task_cog_easy_complete);
     }
 .block-pager {/*Generic pager*/
     padding: 5px 0;
@@ -937,7 +1000,7 @@
         line-height: 15px;
     }
 .block-page {/*General page*/
-  background: #e0e0e0 url(../../images/gci/block-form-bg.png) 0 0 repeat-x;
+  background: #e0e0e0 url(@image_block_form_bg) 0 0 repeat-x;
   border: 1px solid #b4b4b4;
   padding: 13px 20px;
 }
@@ -995,7 +1058,7 @@
 	text-transform: uppercase;
 }
 	.block-filter-sort a.block-filter-sort-link {
-		background:url(../../images/gci/arrow-blue-sm.png) right center no-repeat;
+		background:url(@image_arrow_blue_sm) right center no-repeat;
 		color: #0f649d;
 		font-weight: bold;
 		padding-right: 13px;
@@ -1123,7 +1186,7 @@
             border-bottom: 1px solid #b62f23;
         }
         .block-status .block-status-action a span {
-            background:url(../../images/gci/arrow-white-sm.png) right center no-repeat;
+            background:url(@image_arrow_white_sm) right center no-repeat;
             padding-right: 10px;
         }
         .block-status .block-status-action a:first-child {
@@ -1180,7 +1243,7 @@
 
 /* @group Homepage blocks */
 .block-how-it-works {/*How Code-In Works*/
-    background: #e0e0e0 url(../../images/gci/block-how-it-works-bg.gif) 0 0 repeat-x;
+    background: #e0e0e0 url(@image_block_how_it_works_bg) 0 0 repeat-x;
     border: 1px solid #b4b4b4;
     padding: 8px 18px 18px 18px;
 }
@@ -1234,11 +1297,11 @@
             -o-transition: all 1s ease-in-out;
         }
         .block-how-it-works-step1 .cog {
-            background-image:url(../../images/gci/block-how-it-works-step1-cog.png);
+            background-image:url(@image_block_how_it_works_step1_cog);
         }
         .block-how-it-works-step2 .cog,
         .block-how-it-works-step3 .cog {
-            background-image:url(../../images/gci/block-how-it-works-step2-3-cog.png);
+            background-image:url(@image_block_how_it_works_step2_3_cog);
         }
         .block-how-it-works-step .cog-center {
             height: 45px;
@@ -1249,10 +1312,10 @@
             z-index: 100;
         }
         .block-how-it-works-step2 .cog-center {
-            background-image:url(../../images/gci/block-how-it-works-step2-cog-center.png);
+            background-image:url(@image_block_how_it_works_step2_cog_center);
         }
         .block-how-it-works-step3 .cog-center {
-            background-image:url(../../images/gci/block-how-it-works-step3-cog-center.png);
+            background-image:url(@image_block_how_it_works_step3_cog_center);
         }
         .block-how-it-works-step:hover .cog {
             -webkit-transform: rotate(180deg);
@@ -1260,14 +1323,14 @@
             -o-transform: rotate(180deg);
         }
         .block-how-it-works-step1 {
-            background: #0c99e5 url(../../images/gci/block-how-it-works-step1.png) 8% 82% no-repeat;
+            background: #0c99e5 url(@image_block_how_it_works_step1) 8% 82% no-repeat;
             width: 220px;
         }
         .block-how-it-works-step2 {
-            background: #52b8ef url(../../images/gci/block-how-it-works-step2.png) 16% 85% no-repeat;
+            background: #52b8ef url(@image_block_how_it_works_step2) 16% 85% no-repeat;
         }
         .block-how-it-works-step3 {
-            background: #7ccffb url(../../images/gci/block-how-it-works-step3.png) 16% 85% no-repeat;
+            background: #7ccffb url(@image_block_how_it_works_step3) 16% 85% no-repeat;
         }
         .block-how-it-works-repeat {
             background: #cd402c;
@@ -1288,7 +1351,7 @@
                 margin: 0 auto;
             }
             .block-how-it-works-repeat .block-how-it-works-repeat-caption .repeat-icon {
-                background:url(../../images/gci/block-how-it-works-repeat.png) 0 0 no-repeat;
+                background:url(@image_block_how_it_works_repeat) 0 0 no-repeat;
                 float: left;
                 height: 19px;
                 margin: 11px 7px 0 0;
@@ -1325,20 +1388,20 @@
                 width: 23px;
             }
             .block-how-it-works-step1 .arrow {
-                background-image:url(../../images/gci/block-how-it-works-step1-arrow.png);
+                background-image:url(@image_block_how_it_works_step1_arrow);
             }
             .block-how-it-works-step2 .arrow {
-                background-image:url(../../images/gci/block-how-it-works-step2-arrow.png);
+                background-image:url(@image_block_how_it_works_step2_arrow);
             }
             .block-how-it-works-step3 .arrow {
-                background-image:url(../../images/gci/block-how-it-works-step3-arrow.png);
+                background-image:url(@image_block_how_it_works_step3_arrow);
                 height: 14px;
                 width: 26px;
                 left: 96px;
                 bottom: -14px;
             }
             .block-how-it-works-repeat .arrow {
-                background-image:url(../../images/gci/block-how-it-works-repeat-arrow.png);
+                background-image:url(@image_block_how_it_works_repeat_arrow);
                 height: 15px;
                 width: 28px;
                 top: -11px;
@@ -1351,7 +1414,7 @@
         width: 320px;
     }
         .block-how-it-works .block-how-it-works-more {
-            background:url(../../images/gci/block-how-it-works-more.jpg) 0 0 no-repeat;
+            background:url(@image_block_how_it_works_more) 0 0 no-repeat;
         }
         .block-how-it-works .block-how-it-works-more .block-how-it-works-more-caption {
             background:rgba(0, 130, 200, 0.9);
@@ -1375,7 +1438,7 @@
             padding: 4px 8px;
         }
     .block-how-it-works .block-how-it-works-start {
-        background:url(../../images/gci/block-how-it-works-start.png) top right no-repeat;
+        background:url(@image_block_how_it_works_start) top right no-repeat;
         float: right;
         height: 133px;
         width: 320px;
@@ -1406,7 +1469,7 @@
             margin: 0px auto;
         }
         .block-start-link a.start-link {
-            background: #c53926 url(../../images/gci/arrow-white-lg.png) 95% 50% no-repeat;
+            background: #c53926 url(@image_arrow_white_lg) 95% 50% no-repeat;
                 border-radius: 3px;
                 -moz-border-radius: 3px;
                 -webkit-border-radius: 3px;
@@ -1514,7 +1577,7 @@
         padding: 4px 0 4px 25px;
     }
     .block .readmore a {
-        background:url(../../images/gci/arrow-white-sm.png) right center no-repeat;
+        background:url(@image_arrow_white_sm) right center no-repeat;
         color: #fff;
         padding-right: 9px;
     }
@@ -1558,12 +1621,12 @@
         color: #d14936;
     }
     .block-user-message a.more {
-        background:url(../../images/gci/arrow-red-sm.png) right center no-repeat;
+        background:url(@image_arrow_red_sm) right center no-repeat;
         font-weight: bold;
         padding-right: 11px;
     }
 .block-user-welcome {
-    background: #e0e0e0 url(../../images/gci/block-user-welcome-bg.png) 0 0 repeat-x;
+    background: #e0e0e0 url(@image_block_user_welcome_bg) 0 0 repeat-x;
     border: 1px solid #b4b4b4;
     padding: 18px 38px 18px 13px;
 }
@@ -1666,7 +1729,7 @@
         padding: 3px 0 3px 12px;
     }
     .task-single {
-        background:url(../../images/gci/dashboard-task-single-bg.gif) 0 0 repeat-y;
+        background:url(@image_dashboard_task_single_bg) 0 0 repeat-y;
         background-color: #e0e0e0;
         font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif;
         padding: 3px 0;
@@ -1816,7 +1879,7 @@
                 padding-left: 2px;
             }
         .block-task .block-title .block-task-action {
-            background:url(../../images/gci/block-task-action-bg.png) center left no-repeat;
+            background:url(@image_block_task_action_bg) center left no-repeat;
             float: right;
             padding: 6px 0 10px 0;
             width: 229px;
@@ -1907,7 +1970,7 @@
 		width: 213px;
         }
 		.block-task .block-task-countdown #deadline-extend .deadline-extend-top {
-			background:url(../../images/gci/extend-deadline-top-arrow.png) top center no-repeat;
+			background:url(@image_extend_deadline_top_arrow) top center no-repeat;
 			display: block;
 			height: 20px;
 			width: 100%;
@@ -1965,7 +2028,7 @@
 			margin: 0 7px;
 		}
 		.block-task .block-task-countdown #deadline-extend form .task-btn {
-			background: #fff url(../../images/gci/dashboard-task-icons.png) no-repeat scroll 8px -81px;
+			background: #fff url(@image_dashboard_task_icons) no-repeat scroll 8px -81px;
 			-moz-box-shadow: none;
 			-webkit-box-shadow: none;
 			box-shadow: none;
@@ -2018,7 +2081,7 @@
 }
     .block-task-mentor .cog,
     .block-task-student .cog  {
-        background-image:url(../../images/gci/block-cog-task.png);
+        background-image:url(@image_block_cog_task);
         height: 103px;
         width: 98px;
     }
@@ -2036,7 +2099,7 @@
         }
     .block-task-mentor .block-title,
     .block-task-student .block-title {
-        background: #0082c8 url(../../images/gci/block-task-title-bg.gif) top right repeat-y;
+        background: #0082c8 url(@image_block_task_title_bg) top right repeat-y;
         font-family: "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif;
         font-size: 12px;
         font-weight: normal;
@@ -2094,7 +2157,7 @@
 }
     .block-task-mentor.block-task-open .cog,
     .block-task-student.block-task-open .cog {
-        background-image: url(../../images/gci/block-cog-task-open.png);
+        background-image: url(@image_block_task_open);
     }
     .block-task-open .block-task-action {
         text-align: center;
@@ -2154,7 +2217,7 @@
 			float: right;
 		}
 		.block-leaderboard-top .block-leaderboard-top-title .trophy {
-			background:url(../../images/gci/block-leaderboard-top-trophy.png) 0 0 no-repeat;
+			background:url(@image_block_leaderboard_top_trophy) 0 0 no-repeat;
 			height: 160px;
 			width: 500px;
 			position: absolute;
@@ -2163,7 +2226,7 @@
 		}
 
 	.block-leaderboard-top .block-leaderboard-top-content {
-		background: #d0e8f9 url(../../images/gci/block-leaderboard-content-bg.png) 0 0 repeat-x;
+		background: #d0e8f9 url(@image_block_leaderboard_content_bg) 0 0 repeat-x;
 		border-left: 1px solid #cae2f2;
 		border-right: 1px solid #cae2f2;
 		border-bottom: 1px solid #98a9b6;
@@ -2335,7 +2398,7 @@
 
 /* @group Forms */
 .block-form {
-    background: #e0e0e0 url(../../images/gci/block-form-bg.png) 0 0 repeat-x;
+    background: #e0e0e0 url(@image_block_form_bg) 0 0 repeat-x;
     border: 1px solid #b4b4b4;
     padding: 13px 20px;
 }
@@ -2533,7 +2596,7 @@
     width: 220px;
 }
     .form-row-task-completion-time .form-row-task-completion-time-inner {
-        background: #b6dcf7 url(../../images/gci/stopwatch-sm.png) 5px 5px no-repeat;
+        background: #b6dcf7 url(@image_block_stopwatch_sm) 5px 5px no-repeat;
         font-size: 18px;
         padding: 10px 0 10px 50px;
     }
@@ -2545,7 +2608,7 @@
     width: 165px;
 }
     .form-row-task-difficulty-inner {
-        background: #b6dcf7 url(../../images/gci/cog-grey-sm.png) 5px 5px no-repeat;
+        background: #b6dcf7 url(@image_cog_grey_sm) 5px 5px no-repeat;
         padding: 10px 0 10px 50px;
     }
 .form-row-task-assigned-mentor {
diff --git a/app/soc/content/less/gsoc/buttons.less b/app/soc/content/less/gsoc/buttons.less
index fbca712..96f0aca 100644
--- a/app/soc/content/less/gsoc/buttons.less
+++ b/app/soc/content/less/gsoc/buttons.less
@@ -1,16 +1,24 @@
+@import "common.less";
 /*////////////////
 
   LessCSS
 
 ////////////////*/
 
+// Images locations
+@image_user_menu_question: "@{images_gsoc_location}/user-menu-question.png";
+@image_switch_on: "@{images_gsoc_location}/ui_switch_on.png";
+@image_switch_off: "@{images_gsoc_location}/ui_switch_off.png";
+@image_switch_slider_left: "@{images_gsoc_location}/ui_switch_slider_left.png";
+@image_switch_slider_right: "@{images_gsoc_location}/ui_switch_slider_right.png";
+@image_switch_slider_center: "@{images_gsoc_location}/ui_switch_slider_center.png";
+
 @darkblue: #00538b;
 @orange: #d5620e;
 @lightblue: #238bd2;
 @lightbluebg: #6eb5e5;
 @grey: #f6f6f6;
 
-
 /*////////////////
 
   Action buttons
@@ -63,7 +71,7 @@
         }
         span {
             &#user-menu-question {
-                background:url(../../images/gsoc/user-menu-question.png) 0 0 no-repeat;
+                background:url(@image_user_menu_question) 0 0 no-repeat;
                 display: block;
                 float: left;
                 font-size: 1px;
@@ -158,7 +166,7 @@
 
 label.iPhoneCheckLabelOn {
     color: white;
-    background: url(../../images/gsoc/ui_switch_on.png) no-repeat;
+    background: url(@image_switch_on) no-repeat;
     text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
     left: 0;
     padding-top: 5px;
@@ -170,7 +178,7 @@
 
 label.iPhoneCheckLabelOff {
     color: #8b8b8b;
-    background: url(../../images/gsoc/ui_switch_off.png) no-repeat right 0;
+    background: url(@image_switch_off) no-repeat right 0;
     text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
     text-align: right;
     right: 0;
@@ -188,19 +196,19 @@
     top: 0;
     left: 0;
     width: 0;
-    background: url(../../images/gsoc/ui_switch_slider_left.png) no-repeat;
+    background: url(@image_switch_slider_left) no-repeat;
     padding-left: 3px;
 }
 .iPhoneCheckHandleRight {
     height: 100%;
     width: 100%;
     padding-right: 3px;
-    background: url(../../images/gsoc/ui_switch_slider_right.png) no-repeat right 0;
+    background: url(@image_switch_slider_right) no-repeat right 0;
 }
 .iPhoneCheckHandleCenter {
     height: 100%;
     width: 100%;
-    background: url(../../images/gsoc/ui_switch_slider_center.png);
+    background: url(@image_switch_slider_center);
 }
 /* Slide checkboxes */
 
diff --git a/app/soc/content/less/gsoc/dashboard.less b/app/soc/content/less/gsoc/dashboard.less
index 35a92a3..5501547 100644
--- a/app/soc/content/less/gsoc/dashboard.less
+++ b/app/soc/content/less/gsoc/dashboard.less
@@ -1,8 +1,34 @@
+@import "common.less";
+
 /*////////////////
 
   Iconic Dashboard
 
 ////////////////*/
+
+// Images locations
+@images_dashboard_location: "@{images_soc_location}/dashboard";
+
+@image_accept_proposals: "@{images_dashboard_location}/accept_proposals.png";
+@image_allocate: "@{images_dashboard_location}/allocate.png";
+@image_create: "@{images_dashboard_location}/create.png";
+@image_date: "@{images_dashboard_location}/date.png";
+@image_duplicates: "@{images_dashboard_location}/duplicates.png";
+@image_edit: "@{images_dashboard_location}/edit.png";
+@image_grade: "@{images_dashboard_location}/grade.png";
+@image_lookup: "@{images_dashboard_location}/lookup.png";
+@image_mail: "@{images_dashboard_location}/mail.png";
+@image_marker: "@{images_dashboard_location}/marker.png";
+@image_proposals: "@{images_dashboard_location}/proposals.png";
+@image_report: "@{images_dashboard_location}/report.png";
+@image_requests: "@{images_dashboard_location}/requests.png";
+@image_settings: "@{images_dashboard_location}/settings.png";
+@image_todo: "@{images_dashboard_location}/todo.png";
+@image_transfer: "@{images_dashboard_location}/transfer.png";
+@image_users: "@{images_dashboard_location}/users.png";
+@image_view: "@{images_dashboard_location}/view.png";
+@image_withdraw: "@{images_dashboard_location}/withdraw.png";
+
 .dashboard {
   min-height: 500px;
 }
@@ -81,43 +107,43 @@
 
 /* icons entry */
 .column-entry.lookup_profile {
-  background-image: url(../../images/soc/dashboard/lookup.png);
+  background-image: url(@image_lookup);
 }
 .column-entry.allocate_slots,
 .column-entry.slots_allocation
 {
-  background-image: url(../../images/soc/dashboard/allocate.png);
+  background-image: url(@image_allocate);
 }
 .column-entry.slots_transfer {
-  background-image: url(../../images/soc/dashboard/transfer.png);
+  background-image: url(@image_transfer);
 }
 .column-entry.duplicates {
-  background-image: url(../../images/soc/dashboard/duplicates.png);
+  background-image: url(@image_duplicates);
 }
 .column-entry.proposals_submitted,
 .column-entry.manage_proposals,
 .column-entry.proposals {
-  background-image: url(../../images/soc/dashboard/proposals.png);
+  background-image: url(@image_proposals);
 }
 .column-entry.accept_proposals,
 .column-entry.manage_projects,
 .column-entry.mentoring_projects
 {
-  background-image: url(../../images/soc/dashboard/accept_proposals.png);
+  background-image: url(@image_accept_proposals);
 }
 .column-entry.withdraw_projects {
-  background-image: url(../../images/soc/dashboard/withdraw.png);
+  background-image: url(@image_withdraw);
 }
 .column-entry.reminder_emails {
-  background-image: url(../../images/soc/dashboard/mail.png);
+  background-image: url(@image_mail);
 }
 .column-entry.program_settings,
 .column-entry.edit_program
 {
-  background-image: url(../../images/soc/dashboard/settings.png);
+  background-image: url(@image_settings);
 }
 .column-entry.edit_timeline {
-  background-image: url(../../images/soc/dashboard/date.png);
+  background-image: url(@image_date);
 }
 
 .column-entry.adminning_organizations,
@@ -125,13 +151,13 @@
 .column-entry.students,
 .column-entry.manage_organizations
 {
-  background-image: url(../../images/soc/dashboard/users.png);
+  background-image: url(@image_users);
 }
 .column-entry.participant_locations {
-  background-image: url(../../images/soc/dashboard/marker.png);
+  background-image: url(@image_marker);
 }
 .column-entry.report_statistic {
-  background-image: url(../../images/soc/dashboard/report.png);
+  background-image: url(@image_report);
 }
 .column-entry.todo,
 .column-entry.org_app,
@@ -140,35 +166,35 @@
 .column-entry.mentor_evaluations,
 .column-entry.student_evaluations
 {
-  background-image: url(../../images/soc/dashboard/todo.png);
+  background-image: url(@image_todo);
 }
 .column-entry.evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/grade.png);
+  background-image: url(@image_grade);
 }
 .column-entry.create_mentor_evaluation,
 .column-entry.create_student_evaluation,
 .column-entry.create_evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/create.png);
+  background-image: url(@image_create);
 }
 .column-entry.edit_mentor_evaluation,
 .column-entry.edit_student_evaluation,
 .column-entry.edit_evaluation_group
 {
-  background-image: url(../../images/soc/dashboard/edit.png);
+  background-image: url(@image_edit);
 }
 .column-entry.view_mentor_evaluation,
 .column-entry.view_student_evaluation,
 .column-entry.view_evaluation_group,
 .column-entry.projects
 {
-  background-image: url(../../images/soc/dashboard/view.png);
+  background-image: url(@image_view);
 }
 .column-entry.requests,
 .column-entry.org_admin_requests
 {
-  background-image: url(../../images/soc/dashboard/requests.png);
+  background-image: url(@image_requests);
 }
 
 /* notify icon */
diff --git a/app/soc/content/less/gsoc/forms.less b/app/soc/content/less/gsoc/forms.less
index e5d84ed..2b07df7 100644
--- a/app/soc/content/less/gsoc/forms.less
+++ b/app/soc/content/less/gsoc/forms.less
@@ -1,9 +1,16 @@
+@import "common.less";
 /*////////////////
 
   LessCSS
 
 ////////////////*/
 
+// Images locations
+@image_flash_error: "@{images_gsoc_location}/flash-error.png";
+@image_flash_success: "@{images_gsoc_location}/flash-success.png";
+@image_form_submit_bg: "@{images_gsoc_location}/form-submit-bg.png";
+@image_form_submit_bg_blue: "@{images_gsoc_location}/form-submit-bg-blue.png";
+
 @darkblue: #00538b;
 @orange: #d5620e;
 @lightblue: #238bd2;
@@ -434,7 +441,7 @@
             margin: 20px 0 0 20px;
         }
         .save {
-            background:url(../../images/gsoc/form-submit-bg-blue.png) 0 0 repeat;
+            background:url(@image_form_submit_bg_blue) 0 0 repeat;
             margin-left: 15px;
         }
     }
@@ -452,7 +459,7 @@
         margin: 0 0 0 4px;
     }
     .input-submit-mixin (@height: 30px, @line-height: 30px) {
-        background: url(../../images/gsoc/form-submit-bg.png) 0 0 repeat;
+        background: url(@image_form_submit_bg) 0 0 repeat;
         border: 0;
         color: #fff;
         font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
@@ -560,7 +567,7 @@
                     width: 100%;
                 }
                 span.action {
-                    background: url(../../images/gsoc/form-submit-bg.png) 0 0 repeat;
+                    background: url(@image_form_submit_bg) 0 0 repeat;
                     color: #fff;
                     font-family: Arial,'Helvetica Neue',Helvetica,sans-serif;
                     font-size: 14px;
@@ -648,13 +655,13 @@
     }
     &.flash-error {
         /*save confirmation banner notifies error*/
-        background: url(../../images/gsoc/flash-error.png) no-repeat 10px 50% #CF3333;
+        background: url(@image_flash_error) no-repeat 10px 50% #CF3333;
         color: #FFF;
         border-color: #990000;
     }
     &.flash-success {
         /*save confirmation banner notifies success*/
-        background: url(../../images/gsoc/flash-success.png) no-repeat 10px 50% #C6F9C9;
+        background: url(@image_flash_success) no-repeat 10px 50% #C6F9C9;
         color: #4F7F51;
         border-color: #9BD39E;
     }
diff --git a/app/soc/content/less/gsoc/global.less b/app/soc/content/less/gsoc/global.less
index 6215107..d873075 100644
--- a/app/soc/content/less/gsoc/global.less
+++ b/app/soc/content/less/gsoc/global.less
@@ -1,11 +1,14 @@
+@import "common.less";
 /*//////////////////
 
    Global styles
 
 //////////////////*/
+// Images locations
+@image_body_bg: "@{images_gsoc_location}/body-bg.png";
 
 body {
-    background:url(../../images/gsoc/body-bg.png) repeat;
+    background:url(@image_body_bg) repeat;
     color: #000;
     font: ~"13px/1.5em" Arial, 'Helvetica Neue', Helvetica, sans-serif;
 }
diff --git a/app/soc/content/less/gsoc/menu.less b/app/soc/content/less/gsoc/menu.less
index f2e941a..9ab9796 100644
--- a/app/soc/content/less/gsoc/menu.less
+++ b/app/soc/content/less/gsoc/menu.less
@@ -1,8 +1,11 @@
+@import "common.less";
 /*////////////////
 
   Menu
 
 ////////////////*/
+// Images locations
+@image_nav_bg: "@{images_gsoc_location}/nav-bg.gif";
 
 /* New menu container */
 #menu-container {
@@ -11,7 +14,7 @@
 /* New menu container */
 
 #main-menu {
-    background:url(../../images/gsoc/nav-bg.gif) 0 0 repeat;
+    background:url(@image_nav_bg) 0 0 repeat;
     margin-right: 0;
     float: left;
     width: 220px;
@@ -61,7 +64,7 @@
             background: #e67a25;
 
             ul {/*submenu under an active top level*/
-                background:url(../../images/gsoc/nav-bg.gif) 0 0 repeat;
+                background:url(@image_nav_bg) 0 0 repeat;
             }
         }
         li.parent.active {/*top level active list item w/ submenu - for use when the top level is highlighted but the submenu is not*/
diff --git a/app/soc/content/less/gsoc/structure.less b/app/soc/content/less/gsoc/structure.less
index f1571e4..e6bab93 100644
--- a/app/soc/content/less/gsoc/structure.less
+++ b/app/soc/content/less/gsoc/structure.less
@@ -1,9 +1,21 @@
+@import "common.less";
 /*////////////////
 
   LessCSS
 
 ////////////////*/
 
+// Images locations
+@image_form_submit_bg: "@{images_gsoc_location}/form-submit-bg.png";
+@image_form_submit_bg_blue: "@{images_gsoc_location}/form-submit-bg-blue.png";
+@image_header_bg: "@{images_gsoc_location}/header-bg.png";
+@image_home_block_1_bg_center: "@{images_gsoc_location}/home-block-1-bg-center.gif";
+@image_home_block_1_list_1: "@{images_gsoc_location}/home-block-1-list-1.png";
+@image_home_block_1_list_2: "@{images_gsoc_location}/home-block-1-list-2.png";
+@image_home_block_1_list_3: "@{images_gsoc_location}/home-block-1-list-3.png";
+@image_home_block_students: "@{images_gsoc_location}/home-block-students-bg.gif";
+@image_social_icons: "@{images_gsoc_location}/social-icons.png";
+
 @darkblue: #00538b;
 @orange: #d5620e;
 @lightblue: #238bd2;
@@ -25,7 +37,7 @@
 ////////////////*/
 
 #page-header {/*logo and globe*/
-    background: #fff url(../../images/gsoc/header-bg.png) bottom left repeat-x;
+    background: #fff url(@image_header_bg) bottom left repeat-x;
     height: 181px;
     width: 100%;
     .grid_12 {
@@ -139,7 +151,7 @@
                 margin: 0 0 0 12px;
             }
             ol {/*numbered list*/
-                background:url(../../images/gsoc/home-block-1-bg-center.gif) center center no-repeat;
+                background:url(@image_home_block_1_bg_center) center center no-repeat;
                 float: left;
                 height: 218px;
                 list-style-type: none;
@@ -164,17 +176,17 @@
                     }
                 }
                 li.first {
-                    background-image:url(../../images/gsoc/home-block-1-list-1.png);
+                    background-image:url(@image_home_block_1_list_1);
                 }
                 li.second {
-                    background-image:url(../../images/gsoc/home-block-1-list-2.png);
+                    background-image:url(@image_home_block_1_list_2);
 
                     strong {
                         padding-top: 22px;
                     }
                 }
                 li.third {
-                    background-image:url(../../images/gsoc/home-block-1-list-3.png);
+                    background-image:url(@image_home_block_1_list_3);
                 }
             }
             .description p {
@@ -192,13 +204,13 @@
         width: 429px;
 
         .block-students {/*students apply now block*/
-            background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 repeat-y;
+            background:url(@image_home_block_students) 0 0 repeat-y;
             color: #004371;
             padding-bottom: 5px;
             text-align: center;
 
             h3 {
-                *background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 no-repeat;
+                *background:url(@image_home_block_students) 0 0 no-repeat;
                 font-size: 35px;
                 font-weight: bold;
                 line-height: 1.9em;
@@ -259,13 +271,13 @@
         }
 
         .block-mentors {/*mentors apply now block*/
-            background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 no-repeat;
+            background:url(@image_home_block_students) 0 0 no-repeat;
             color: #004371;
             text-align: center;
             padding-bottom: 15px;
 
             h3 {
-                *background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 no-repeat;
+                *background:url(@image_home_block_students) 0 0 no-repeat;
                 font-size: 35px;
                 font-weight: bold;
                 line-height: 1.9em;
@@ -307,13 +319,13 @@
             }
         }
         .block-orgs {/*orgs apply now block*/
-            background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 no-repeat;
+            background:url(@image_home_block_students) 0 0 no-repeat;
             color: #004371;
             text-align: center;
             padding-bottom: 15px;
 
             h3 {
-                *background:url(../../images/gsoc/home-block-students-bg.gif) 0 0 no-repeat;
+                *background:url(@image_home_block_students) 0 0 no-repeat;
                 font-size: 33px;
                 font-weight: bold;
                 line-height: 1.9em;
@@ -388,7 +400,7 @@
         .block-connect {/*social network block*/
 
             .social {
-                background-image:url(../../images/gsoc/social-icons.png);
+                background-image:url(@image_social_icons);
                 background-position: 0 0;
                 background-repeat: no-repeat;
                 height: 31px;
@@ -499,7 +511,7 @@
             margin-right: 10px;
             padding-right: 10px;
         }
-        .button-mixin (@button-background: url("../../images/gsoc/form-submit-bg.png") repeat scroll 0 0 transparent, @button-color: white) {
+        .button-mixin (@button-background: url(@image_form_submit_bg) repeat scroll 0 0 transparent, @button-color: white) {
             background: @button-background;
             color: @button-color;
             width: 90px;
@@ -512,7 +524,7 @@
             cursor: pointer;
         }
         .button.disabled {
-            .button-mixin(url("../../images/gsoc/form-submit-bg-blue.png") repeat scroll 0 0 transparent, @grey);
+            .button-mixin(url(@image_form_submit_bg_blue) repeat scroll 0 0 transparent, @grey);
             cursor: default;
         }
     }
@@ -678,7 +690,7 @@
             padding: 3px 0 0 0;
 
             a {
-                background-image:url(../../images/gsoc/social-icons.png);
+                background-image:url(@image_social_icons);
                 background-position: 0 -34px;
                 background-repeat: no-repeat;
                 height: 14px;
diff --git a/app/soc/content/less/gsoc/surveys.less b/app/soc/content/less/gsoc/surveys.less
index 2ed7a65..efc6451 100644
--- a/app/soc/content/less/gsoc/surveys.less
+++ b/app/soc/content/less/gsoc/surveys.less
@@ -1,9 +1,14 @@
+@import "common.less";
 /*////////////////
 
   LessCSS
 
 ////////////////*/
 
+// Images locations
+@image_survey_background: "@{images_location}/ui-icons_ef8c08_256x240.png";
+@image_grippie: "@{images_gsoc_location}/grippie.png";
+
 /* @group Global */
 button, input, textarea {
     font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
@@ -58,7 +63,7 @@
         padding: 5px;
     }
     .legend .toggle-form {
-        background: #f6f6f6 url(../../images/ui-icons_ef8c08_256x240.png) 0 0 no-repeat;
+        background: #f6f6f6 url(@image_survey_background) 0 0 no-repeat;
         border: 1px solid #ccc;
         border-radius: 4px;
         -moz-border-radius: 4px;
@@ -196,7 +201,7 @@
             margin-top: 0;
         }
         div {
-            background:url(../../images/gsoc/grippie.png) 0 0 repeat-y;
+            background:url(@image_grippie) 0 0 repeat-y;
             clear: both;
             float: left;
             width: 350px;
diff --git a/app/soc/content/less/gsoc/tables.less b/app/soc/content/less/gsoc/tables.less
index c1ec39e..2877fde 100644
--- a/app/soc/content/less/gsoc/tables.less
+++ b/app/soc/content/less/gsoc/tables.less
@@ -1,9 +1,15 @@
+@import "common.less";
 /*////////////////
 
   Tables
 
 ////////////////*/
 
+// Images locations
+@image_table_sort_asc: "@{images_gsoc_location}/table-sort-asc.gif";
+@image_table_sort_desc: "@{images_gsoc_location}/table-sort-desc.gif";
+@image_ranking: "@{images_gsoc_location}/ranking.png";
+
 .tablesorter {/*all tables used in the dashboard*/
     border: 1px solid #e7e7e7;
     width: 100%;
@@ -25,10 +31,10 @@
         background-repeat: no-repeat;
     }
     .headerSortUp span {/*asc arrow*/
-        background-image:url(../../images/gsoc/table-sort-asc.gif);
+        background-image:url(@image_table_sort_asc);
     }
     .headerSortDown span {/*desc arrow*/
-        background-image: url(../../images/gsoc/table-sort-desc.gif);
+        background-image: url(@image_table_sort_desc);
     }
 
     tbody {/*table body*/
@@ -41,7 +47,7 @@
                 text-decoration: none;
             }
             a.rank {/*ranking arrows - default is down on*/
-                background:url(../../images/gsoc/ranking.png) 0 0 no-repeat;
+                background:url(@image_ranking) 0 0 no-repeat;
                 display: block;
                 float: left;
                 height: 6px;
diff --git a/app/soc/content/less/soc/search_page.less b/app/soc/content/less/soc/search_page.less
index da076d0..97648ab 100644
--- a/app/soc/content/less/soc/search_page.less
+++ b/app/soc/content/less/soc/search_page.less
@@ -12,138 +12,111 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
- */
+*/
 
 /**
  * Google Site Search Theme and style file.
  *
  */
 
-/* Slight reset to make the preview have ample padding. */
-.cse .gsc-control-cse,
-.gsc-control-cse {
-
-}
-.cse .gsc-branding,
-.gsc-branding {
-  display: none;
-}
-.cse .gsc-control-cse div,
-.gsc-control-cse div {
-  position: normal;
-}
-/* Selector for entire element. */
-.cse .gsc-control-cse,
-.gsc-control-cse {
-  background-color: #ffffff;
-  border: 1px solid;
-  border-color: #ffffff;
-}
-.cse .gsc-control-cse:after,
-.gsc-control-cse:after {
-  content:".";
-  display:block;
-  height:0;
-  clear:both;
-  visibility:hidden;
-}
-.cse .gsc-resultsHeader,
-.gsc-resultsHeader {
-  border:none;
-}
-/* Search button */
-.cse input.gsc-search-button,
-input.gsc-search-button {
-  font-family: inherit;
-  color: #000000;
-  text-shadow: 0 1px 2px #FFFFFF;
-  background-color: #CECECE;
-  border: 1px outset;
-  border-color: #666666;
-  border-radius: 2px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-}
-/* Inactive tab */
-.cse .gsc-tabHeader.gsc-tabhInactive,
-.gsc-tabHeader.gsc-tabhInactive {
-  border-bottom: none;
-  color: #666666;
-  background-color: #e9e9e9;
-  border: 1px solid;
-  border-color: #e9e9e9;
-  border-bottom: none;
-}
-/* Active tab */
-.cse .gsc-tabHeader.gsc-tabhActive,
-.gsc-tabHeader.gsc-tabhActive {
-  background-color: #FFFFFF;
-  border: 1px solid;
-  border-top: 2px solid;
-  border-color: #e9e9e9;
-  border-top-color: #FF9900;
-  border-bottom: none;
-}
-/* This is the tab bar bottom border. */
-.cse .gsc-tabsArea,
-.gsc-tabsArea {
-  margin-top: 1em;
-  border-bottom: 1px solid #e9e9e9;
-}
-/* Inner wrapper for a result */
-.cse .gsc-webResult.gsc-result,
-.gsc-webResult.gsc-result {
-  padding: .25em;
-  border: 1px solid;
-  border-color: #ffffff;
-  margin-bottom: 1em;
-}
-/* Result hover event styling */
-.cse .gsc-webResult.gsc-result:hover,
-.gsc-webResult.gsc-result:hover {
-  border: 1px solid;
-  border-color: #FFFFFF;
-}
-/*Promotion Settings*/
-/* The entire promo */
-.cse .gs-promotion.gs-result,
-.gs-promotion.gs-result {
-  background-color: #FFFFFF;
-  border: 1px solid;
-  border-color: #336699;
-}
-/* Promotion image */
-.cse .gs-promotion.gs-result .gs-promotion-image,
-.gs-promotion.gs-result .gs-promotion-image {}
-/* Promotion title */
-.cse .gs-promotion.gs-result a.gs-title:link,
-.gs-promotion.gs-result a.gs-title:link {
-  color: #0000CC;
-}
-.cse .gs-promotion.gs-result a.gs-title:visited,
-.gs-promotion.gs-result a.gs-title:visited {
-  color: #0000CC;
-}
-.cse .gs-promotion.gs-result a.gs-title:hover,
-.gs-promotion.gs-result a.gs-title:hover {
-  color: #0000CC;
-}
-.cse .gs-promotion.gs-result a.gs-title:active,
-.gs-promotion.gs-result a.gs-title:active {
-  color: #0000CC;
-}
-/* Promotion snippet */
-.cse .gs-promotion.gs-result .gs-snippet,
-.gs-promotion.gs-result .gs-snippet {
-  color: #000000;
-}
-/* Promotion url */
-.cse .gs-promotion.gs-result .gs-visibleUrl,
-.gs-promotion.gs-result .gs-visibleUrl {
-  color: #008000;
+.cse {
+  .gsc-branding {
+    /* Slight reset to make the preview have ample padding. */
+    display: none;
+  }
+  .gsc-control-cse {
+    /* Selector for entire element. */
+    background-color: #ffffff;
+    border: 1px solid;
+    border-color: #ffffff;
+    &:after {
+      clear: both;
+      content: ".";
+      display: block;
+      height: 0px;
+      visibility: hidden;
+    }
+    div {
+      position: normal;
+    }
+  }
+  .gsc-resultsHeader {
+    border: none;
+  }
+  input.gsc-search-button {
+    /* Search button */
+    background-color: #cecece;
+    border: 1px outset;
+    border-color: #666666;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    color: #000000;
+    font-family: inherit;
+    text-shadow: 0px 1px 2px #ffffff;
+  }
+  .gsc-tabHeader.gsc-tabhInactive {
+    /* Inactive tab */
+    background-color: #e9e9e9;
+    border: 1px solid;
+    border-bottom: none;
+    border-color: #e9e9e9;
+    color: #666666;
+  }
+  .gsc-tabHeader.gsc-tabhActive {
+    /* Active tab */
+    background-color: #ffffff;
+    border: 1px solid;
+    border-bottom: none;
+    border-color: #e9e9e9;
+    border-top: 2px solid;
+    border-top-color: #ff9900;
+  }
+  .gsc-tabsArea {
+    /* This is the tab bar bottom border. */
+    border-bottom: 1px solid #e9e9e9;
+    margin-top: 1em;
+  }
+  .gsc-webResult.gsc-result {
+    /* Inner wrapper for a result */
+    border: 1px solid;
+    border-color: #ffffff;
+    margin-bottom: 1em;
+    padding: .25em;
+    /* Result hover event styling */
+    &:hover {
+      border: 1px solid;
+      border-color: #ffffff;
+    }
+  }
+  .gs-promotion.gs-result {
+    /* Promotion Settings: The entire promo */
+    background-color: #ffffff;
+    border: 1px solid;
+    border-color: #336699;
+    a.gs-title {
+      /* Promotion Settings: Promotion title */
+      &:active,
+      &:hover,
+      &:link,
+      &:visited {
+        color: #0000cc;
+      }
+    }
+    .gs-snippet {
+      /* Promotion Settings: Promotion snippet */
+      color: #000000;
+    }
+    .gs-visibleUrl {
+      /* Promotion Settings: Promotion url */
+      color: #008000;
+    }
+  }
 }
 
-/* Ensure results page render properly on the main content pane */
-.gsc-resultsHeader, .gsc-tabsArea, .gsc-webResult:after {
+.gsc-resultsHeader,
+.gsc-tabsArea,
+.gsc-webResult:after {
+  /* Ensure results page render properly on the main content pane */
   clear: none !important;
 }
diff --git a/app/soc/content/less/soc/server-error-style.less b/app/soc/content/less/soc/server-error-style.less
index e4837b9..22667e2 100644
--- a/app/soc/content/less/soc/server-error-style.less
+++ b/app/soc/content/less/soc/server-error-style.less
@@ -1,7 +1,30 @@
+/*
+Copyright 2011 the Melange authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 /* @group Typography */
-body, button, input, select, textarea {
-    color: #000;
-    font: ~"12px/1.5" Arial, "Helvetica Neue", "Liberation Sans", FreeSans, sans-serif;
+@import "common.less";
+
+@image_server_error: "@{images_soc_location}/melange-server-error-background.png";
+
+body,
+button,
+input,
+select,
+textarea {
+  color: #000000;
+  font: ~"12px/1.5" Arial, "Helvetica Neue", "Liberation Sans", FreeSans, sans-serif;
 }
 
 h1 {
@@ -28,72 +51,85 @@
   font-size: 15px;
 }
 
-ul, ol {
-    margin: 1em 0;
-    padding: 0 0 0 40px;
+ol,
+ul {
+    margin: 1em 0em;
+    padding: 0px 0px 0px 40px;
 }
+
 ol {
   list-style: decimal;
 }
+
 ul {
   list-style: disc;
 }
+
 li {
   margin-left: 30px;
 }
 
-p,
+address,
 dl,
-hr,
+fieldset,
+figure,
+p,
 h1,
 h2,
 h3,
 h4,
 h5,
 h6,
+hr,
 ol,
 ul,
 pre,
-table,
-address,
-fieldset,
-figure {
-    margin-top: 0;
-    margin-bottom: 10px;
+table {
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 
-a, a:visited, .ui-widget-content a { color: #0f649d; text-decoration: none; }
-a:hover {  }
+a,
+a:visited,
+.ui-widget-content a {
+  color: #0f649d;
+  text-decoration: none;
+}
 
 /* @group error */
 
 body.error {
-	background: url(../images/melange-server-error-background.png) top center no-repeat;
-	background-color: #000;
+	background: url(@image_server_error) top center no-repeat;
+	background-color: #000000;
 }
 
 #error-content {
-        color: #999;
-	margin: 275px auto 0 auto;
+  color: #999999;
+	margin: 275px auto 0px auto;
 	width: 650px;
-}
-#error-content h1 {
-	font-size:80px;
-	display:inline;
-	float:left;
-	padding-right:20px;
-	margin-top:0px;
-}
-#error-content p {
-	font-size:20px;
-	padding-top:15px;
-	font-weight:bold;
-	line-height:130%;
-}
-#error-content a:link,
-#error-content a:hover,
-#error-content a:visited,
-#error-content a:active {
-	color: #ff8b3e;
+
+  h1 {
+    display: inline;
+    float: left;
+    font-size: 80px;
+    margin-top: 0px;
+    padding-right: 20px;
+  }
+
+  p {
+    font-size: 20px;
+    font-weight: bold;
+    line-height: 130%;
+    padding-top: 15px;
+  }
+
+  a {
+    &:active,
+    &:hover,
+    &:link,
+    &:visited {
+      color: #ff8b3e;
+    }
+  }
 }
 /* @end */
diff --git a/app/soc/content/less/soc/user-error-style.less b/app/soc/content/less/soc/user-error-style.less
index f7283e1..2367b77 100644
--- a/app/soc/content/less/soc/user-error-style.less
+++ b/app/soc/content/less/soc/user-error-style.less
@@ -1,7 +1,30 @@
+/*
+Copyright 2011 the Melange authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 /* @group Typography */
-body, button, input, select, textarea {
-    color: #000;
-    font: ~"12px/1.5" Arial, "Helvetica Neue", "Liberation Sans", FreeSans, sans-serif;
+@import "common.less";
+
+@image_user_error: "@{images_soc_location}/melange-user-error-background.png";
+
+body,
+button,
+input,
+select,
+textarea {
+  color: #000000;
+  font: ~"12px/1.5" Arial, "Helvetica Neue", "Liberation Sans", FreeSans, sans-serif;
 }
 
 h1 {
@@ -28,22 +51,29 @@
   font-size: 15px;
 }
 
-ul, ol {
-    margin: 1em 0;
-    padding: 0 0 0 40px;
+ul,
+ol {
+  margin: 1em 0em;
+  padding: 0px 0px 0px 40px;
 }
+
 ol {
   list-style: decimal;
 }
+
 ul {
   list-style: disc;
 }
+
 li {
   margin-left: 30px;
 }
 
-p,
+address,
 dl,
+fieldset,
+figure,
+p,
 hr,
 h1,
 h2,
@@ -54,46 +84,51 @@
 ol,
 ul,
 pre,
-table,
-address,
-fieldset,
-figure {
-    margin-top: 0;
-    margin-bottom: 10px;
+table {
+  margin-bottom: 10px;
+  margin-top: 0px;
 }
 
-a, a:visited, .ui-widget-content a { color: #0f649d; text-decoration: none; }
-a:hover {  }
+a,
+a:visited,
+.ui-widget-content a {
+  color: #0f649d;
+  text-decoration: none;
+}
 
 /* @group error */
-
 body.error {
-	background: url(../images/melange-user-error-background.png) top center no-repeat;
+	background: url(@image_user_error) top center no-repeat;
 	background-color: #fff;
 }
 
 #error-content {
-        color: #666;
-	margin: 275px auto 0 auto;
+  color: #666666;
+	margin: 275px auto 0px auto;
 	width: 650px;
-}
-#error-content h1 {
-	font-size:80px;
-	display:inline;
-	float:left;
-	padding-right:20px;
-	margin-top:0px;
-}
-#error-content p {
-	font-size:20px;
-	padding-top:15px;
-	font-weight:bold;
-	line-height:130%;
-}
-#error-content a:link,
-#error-content a:hover,
-#error-content a:visited,
-#error-content a:active {
-	color: #0074c1;
+
+  h1 {
+    display: inline;
+    float: left;
+    font-size: 80px;
+    margin-top: 0px;
+    padding-right: 20px;
+  }
+
+  p {
+    font-size: 20px;
+    font-weight: bold;
+    line-height: 130%;
+    padding-top: 15px;
+  }
+
+  a {
+    &:active,
+    &:hover,
+    &:link,
+    &:visited {
+      color: #0074c1;
+    }
+  }
 }
 /* @end */