diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index 1e125a2f0..25ee5f3a0 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -2370,7 +2370,6 @@ $.fn.dropdown = function(parameters) {
             if(settings.direction == 'auto') {
               // reset position
               module.remove.upward();
-              module.remove.leftward();
 
               if(module.can.openDownward($menu)) {
                 module.remove.upward($menu);
@@ -2378,10 +2377,7 @@ $.fn.dropdown = function(parameters) {
               else {
                 module.set.upward($menu);
               }
-              if(module.can.openRightward($menu)) {
-                module.remove.leftward($menu);
-              }
-              else {
+              if(!module.is.leftward($menu) && !module.can.openRightward($menu)) {
                 module.set.leftward($menu);
               }
             }
@@ -3056,6 +3052,10 @@ $.fn.dropdown = function(parameters) {
               : $menu.transition    && $menu.transition('is animating')
             ;
           },
+          leftward: function($subMenu) {
+            var $selectedMenu = $subMenu || $menu;
+            return $selectedMenu.hasClass(className.leftward);
+          },
           disabled: function() {
             return $module.hasClass(className.disabled);
           },
diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less
index daac30365..57f6f080d 100755
--- a/src/definitions/modules/dropdown.less
+++ b/src/definitions/modules/dropdown.less
@@ -989,6 +989,7 @@ select.ui.dropdown {
 .ui.dropdown .item .left.dropdown.icon + .text,
 .ui.dropdown .left.menu .item .dropdown.icon + .text {
   margin-left: @itemDropdownIconDistance;
+  margin-right: 0em;
 }
 
 
@@ -1363,15 +1364,15 @@ select.ui.dropdown {
 }
 
 /* Upward pointing */
-.ui.pointing.dropdown > .upward.menu,
-.ui.top.pointing.dropdown > .upward.menu {
+.ui.pointing.upward.dropdown .menu,
+.ui.top.pointing.upward.dropdown .menu {
   top: auto !important;
   bottom: 100% !important;
   margin: 0em 0em @pointingMenuDistance;
   border-radius: @pointingUpwardMenuBorderRadius;
 }
-.ui.pointing.dropdown > .upward.menu:after,
-.ui.top.pointing.dropdown > .upward.menu:after {
+.ui.pointing.upward.dropdown .menu:after,
+.ui.top.pointing.upward.dropdown .menu:after {
   top: 100% !important;
   bottom: auto !important;
   box-shadow: @pointingUpwardArrowBoxShadow;
@@ -1379,12 +1380,12 @@ select.ui.dropdown {
 }
 
 /* Right Pointing Upward */
-.ui.right.pointing.dropdown:not(.top):not(.bottom) > .upward.menu {
+.ui.right.pointing.upward.dropdown:not(.top):not(.bottom) .menu {
   top: auto !important;
   bottom: 0 !important;
   margin: 0em @pointingArrowDistanceFromEdge 0em 0em;
 }
-.ui.right.pointing.dropdown:not(.top):not(.bottom) > .upward.menu:after {
+.ui.right.pointing.upward.dropdown:not(.top):not(.bottom) .menu:after {
   top: auto !important;
   bottom: 0 !important;
   margin: 0em 0em @pointingArrowDistanceFromEdge 0em;
@@ -1393,12 +1394,12 @@ select.ui.dropdown {
 
 
 /* Left Pointing Upward */
-.ui.left.pointing.dropdown:not(.top):not(.bottom) > .upward.menu {
+.ui.left.pointing.upward.dropdown:not(.top):not(.bottom) .menu {
   top: auto !important;
   bottom: 0 !important;
   margin: 0em 0em 0em @pointingArrowDistanceFromEdge;
 }
-.ui.left.pointing.dropdown:not(.top):not(.bottom) > .upward.menu:after {
+.ui.left.pointing.upward.dropdown:not(.top):not(.bottom) .menu:after {
   top: auto !important;
   bottom: 0 !important;
   margin: 0em 0em @pointingArrowDistanceFromEdge 0em;
diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables
index d74599f66..498389632 100755
--- a/src/themes/default/modules/dropdown.variables
+++ b/src/themes/default/modules/dropdown.variables
@@ -342,7 +342,7 @@
 
 /* Flyout Direction */
 @leftMenuDropdownIconFloat: left;
-@leftMenuDropdownIconMargin: @itemLineHeightOffset @itemElementDistance 0em 0em;
+@leftMenuDropdownIconMargin: @itemLineHeightOffset 0em 0em 0em;
 
 /* Left */
 @leftSubMenuBorderRadius: @borderRadius;
@@ -362,13 +362,13 @@
 
 @pointingArrowBackground: @white;
 @pointingArrowZIndex: 2;
-@pointingArrowBoxShadow: -@menuBorderWidth -@menuBorderWidth 0px @menuBorderWidth @menuBorderColor;
+@pointingArrowBoxShadow: -@menuBorderWidth -@menuBorderWidth 0px 0px @menuBorderColor;
 @pointingArrowSize: @relative7px;
 
 @pointingMenuDistance: @mini;
 @pointingMenuBorderRadius: @borderRadius;
-@pointingArrowBoxShadow: -@menuBorderWidth -@menuBorderWidth 0px @menuBorderWidth @menuBorderColor;
+@pointingArrowBoxShadow: -@menuBorderWidth -@menuBorderWidth 0px 0px @menuBorderColor;
 
 /* Pointing Upward */
 @pointingUpwardMenuBorderRadius: @borderRadius;
-@pointingUpwardArrowBoxShadow: @menuBorderWidth @menuBorderWidth 0px @menuBorderWidth @menuBorderColor;
+@pointingUpwardArrowBoxShadow: @menuBorderWidth @menuBorderWidth 0px 0px @menuBorderColor;